From 6af04d49d131561b96e2676046374c058ba317e2 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Fri, 3 Feb 2012 15:58:07 +0000 Subject: [PATCH] [packages_10.03.2] merge r30006 SVN-Revision: 30017 --- Xorg/app/dillo/Makefile | 68 + Xorg/app/dillo/files/dillo.desktop | 12 + Xorg/app/dillo/files/dillo.png | Bin 0 -> 5555 bytes .../patches/000-do-not-need-flt2-util.patch | 21 + Xorg/app/eterm/Makefile | 69 + .../patches/010-dont-add-host-paths.patch | 17 + Xorg/app/gtkperf/Makefile | 44 + .../patches/000-disable-autotools.patch | 19 + .../gtkperf/patches/010-change-layout.patch | 77 + Xorg/app/matchbox-keyboard/Makefile | 60 + Xorg/app/packages | 9 + Xorg/app/pwrtray/Makefile | 107 + .../pwrtray/files/etc/init.d/pwrtray-backend | 12 + Xorg/app/pwrtray/files/etc/pwrtray-backendrc | 16 + Xorg/app/qwo/Makefile | 48 + Xorg/app/rxvt/Makefile | 50 + Xorg/app/rxvt/files/icon.png | Bin 0 -> 8518 bytes Xorg/app/rxvt/files/rxvt.desktop | 13 + Xorg/app/template.mk | 46 + Xorg/app/xcalc/Makefile | 47 + Xorg/app/xclipboard/Makefile | 47 + Xorg/app/xdm/Makefile | 60 + Xorg/app/xeyes/Makefile | 42 + Xorg/app/xine-ui/Makefile | 80 + Xorg/app/xine-ui/patches/100-cflags.patch | 13 + Xorg/app/xine-ui/patches/110-xitk.patch | 16 + .../xine-ui/patches/120-remove-delay.patch | 13 + Xorg/app/xinit/Makefile | 41 + Xorg/app/xmessage/Makefile | 47 + Xorg/app/xterm/Makefile | 51 + Xorg/app/xterm/files/terminal.png | Bin 0 -> 2624 bytes Xorg/app/xterm/files/xterm.desktop | 12 + Xorg/app/xterm/patches/010-no-transform.patch | 19 + Xorg/driver/xf86-input-tslib/Makefile | 50 + .../files/pointercal.om_gta02 | Bin 0 -> 46 bytes .../patches/100-ifdef-debug-output.patch | 58 + Xorg/driver/xf86-video-glamo/Makefile | 55 + .../patches/001-include-glamo-engine.patch | 12 + Xorg/font/dejavu-fonts-ttf/Makefile | 91 + Xorg/font/liberation-fonts-ttf/Makefile | 44 + Xorg/generate.sh | 30 + Xorg/lib/atk/Makefile | 46 + .../010-do-not-use-GTK_DOC-macro.patch | 11 + ...do-not-build-examples_docs_pos_tests.patch | 50 + Xorg/lib/cairo/Makefile | 66 + Xorg/lib/cairomm/Makefile | 63 + Xorg/lib/fltk2/Makefile | 65 + .../patches/000-do-not-build-fltk-and-tests | 11 + Xorg/lib/fltk2/patches/001-be-verbose | 12 + Xorg/lib/fltk2/patches/002-honor-cppflags | 26 + .../lib/fltk2/patches/100-compile-fixes.patch | 14 + Xorg/lib/gtk1/Makefile | 55 + Xorg/lib/gtk2/Makefile | 133 + .../gtk2/files/gdk-pixbuf-query-loaders.init | 12 + .../010-do-not-use-GTK_DOC-macro.patch | 11 + .../010-dont-build-demos-and-tests.patch | 28 + ...-dont-build-demos_tests_pos_examples.patch | 207 + Xorg/lib/gtk2/patches/100-compile_fix.patch | 30 + Xorg/lib/gtkmm/Makefile | 65 + .../gtkmm/patches/001-automake-compat.patch | 29 + .../patches/100-disable-tools-tests.patch | 88 + Xorg/lib/hippo-canvas/Makefile | 98 + .../patches/010-use-python-config | 17 + Xorg/lib/imlib2/Makefile | 82 + Xorg/lib/libast/Makefile | 70 + .../patches/010-dont-add-host-paths.patch | 30 + Xorg/lib/libast/patches/100-configure.patch | 22 + Xorg/lib/libdrm/Makefile | 51 + Xorg/lib/libfakekey/Makefile | 59 + Xorg/lib/libmatchbox/Makefile | 65 + Xorg/lib/librsvg/Makefile | 86 + Xorg/lib/libxcb/Makefile | 102 + Xorg/lib/mesa/Makefile | 112 + .../patches/010-fix-pkgconfig-files.patch | 90 + Xorg/lib/packages | 23 + Xorg/lib/pango/Makefile | 100 + Xorg/lib/pango/files/pango-querymodules.init | 12 + Xorg/lib/pangomm/Makefile | 70 + Xorg/lib/pixman/Makefile | 51 + Xorg/lib/qt4/Config.in | 21 + Xorg/lib/qt4/Makefile | 785 + Xorg/lib/qt4/files/qmake.mk | 60 + Xorg/lib/qt4/files/qws-qmake.conf | 45 + Xorg/lib/qt4/files/qws-qplatformdefs.h | 1 + Xorg/lib/qt4/files/x11-qmake.conf | 50 + Xorg/lib/qt4/files/x11-qplatformdefs.h | 1 + .../patches/100-do_not_use_res.defdname.patch | 35 + .../patches/200-depend-on-decoration.patch | 15 + Xorg/lib/qt4/patches/300-compile-fixes.patch | 14 + .../qt4/patches/400-do-not-pack-structs.patch | 263 + .../patches/500-allow-device-grabbing.patch | 58 + Xorg/lib/template.mk | 47 + Xorg/lib/tslib/Makefile | 62 + Xorg/lib/tslib/files/pointercal_om_gta02 | Bin 0 -> 46 bytes Xorg/lib/tslib/files/ts.conf | 25 + Xorg/lib/tslib/patches/devfs.patch | 18 + Xorg/lib/tslib/patches/event1.patch | 80 + Xorg/lib/tslib/patches/fix_version.patch | 32 + .../patches/tslib-input_raw-grab_events.patch | 120 + Xorg/lib/vte/Makefile | 111 + Xorg/lib/vte/patches/100-compile-fixes.patch | 13 + Xorg/lib/wnck/Makefile | 57 + .../100-optional_gdk_pixbuf_csource.patch | 65 + Xorg/lib/xcbproto/Makefile | 59 + Xorg/lib/xine-lib/Makefile | 66 + .../xine-lib/patches/100-compile_fix.patch | 13 + Xorg/wm/fluxbox/Makefile | 102 + Xorg/wm/fluxbox/files/init | 99 + Xorg/wm/fluxbox/files/menu | 31 + Xorg/wm/fluxbox/files/uci-defaults/x11 | 1 + .../wm/fluxbox/patches/010-fix-includes.patch | 37 + .../fluxbox/patches/100-fbrun-compile.patch | 10 + .../patches/120-fbsetroot-compile.patch | 8 + Xorg/wm/matchbox-window-manager/Makefile | 77 + .../files/uci-defaults/x11 | 1 + Xorg/xorg/app/font-util/Makefile | 45 + Xorg/xorg/app/fontconfig/Makefile | 69 + Xorg/xorg/app/iceauth/Makefile | 47 + Xorg/xorg/app/smproxy/Makefile | 40 + Xorg/xorg/app/x11perf/Makefile | 43 + Xorg/xorg/app/xauth/Makefile | 41 + Xorg/xorg/app/xkbcomp/Makefile | 45 + Xorg/xorg/app/xprop/Makefile | 43 + Xorg/xorg/app/xrandr/Makefile | 42 + .../001-xrandr-1.2.2-clone-nameclash.patch | 35 + Xorg/xorg/app/xrdb/Makefile | 40 + Xorg/xorg/app/xset/Makefile | 45 + Xorg/xorg/app/xsetroot/Makefile | 42 + Xorg/xorg/app/xwd/Makefile | 42 + Xorg/xorg/data/xbitmaps/Makefile | 48 + Xorg/xorg/data/xkbdata/Makefile | 64 + Xorg/xorg/data/xkbdata/files/nokia_n810/rx-44 | 310 + Xorg/xorg/data/xkbdata/files/nokia_n810/su-8w | 482 + Xorg/xorg/data/xkeyboard-config/Makefile | 40 + Xorg/xorg/driver/xf86-input-evdev/Makefile | 43 + Xorg/xorg/driver/xf86-input-keyboard/Makefile | 42 + Xorg/xorg/driver/xf86-input-mouse/Makefile | 42 + Xorg/xorg/driver/xf86-video-ati/Makefile | 73 + Xorg/xorg/driver/xf86-video-fbdev/Makefile | 47 + Xorg/xorg/driver/xf86-video-geode/Makefile | 44 + Xorg/xorg/driver/xf86-video-intel/Makefile | 76 + Xorg/xorg/driver/xf86-video-nv/Makefile | 73 + Xorg/xorg/driver/xf86-video-omap/Makefile | 49 + .../patches/001-misc-fixes.patch | 24 + Xorg/xorg/driver/xf86-video-vesa/Makefile | 42 + .../010-dont-mess-up-include-paths.patch | 11 + Xorg/xorg/font/encodings/Makefile | 81 + Xorg/xorg/font/font-alias/Makefile | 81 + Xorg/xorg/font/font-bh-75dpi/Makefile | 81 + Xorg/xorg/font/font-cursor-misc/Makefile | 81 + Xorg/xorg/font/font-daewoo-misc/Makefile | 81 + Xorg/xorg/font/font-dec-misc/Makefile | 81 + Xorg/xorg/font/font-ibm-type1/Makefile | 81 + Xorg/xorg/font/font-isas-misc/Makefile | 81 + Xorg/xorg/font/font-jis-misc/Makefile | 81 + Xorg/xorg/font/font-micro-misc/Makefile | 81 + Xorg/xorg/font/font-misc-cyrillic/Makefile | 81 + Xorg/xorg/font/font-misc-misc/Makefile | 135 + .../font-misc-misc/files/fonts.dir.font-base | 9 + .../files/fonts.dir.font-misc-misc | 62 + Xorg/xorg/font/font-xfree86-type1/Makefile | 81 + Xorg/xorg/font/packages | 12 + Xorg/xorg/font/template.mk | 80 + Xorg/xorg/lib/libICE/Makefile | 53 + Xorg/xorg/lib/libSM/Makefile | 55 + Xorg/xorg/lib/libX11/Makefile | 87 + .../libX11/patches/005-fix-include-path.patch | 143 + .../patches/010-ignore-groff-warnings.patch | 13 + Xorg/xorg/lib/libXau/Makefile | 56 + Xorg/xorg/lib/libXaw/Makefile | 64 + .../lib/libXaw/patches/001-fix-includes.patch | 13 + Xorg/xorg/lib/libXcomposite/Makefile | 54 + Xorg/xorg/lib/libXcursor/Makefile | 55 + Xorg/xorg/lib/libXdamage/Makefile | 55 + Xorg/xorg/lib/libXdmcp/Makefile | 54 + Xorg/xorg/lib/libXext/Makefile | 61 + Xorg/xorg/lib/libXfixes/Makefile | 56 + Xorg/xorg/lib/libXfont/Makefile | 60 + Xorg/xorg/lib/libXft/Makefile | 54 + Xorg/xorg/lib/libXi/Makefile | 61 + Xorg/xorg/lib/libXmu/Makefile | 72 + Xorg/xorg/lib/libXpm/Makefile | 56 + Xorg/xorg/lib/libXrandr/Makefile | 60 + Xorg/xorg/lib/libXrender/Makefile | 60 + Xorg/xorg/lib/libXt/Makefile | 72 + Xorg/xorg/lib/libXtst/Makefile | 56 + Xorg/xorg/lib/libXv/Makefile | 60 + Xorg/xorg/lib/libXvMC/Makefile | 60 + Xorg/xorg/lib/libXxf86vm/Makefile | 63 + Xorg/xorg/lib/libfontenc/Makefile | 55 + Xorg/xorg/lib/libpciaccess/Makefile | 69 + Xorg/xorg/lib/libxkbfile/Makefile | 55 + Xorg/xorg/lib/xtrans/Makefile | 47 + Xorg/xorg/proto/applewmproto/Makefile | 39 + Xorg/xorg/proto/bigreqsproto/Makefile | 39 + Xorg/xorg/proto/calibrateproto/Makefile | 38 + Xorg/xorg/proto/calibrateproto/src/ChangeLog | 5 + Xorg/xorg/proto/calibrateproto/src/Makefile | 527 + .../xorg/proto/calibrateproto/src/Makefile.am | 29 + .../xorg/proto/calibrateproto/src/Makefile.in | 527 + Xorg/xorg/proto/calibrateproto/src/aclocal.m4 | 548 + Xorg/xorg/proto/calibrateproto/src/autogen.sh | 12 + Xorg/xorg/proto/calibrateproto/src/config.log | 165 + .../proto/calibrateproto/src/config.status | 786 + Xorg/xorg/proto/calibrateproto/src/configure | 3163 + .../proto/calibrateproto/src/configure.ac | 6 + Xorg/xorg/proto/calibrateproto/src/install-sh | 507 + Xorg/xorg/proto/calibrateproto/src/missing | 367 + .../calibrateproto/src/xcalibrateproto.h | 95 + .../calibrateproto/src/xcalibrateproto.pc | 9 + .../calibrateproto/src/xcalibrateproto.pc.in | 9 + .../proto/calibrateproto/src/xcalibratewire.h | 43 + Xorg/xorg/proto/compositeproto/Makefile | 39 + Xorg/xorg/proto/damageproto/Makefile | 39 + Xorg/xorg/proto/dmxproto/Makefile | 38 + Xorg/xorg/proto/dri2proto/Makefile | 37 + Xorg/xorg/proto/fixesproto/Makefile | 39 + Xorg/xorg/proto/fontcacheproto/Makefile | 39 + Xorg/xorg/proto/fontsproto/Makefile | 38 + Xorg/xorg/proto/glproto/Makefile | 38 + Xorg/xorg/proto/inputproto/Makefile | 39 + Xorg/xorg/proto/kbproto/Makefile | 39 + Xorg/xorg/proto/printproto/Makefile | 39 + Xorg/xorg/proto/randrproto/Makefile | 39 + Xorg/xorg/proto/recordproto/Makefile | 39 + Xorg/xorg/proto/renderproto/Makefile | 39 + Xorg/xorg/proto/resourceproto/Makefile | 36 + Xorg/xorg/proto/scrnsaverproto/Makefile | 39 + Xorg/xorg/proto/videoproto/Makefile | 39 + Xorg/xorg/proto/windowswmproto/Makefile | 39 + Xorg/xorg/proto/xcmiscproto/Makefile | 39 + Xorg/xorg/proto/xextproto/Makefile | 39 + Xorg/xorg/proto/xf86bigfontproto/Makefile | 39 + Xorg/xorg/proto/xf86dgaproto/Makefile | 39 + Xorg/xorg/proto/xf86driproto/Makefile | 39 + Xorg/xorg/proto/xf86vidmodeproto/Makefile | 39 + Xorg/xorg/proto/xineramaproto/Makefile | 39 + Xorg/xorg/proto/xproto/Makefile | 39 + Xorg/xorg/xserver/xorg-kdrive/Config.in | 28 + Xorg/xorg/xserver/xorg-kdrive/Makefile | 150 + .../xorg-kdrive/patches/001-tslib.patch | 46 + .../patches/002-add-portrait-modes.patch | 26 + Xorg/xorg/xserver/xorg-server/Config.in | 28 + Xorg/xorg/xserver/xorg-server/Makefile | 193 + .../xorg-server/files/config.uci/generic | 17 + .../xserver/xorg-server/files/config.uci/olpc | 14 + .../xorg-server/files/config.uci/om_gta02 | 14 + .../xorg-server/files/config.xorg/generic | 64 + .../xorg-server/files/config.xorg/nokia_n810 | 43 + .../xorg-server/files/config.xorg/olpc | 78 + .../xorg-server/files/config.xorg/om_gta02 | 34 + .../xserver/xorg-server/files/tmp/x11.uci | 3 + Xorg/xorg/xserver/xorg-server/files/x.init | 56 + .../xserver/xorg-server/files/xorg-driver.mk | 3 + Xorg/xserver/xglamo/Makefile | 135 + Xorg/xserver/xglamo/files/config/x11.om_gta02 | 7 + Xorg/xserver/xglamo/files/pointercal.om_gta02 | Bin 0 -> 46 bytes Xorg/xserver/xglamo/files/x.init | 39 + .../xglamo/patches/001-fix-aclocal.patch | 14 + admin/htop/Makefile | 13 +- admin/htop/patches/001-uClibc-friendly.patch | 52 + admin/monit/Makefile | 2 +- admin/monit/files/monit.init | 17 +- admin/muninlite/Makefile | 8 +- admin/nagios/Makefile | 12 +- admin/nrpe/Makefile | 42 +- admin/nrpe/files/nrpe.init | 14 +- admin/osiris/Makefile | 4 +- admin/osiris/files/osirisd.init | 19 +- admin/pmacct/Makefile | 265 +- admin/pmacct/files/nfacctd.init | 17 +- admin/pmacct/files/pmacctd.init | 17 +- admin/pmacct/files/sfacctd.conf | 27 - admin/pmacct/files/sfacctd.default | 1 - admin/pmacct/files/sfacctd.init | 19 - admin/pmacct/files/uacctd.init | 17 +- admin/syslog-ng/Makefile | 4 +- admin/syslog-ng/files/syslog-ng.init | 24 +- admin/syslog-ng3/Makefile | 4 +- admin/syslog-ng3/files/syslog-ng.init | 24 +- admin/zabbix/Makefile | 42 +- admin/zabbix/files/zabbix_agentd.conf | 4 +- admin/zabbix/files/zabbix_agentd.init | 30 +- devel/binutils/Makefile | 8 +- devel/boost-jam/Makefile | 41 + devel/ksymoops/Makefile | 2 +- devel/perf/Makefile | 52 - ipv6/6tunnel/Makefile | 4 +- .../100-arm-fix-optc-initialization.patch | 11 - ipv6/ahcpd/Makefile | 8 +- ipv6/ahcpd/files/ahcp.sh | 93 +- ipv6/ahcpd/files/ahcpd.config | 22 +- ipv6/ahcpd/files/ahcpd.init | 92 +- .../ahcpd/patches/001-autoconf-prefixes.patch | 14 + ipv6/aiccu/Makefile | 6 +- ipv6/aiccu/files/{aiccu.config => aiccu.conf} | 0 ipv6/aiccu/files/aiccu.hotplug | 2 + ipv6/aiccu/files/aiccu.init | 104 +- ...400-retry-on-time-or-network-failure.patch | 111 - ipv6/dibbler/Makefile | 2 +- ipv6/gw6c/Makefile | 6 +- ipv6/gw6c/files/gw6c.init | 130 +- ipv6/ipv6calc/Makefile | 6 +- ipv6/miredo/Makefile | 12 +- ipv6/miredo/files/miredo-server.init | 9 +- ipv6/miredo/files/miredo.init | 10 +- ipv6/mrd6/Makefile | 4 +- ipv6/mrd6/files/mrd6.init | 17 +- ipv6/ndisc/Makefile | 25 +- ipv6/ndisc/patches/120-ppoll.patch | 2 +- ipv6/ndppd/Makefile | 62 - ipv6/ndppd/files/ndppd.init | 16 - ipv6/ptrtd/Makefile | 4 +- ipv6/ptrtd/files/ptrtd.init | 17 +- ipv6/radvd/Makefile | 4 +- ipv6/radvd/files/radvd.hotplug | 5 + ipv6/radvd/files/radvd.init | 8 +- .../100-silent-netlink-config-reload.patch | 67 - ipv6/shorewall6-lite/Makefile | 12 +- .../patches/100-hostname.patch | 11 + .../patches/110-MODULESDIR.patch | 8 +- .../shorewall6-lite/patches/120-LOGFILE.patch | 3 +- .../patches/130-portability.patch | 20 + ipv6/tayga/Makefile | 39 - ipv6/tayga/files/tayga.hotplug | 37 - ipv6/tayga/files/tayga.sh | 139 - ipv6/totd/Makefile | 14 +- ipv6/totd/files/totd.init | 17 +- .../patches/001-no_warning_as_errors.patch | 7 +- ipv6/tspc/Makefile | 8 +- ipv6/wide-dhcpv6/Makefile | 16 +- .../files/{dhcp6c.config => dhcp6c.conf} | 0 .../files/{dhcp6s.config => dhcp6s.conf} | 0 ipv6/wide-dhcpv6/files/dhcp6s.init | 24 +- lang/distribute/Makefile | 4 +- lang/jamvm/Makefile | 51 +- lang/perl-compress-bzip2/Makefile | 4 +- lang/perl-net-telnet/Makefile | 44 - lang/perl/Makefile | 13 +- lang/perl/files/config.sh-arm.in | 4 +- lang/perl/files/config.sh-armeb.in | 4 +- lang/perl/files/config.sh-avr32.in | 4 +- lang/perl/files/config.sh-i486.in | 4 +- lang/perl/files/config.sh-mips.in | 4 +- lang/perl/files/config.sh-mipsel.in | 4 +- lang/perl/files/config.sh-powerpc.in | 4 +- lang/perl/files/scan-perlbase.sh | 1 + lang/perl/patches/100-static_uudmap.patch | 7 +- lang/perl/perlbase.mk | 1 + lang/php5/Makefile | 192 +- lang/php5/files/php.init | 16 + lang/php5/files/php5-fastcgi.config | 3 - lang/php5/files/php5-fastcgi.init | 30 - lang/php5/patches/010-PECL-dio.patch | 3473 - .../011-PECL-dio-additional-baudrates.patch | 29 - lang/php5/patches/020-PECL-add-libevent.patch | 1758 - lang/php5/patches/030-PECL-add-http.patch | 29802 ------ ...fix_membar_producer_link_error_gcc41.patch | 11 + ...fix_membar_producer_link_error_gcc3x.patch | 2 +- ...bian_patches_use_embedded_timezonedb.patch | 655 - ...bian_patches_use_embedded_timezonedb.patch | 64 - .../patches/900-prevent_buildconf_force.patch | 80484 +++------------- .../950-Fix-dl-cross-compiling-issue.patch | 4 +- lang/php5/pecl.mk | 40 - lang/pycairo/Makefile | 57 + lang/pyclips/Makefile | 48 - lang/pygtk/Makefile | 85 + lang/pygtk/patches/001-automake-compat.patch | 8 + lang/pyqt4/Makefile | 154 + lang/pyqt4/files/fixup.sh | 9 + lang/pyqt4/files/qt_versioning.sh | 32 + lang/pyqt4/patches/100-cross-compile.patch | 376 + lang/pyrrd/Makefile | 50 - lang/pyrrd/patches/101-cross.patch | 10 - lang/python-django/Makefile | 51 - lang/python-eeml/Makefile | 52 - lang/python-eeml/patches/101-cross.patch | 12 - lang/python-gnome-desktop2/Makefile | 88 + lang/python-imaging-library/Makefile | 59 - .../patches/101-cross_compile.patch | 33 - lang/python/Makefile | 19 +- lang/python/patches/000-cross-compile.patch | 4 +- .../010-cannot-run-test-programm.patch | 4 +- .../python/patches/011-linux-3.x-compat.patch | 20 - .../020-dont-compile-python-files.patch | 4 +- .../patches/030-fixup-include-dirs.patch | 4 +- ...0-dont-import-cross-compiled-modules.patch | 4 +- .../patches/070-dont-clean-ipkg-install.patch | 4 +- .../080-distutils-dont_adjust_files.patch | 4 +- lang/python/patches/090-fix-ctypes.patch | 6 +- lang/python/patches/110-enable-zlib.patch | 4 +- ...0-force-internal-modules-for-hashlib.patch | 4 +- lang/ruby/Makefile | 2 +- lang/simplejson/Makefile | 46 - lang/twisted/Makefile | 2 +- libs/avahi/Makefile | 192 +- libs/axtls/Makefile | 6 +- libs/axtls/files/config | 15 +- libs/boost/Makefile | 33 +- libs/boost/patches/010-one-cpu.patch | 12 + libs/boost/patches/020-buildin-offsetof.patch | 11 + libs/boost/patches/100-do-not-use-librt.patch | 25 - libs/classpath/Makefile | 41 +- libs/clearsilver/Config.in | 1 + libs/curl/Makefile | 6 +- libs/curl/patches/100-cross-compile.patch | 20 +- libs/curl/patches/510-no_sslv2.patch | 25 + libs/cyrus-sasl/Makefile | 2 +- libs/elfutils/Makefile | 12 - libs/fcgi/Makefile | 33 +- libs/ftplib/Makefile | 51 - .../001-fix_ascii_read_without_eol.patch | 38 - .../patches/002-check_getserv_by_name.patch | 28 - libs/gconf2/Makefile | 109 + .../010-do-not-use-GTK_DOC-macro.patch | 11 + ...do-not-build-examples_docs_pos_tests.patch | 23 + libs/gd/patches/101-gdlib-config.patch | 2 +- libs/gdbm/Makefile | 10 +- .../patches/100-fix-build-with-libtool2.patch | 29 + libs/gpgme/Makefile | 63 - libs/gsl/Makefile | 5 +- libs/howl/Makefile | 8 +- libs/howl/files/autoipd.init | 15 +- libs/howl/files/mDNSResponder.init | 13 +- libs/howl/files/nifd.init | 13 +- libs/jansson/Makefile | 43 - ...jansson-add-jason_object_deep_update.patch | 50 - .../100-add-jason_object_deep_update.patch | 10 - libs/keynote/Makefile | 2 +- libs/ldns/Makefile | 42 +- libs/leptonica/Makefile | 47 - libs/libaio/Makefile | 1 + libs/libassuan/Makefile | 64 - libs/libcap/Makefile | 55 - libs/libdbi/Makefile | 6 +- libs/libdlna/Makefile | 2 +- libs/libdlna/patches/300-ffmpeg_compat.patch | 39 - libs/libdmapsharing/Makefile | 6 +- libs/libevent/Makefile | 9 +- libs/libevent2/Makefile | 9 +- libs/libftdi/Makefile | 5 +- libs/libgcrypt/Makefile | 20 +- .../patches/001-mips-h-constraint.patch | 70 + ...cs_tests.patch => 002-no_docs_tests.patch} | 20 +- libs/libgpg-error/Makefile | 32 +- libs/libimobiledevice/Makefile | 85 - libs/libmbus/Makefile | 105 - libs/libmikmod/Makefile | 6 +- libs/libmnl/Makefile | 74 - libs/libmpeg2/Makefile | 60 - .../libmpeg2/patches/101-ppc_no_altivec.patch | 66 - libs/libnatpmp/Makefile | 9 +- .../libnatpmp/patches/001-cross_compile.patch | 12 +- libs/libnetfilter-conntrack/Makefile | 2 +- libs/libnetfilter-log/Makefile | 2 +- libs/libnetfilter-queue/Makefile | 2 +- libs/libnfnetlink/Makefile | 1 + libs/libosip2/Makefile | 10 +- .../patches/001-automake-compat.patch | 2 +- libs/libpam/Makefile | 6 +- .../libpam/patches/000-OE-libpam-xtests.patch | 35 - libs/libpam/patches/001-no_nis.patch | 38 +- libs/libpam/patches/005-fix_ruserok.patch | 364 - libs/libpam/patches/006-fix_xdr.patch | 272 - libs/libplist/Makefile | 96 - libs/libsml/Makefile | 51 - .../patches/010-no-examples-tests.patch | 13 - libs/libsml/patches/020-ldflags.patch | 11 - libs/libsml/patches/030-cross-compile.patch | 8 - libs/libsndfile/Makefile | 17 +- libs/libspe2/Makefile | 47 - .../patches/001-remove_tls_requirement.patch | 93 - libs/libsrtp/Makefile | 54 - .../1003_fix_mips_namespace_collision.patch | 59 - .../patches/1005_fix_data_alignment.patch | 33 - .../patches/1007_update_Doxyfile.patch | 94 - libs/libsrtp/patches/1008_shared-lib.patch | 55 - libs/libtorrent/Makefile | 2 +- libs/libupnp/Makefile | 31 +- libs/libv4l/Makefile | 5 +- libs/lzo/Makefile | 4 +- libs/mysql/Makefile | 12 +- libs/mysql/files/mysqld.init | 27 +- libs/openldap/Makefile | 33 +- libs/openldap/files/ldap.init | 13 +- libs/openldap/patches/020-autofs-schema.patch | 8 +- libs/polarssl/Makefile | 25 +- .../patches/100-disable-testsuites.patch | 28 - libs/polarssl/patches/100-shared.patch | 11 + libs/polarssl/patches/110-make.patch | 20 + libs/postgresql/Makefile | 11 +- libs/protobuf-c/Makefile | 57 - libs/re/Makefile | 33 +- libs/rem/Makefile | 61 - libs/rrdtool-1.0.x/Makefile | 4 +- .../patches/020-x86-float-cast.patch | 13 - libs/sctp/Makefile | 1 + libs/serdisplib/Makefile | 1 + libs/spandsp/Makefile | 7 +- libs/spandsp/patches/100-compile-fixes.patch | 20 +- libs/sqlite3/Makefile | 11 +- libs/sysfsutils/Makefile | 3 +- .../patches/200-uclibc_0.9.30_compat.patch | 29 - libs/vips/Makefile | 40 +- libs/vips/patches/001-no_cpp.patch | 301 +- libs/wt/Makefile | 164 - libs/xmlrpc-c/Makefile | 70 +- mail/dovecot/Makefile | 41 +- mail/dovecot/files/dovecot.init | 17 +- mail/msmtp/Makefile | 8 +- mail/nullmailer/Makefile | 8 +- mail/ssmtp/Makefile | 7 +- mail/xmail/Makefile | 8 +- multimedia/crtmpserver/Makefile | 20 +- .../patches/010-link-crypt-for-lua.patch | 14 +- .../crtmpserver/patches/020-add-rpath.patch | 14 +- .../patches/030-default-config.patch | 50 +- .../crtmpserver/patches/040-use-select.patch | 8 +- .../050-add-missing-make-defines.patch | 22 - multimedia/darkice/Makefile | 58 - .../patches/001-upstream_svn_r494.patch | 15 - multimedia/ffmpeg/Config.in | 315 +- multimedia/ffmpeg/Makefile | 364 +- .../patches/901-fix_libswscale_on_x86.patch | 35 + multimedia/fswebcam/Makefile | 2 +- multimedia/ftpd-topfield/Makefile | 16 +- ...tpd-topfield.config => ftpd-topfield.conf} | 0 .../{ftpd-topfield.init => ftpd-topfield.sh} | 0 multimedia/gmediaserver/Makefile | 8 +- multimedia/gst-plugins-bad/Makefile | 1 + multimedia/gst-plugins-base/Makefile | 35 +- multimedia/gst-plugins-good/Makefile | 1 + multimedia/gst-plugins-ugly/Makefile | 21 +- multimedia/gstreamer/Makefile | 5 +- multimedia/hasciicam/Makefile | 13 +- multimedia/icecast/Makefile | 12 +- .../patches/001-icecast-2.3.0-tremor.patch | 130 +- .../patches/010-fix_libcurl_test_crap.patch | 2 +- multimedia/kissdx/Makefile | 8 +- multimedia/kissdx/files/kissdx.init | 7 +- multimedia/minidlna/Makefile | 49 +- multimedia/minidlna/files/minidlna.init | 11 +- .../patches/010-genconfig-checks.patch | 85 +- .../patches/020-makefile-tweaks.patch | 40 +- .../patches/040-configuration-tweak.patch | 11 +- multimedia/mjpg-streamer/Makefile | 16 +- .../mjpg-streamer/files/mjpg-streamer.config | 2 +- .../mjpg-streamer/files/mjpg-streamer.init | 61 +- {sound => multimedia}/mocp/Makefile | 2 +- multimedia/motion/Makefile | 11 +- multimedia/qc-usb/Makefile | 2 +- multimedia/spca5xx-view/Makefile | 8 +- multimedia/spca5xx-view/files/servfox.config | 6 +- multimedia/spca5xx-view/files/servfox.init | 28 +- multimedia/ushare/Makefile | 3 +- multimedia/ushare/files/ushare.config | 4 +- multimedia/ushare/files/ushare.init | 54 +- net/amwall/Makefile | 8 +- net/apcupsd/Makefile | 14 +- net/apf/Makefile | 7 +- net/aprx/Makefile | 8 +- net/aprx/files/aprx.init | 20 +- net/aria2/Makefile | 57 - net/arpwatch/Makefile | 4 +- net/arpwatch/files/arpwatch.init | 8 +- net/asterisk-1.8.x/Makefile | 32 +- net/asterisk-chan-sccp-b/Makefile | 59 - .../files/sccp.openwrt.conf | 89 - .../patches/200-register-file-version.patch | 19 - .../patches/300-stdarg.patch | 10 - net/autossh/Makefile | 8 +- net/autossh/files/autossh.config | 1 - net/autossh/files/autossh.init | 23 +- net/axel/Makefile | 19 +- net/babel/Makefile | 6 +- net/babel/files/babeld.config | 9 +- net/babel/files/babeld.init | 2 - .../patches/001-fix-local_notify_route.patch | 18 + net/baresip/Config.in | 66 + net/baresip/Makefile | 170 +- net/baresip/files/baresip.init | 11 +- net/batman-adv/Makefile | 30 +- net/batman-adv/files/etc/config/batman-adv | 1 - net/batman-adv/files/etc/init.d/batman-adv | 98 +- net/batman-adv/files/lib/batman-adv/config.sh | 103 - net/batman/Makefile | 12 +- net/bind/Makefile | 26 +- net/bind/patches/100-configure-GOST.patch | 13 - net/bind/patches/100-cross_compile.patch | 96 + net/bird/Makefile | 12 +- net/bird/files/bird4.init | 17 +- net/bird/files/bird4loop | 23 +- net/bird/files/bird6.init | 17 +- net/bird/files/bird6loop | 23 +- net/bitlbee/Makefile | 4 +- net/bitlbee/files/bitlbee.init | 9 +- net/bmxd/Makefile | 6 +- net/btpd/Makefile | 2 +- net/btpd/files/btpd.init | 26 +- net/chaosvpn/Makefile | 7 +- net/chaosvpn/files/chaosvpn.init | 8 +- net/chrony/Makefile | 6 +- net/chrony/patches/001-crosscompile.patch | 18 +- net/coova-chilli/Makefile | 4 +- net/crowdcontrol/Makefile | 13 +- net/cups/Makefile | 4 +- net/cups/files/cupsd.init | 17 +- net/darkstat/Makefile | 4 +- .../files/{darkstat.config => darkstat.conf} | 0 net/ddns-scripts/Makefile | 2 +- net/ddns-scripts/files/etc/config/ddns | 20 +- .../files/usr/lib/ddns/dynamic_dns_updater.sh | 33 - net/ddns-scripts/files/usr/lib/ddns/services | 16 +- net/deluge/Makefile | 2 +- net/deluge/files/deluge.config | 3 +- net/deluge/files/deluge.init | 102 +- net/ditg/Makefile | 40 +- net/ditg/patches/001-no_stropts.h | 11 + net/djbdns/Makefile | 9 +- net/dmapd/Makefile | 8 +- net/dmapd/files/dmapd.init | 26 +- net/dmapd/patches/001-dmapd_conf.patch | 7 +- net/dudders/Makefile | 6 +- .../files/{dudders.config => dudders.conf} | 0 net/et131x/Makefile | 2 +- net/etherwake/Makefile | 8 +- net/ez-ipupdate/Makefile | 8 +- net/freepops/Makefile | 6 +- net/freeradius2/Makefile | 8 +- net/freeswitch/Makefile | 261 +- .../autoload_configs/dingaling.conf.xml | 9 - .../autoload_configs/modules.conf.xml | 14 +- .../files/etc.minimal/freeswitch.xml | 21 +- .../autoload_configs/blacklist.conf.xml | 11 - .../blacklist/blacklists/blocked.list | 0 .../autoload_configs/event_multicast.conf.xml | 14 - .../autoload_configs/http_cache.conf.xml | 8 - .../autoload_configs/pocketsphinx.conf.xml | 12 - .../files/etc.packages/say-de/lang/de/de.xml | 12 +- .../say-en/lang/en/dir/sounds.xml | 220 +- .../etc.packages/say-en/lang/en/dir/tts.xml | 171 +- .../files/etc.packages/say-en/lang/en/en.xml | 15 +- .../say-en/lang/en/ivr/sounds.xml | 65 - .../etc.packages/say-en/lang/en/vm/sounds.xml | 41 +- .../files/etc.packages/say-fr/lang/fr/fr.xml | 14 +- .../say-he/lang/he/demo/demo-ivr.xml | 148 - .../etc.packages/say-he/lang/he/demo/demo.xml | 71 - .../say-he/lang/he/dir/sounds.xml | 121 - .../files/etc.packages/say-he/lang/he/he.xml | 11 - .../etc.packages/say-he/lang/he/vm/sounds.xml | 404 - .../files/etc.packages/say-ru/lang/ru/ru.xml | 12 +- .../etc.packages/sms/chatplan/default.xml | 14 - .../unimrcp/autoload_configs/unimrcp.conf.xml | 23 - .../autoload_configs/voicemail.conf.xml | 9 +- .../patches/000-build-openwrt_rules.mk.patch | 7 - net/freeswitch/patches/001-Makefile.am.patch | 20 + .../patches/001-build-modules_conf_in.patch | 33 - net/freeswitch/patches/002-Makefile.am.patch | 49 - ...file.patch => 002-libs-esl-Makefile.patch} | 8 +- ...vent_handlers-mod_event_zmq-Makefile.patch | 10 + .../patches/004-build-modules_conf_in.patch | 10 + ...applications-mod_mp4-mp4_helper_hpp.patch} | 0 ...005-src-mod-codecs-mod_opus-Makefile.patch | 18 - .../006-src-include-timerfd_wrap_h.patch | 27 - ...c-mod-endpoints-mod_gsmopen-Makefile.patch | 26 - ...mod-event_handlers-mod_snmp-Makefile.patch | 16 - ...009-src-mod-codecs-mod_silk-Makefile.patch | 15 - net/frickin/Makefile | 16 +- net/frickin/files/frickin.config | 13 - net/frickin/files/frickin.default | 16 + net/frickin/files/frickin.init | 60 +- net/fwknop/Makefile | 119 - net/fwknop/patches/001-fix_config.patch | 33 - net/gpsd/Makefile | 8 +- net/haproxy/Makefile | 13 +- net/haproxy/files/haproxy.cfg | 9 +- net/haproxy/files/haproxy.init | 19 +- .../patches/001-haproxy-1.4.x-sendproxy.patch | 461 - net/hiawatha/Makefile | 16 +- net/horst/Makefile | 8 +- net/horst/patches/001-endian_fixes.patch | 96 + net/horst/patches/100-compile-fixes.patch | 12 +- net/httping/Makefile | 46 +- net/httping/patches/001-extra_flags.patch | 20 + net/httping/patches/002-version.patch | 8 +- net/httptunnel/Makefile | 12 +- .../{httptunnel.config => httptunnel.conf} | 0 net/igmpproxy/Makefile | 4 +- net/igmpproxy/files/igmpproxy.conf | 4 +- net/igmpproxy/files/igmpproxy.init | 20 +- net/imsnif/Makefile | 14 +- net/imspector/Makefile | 7 +- net/imspector/files/imspector.config | 2 +- net/imspector/files/imspector.init | 59 +- net/iodine/Makefile | 8 +- net/iodine/files/iodined.init | 21 +- net/ipsec-tools/Makefile | 13 +- net/ipsec-tools/files/racoon.init | 17 - .../patches/001-ipsec-tools-def-psk.patch | 25 - net/ipsec-tools/patches/002-patch8-utmp.patch | 73 - .../003-linux_2.6.19_rtnetlink_changes.diff | 20 + .../patches/003-microsoft-fqdn-in-main.patch | 14 - net/ipsec-tools/patches/004-opennhrp.patch | 1659 + net/ipsec-tools/patches/005-isakmp-fix.patch | 11 - net/ipset/Makefile | 84 - net/ipset/patches/001-2.6.35.patch | 62 - net/ipupdate/Makefile | 8 +- net/iputils/Makefile | 1 + net/irssi/Makefile | 10 +- net/isakmpd/Makefile | 2 +- net/kamailio/Makefile | 1 - net/keepalived/Makefile | 4 +- net/keepalived/files/keepalived.init | 9 +- net/krb5/Makefile | 9 +- net/l2tpv3tun/Makefile | 50 - net/l2tpv3tun/files/l2tp.sh | 213 - net/l2tpv3tun/patches/010-custom_ifname.patch | 20 - .../patches/100-nl_handle_alloc.patch | 23 - net/leafnode/Makefile | 12 +- net/leafnode/files/leafnode.init | 13 - net/lftp/Makefile | 8 +- net/lighttpd/Makefile | 13 +- net/lighttpd/files/lighttpd.default | 1 + net/lighttpd/files/lighttpd.init | 19 +- net/lighttpd/patches/001-no_ec.patch | 14 - net/linuxigd/Makefile | 6 +- net/linuxigd/files/upnpd.init | 30 +- net/live/Makefile | 44 - net/live/patches/101-openwrt.patch | 23 - net/lldpd/Makefile | 9 +- net/lldpd/files/lldpd.init | 41 +- net/lsm/Makefile | 16 +- net/lsm/files/lsm.init | 39 +- net/madwimax/Makefile | 6 +- .../files/{madwimax.init => madwimax} | 0 net/mdnsresponder/Makefile | 107 +- net/mdnsresponder/files/mDNSResponder.conf | 4 - net/mdnsresponder/files/mDNSResponder.init | 12 +- net/mdnsresponder/files/mdnsd.init | 14 - net/memcached/Makefile | 18 +- net/memcached/files/memcached.init | 29 +- net/memcached/patches/100-fix_iov_max.patch | 6 +- net/mini_snmpd/Makefile | 29 +- net/mini_snmpd/files/mini_snmpd.config | 18 +- net/mini_snmpd/files/mini_snmpd.init | 46 +- net/mini_snmpd/patches/100-dualstack.patch | 93 +- net/miniupnpc/Makefile | 4 +- net/miniupnpd/Makefile | 12 +- net/miniupnpd/files/miniupnpd.init | 39 +- net/mosquitto/Makefile | 99 - .../100-disable-memory-reporting.patch | 12 - .../patches/101-disable-docbook.patch | 11 - net/mrtg/Makefile | 55 - .../001-rm-printf-longlong-fmt-test.patch | 50 - net/mtr/Makefile | 6 +- net/mtr/patches/520-libresolv_fix.patch | 4 +- net/mtr/patches/521-gtk_fix.patch | 8 +- net/n2n/Makefile | 18 +- net/n2n/files/n2n.init | 69 +- net/natpmp/Makefile | 13 +- net/nbd/Makefile | 6 +- net/ndyndns/Makefile | 20 +- net/ndyndns/files/ndyndns.default | 3 + net/ndyndns/files/ndyndns.init | 19 +- net/netatalk/Makefile | 51 +- net/netatalk/files/AppleVolumes.system | 326 + net/netatalk/files/afpd.conf | 2 +- net/netatalk/files/afpd.init | 13 +- .../patches/001-automake-compat.patch | 9 - net/netperf/Makefile | 4 +- net/netperf/files/netserver.init | 7 +- net/nfs-kernel-server/Makefile | 15 +- net/nfs-kernel-server/files/nfsd.init | 12 +- .../patches/001-nfs_utils_uclibc.patch | 35 + .../patches/002-no_ttycom_h.patch | 26 + ...o_malloc_h.patch => 003-no_malloc_h.patch} | 2 +- .../patches/100-nfs_utils_uclibc.patch | 49 - net/nfs-server/Makefile | 14 +- net/nfs-server/files/nfsd.init | 13 +- net/nginx/Makefile | 26 +- net/nginx/patches/001-feature_test_fix | 136 + ...eof_test_fix.patch => 002-sizeof_test_fix} | 0 net/nginx/patches/101-feature_test_fix.patch | 107 - net/nginx/patches/103-sys_nerr.patch | 13 - net/nmap/Makefile | 6 +- net/nocatauth/Makefile | 9 +- net/nodogsplash/Makefile | 8 +- net/ntpd/Makefile | 52 +- net/ntpd/files/ntp.conf | 5 +- net/ntpd/files/ntpd.init | 12 +- net/ntripcaster/Makefile | 49 - net/ntripclient/Makefile | 43 - net/ntripserver/Makefile | 43 - net/nuttcp/Makefile | 80 - net/nzbget/Makefile | 8 +- net/oidentd/Makefile | 4 +- net/oidentd/files/oidentd.init | 7 +- net/olsrd/Makefile | 8 +- net/olsrd/files/olsrd.init | 152 +- .../200-txtinfo_gateways_formatting.patch | 20 + net/openl2tp/Makefile | 93 +- net/openl2tp/patches/001-makefile.patch | 43 +- net/openl2tp/patches/002-no_libfl.patch | 22 - net/opennhrp/Makefile | 10 +- net/opennhrp/files/opennhrp.init | 12 +- net/opennhrp/patches/100-compile-fix.patch | 14 + net/openslp/Makefile | 8 +- net/openssh/Makefile | 53 +- net/openssh/files/sshd.init | 28 +- .../patches/140-pam_uclibc_pthreads_fix.patch | 84 - net/openswan/Makefile | 12 +- net/openswan/files/ipsec.conf | 8 - net/openswan/files/ipsec.config | 2 - net/openswan/files/ipsec.init | 184 +- net/openswan/files/ipsec.secrets | 7 - net/openswan/files/ipsec.upgrade | 3 - net/openswan/patches/110-scripts.patch | 14 + .../patches/130-compat_net_dev_ops.patch | 19 + net/openvpn-devel/Makefile | 2 +- net/openvpn-polarssl/Makefile | 64 - net/openvpn-polarssl/files | 1 - .../300-fix-plugin_call-with-ssl.patch | 118 - ...-fix-undefined-print_default.gateway.patch | 36 - net/openvpn/Config.in | 84 - net/openvpn/Makefile | 114 +- net/openvpn/files/openvpn.config | 6 +- net/openvpn/files/openvpn.init | 86 +- net/openvpn/patches/001-easy_rsa.patch | 106 +- net/p910nd/Makefile | 8 +- .../files/{p910nd.config => p910nd.conf} | 0 net/paris-traceroute/Makefile | 48 - net/parprouted/Makefile | 14 +- net/parprouted/files/parprouted.config | 11 - net/parprouted/files/parprouted.default | 1 + net/parprouted/files/parprouted.init | 41 +- net/polipo/Makefile | 4 +- net/polipo/files/polipo.init | 36 +- net/portmap/Makefile | 4 +- net/portmap/files/portmap.init | 11 +- net/portsentry/Makefile | 16 +- net/portsentry/files/portsentry.init | 19 +- net/privoxy/Makefile | 8 +- net/privoxy/files/privoxy.init | 14 +- net/prosody/Makefile | 42 +- net/prosody/files/prosody.init | 15 +- net/ptpd/Makefile | 2 +- net/ptpd/files/ptpd.init | 5 +- net/ptunnel/Makefile | 8 +- .../files/{ptunnel.config => ptunnel.conf} | 0 net/ptunnel/files/ptunnel.init | 38 +- net/pure-ftpd/Makefile | 5 +- net/pure-ftpd/files/pure-ftpd.init | 32 +- net/pyload/Makefile | 49 - net/pyload/files/pyload.init | 12 - net/pyrit/Makefile | 49 - net/quagga/Makefile | 8 +- .../patches/010-fix-format-warnings.patch | 22 + .../patches/020-fix-ipv6-build-failure.patch | 31 + .../patches/030-fix-opaque-support.patch | 91 + net/quagga/patches/120-quagga_manet.patch | 114 +- net/quagga/patches/140-holdtimer-set.patch | 4 +- net/quagga/patches/150-no-cross-fs-link.patch | 4 +- net/quagga/patches/160-pgbgp.patch | 12 +- net/quagga/patches/161-pgbgp-addon.patch | 6 +- net/quicktun/Makefile | 2 +- net/quicktun/files/quicktun.config | 2 +- net/quicktun/files/quicktun.init | 93 +- net/radsecproxy/Makefile | 15 +- net/radsecproxy/files/radsecproxy.init | 10 +- net/rarpd/Makefile | 30 +- net/rarpd/files/rarpd.config | 13 - net/rarpd/files/rarpd.default | 4 + net/rarpd/files/rarpd.init | 84 +- net/reaim/Makefile | 4 +- net/reaim/files/reaim.init | 30 +- net/remotefs/Makefile | 14 +- net/restund/Makefile | 97 +- net/restund/files/restund.init | 9 +- net/rinetd/Makefile | 4 +- net/rinetd/files/rinetd.init | 24 +- net/rp-l2tp/Makefile | 12 +- net/rp-l2tp/files/rp-l2tpd.init | 10 +- net/rp-pppoe/Makefile | 50 +- net/rp-pppoe/files/pppoe-relay.init | 8 +- net/rp-pppoe/files/pppoe-server.init | 7 +- net/rsync/Makefile | 6 +- net/rsync/files/rsyncd.init | 9 +- net/samba/Makefile | 11 +- net/samba3/Config.in | 22 +- net/samba3/Makefile | 130 +- net/samba3/files/config-lfs.h | 56 + net/samba3/files/samba-nmbd.init | 12 - net/samba3/files/samba.config | 27 +- net/samba3/files/samba.init | 93 +- net/samba3/files/smb.conf.template | 3 +- net/samba3/patches/100-avm.patch | 7130 +- net/samba3/patches/110-compile_fixes.patch | 87 +- net/samba3/patches/120-owrt_paths.patch | 82 +- net/samba3/patches/130-owrt_smbpasswd.patch | 30 +- net/samba3/patches/140-no_mmap.patch | 27 + net/samba3/patches/150-fix_ls.patch | 8 +- net/samba3/patches/160-fix_log.patch | 8 +- net/samba3/patches/170-no_rpc.patch | 47 +- .../patches/180-fix_duplicate_define.patch | 12 + net/samba3/patches/200-fix-configure.patch | 12 - .../patches/500-remove_avm_smaller.patch | 76 - net/samba3/patches/510-remove-printing.patch | 47 - net/scanlogd/Makefile | 9 +- net/scanlogd/files/scanlogd.init | 13 +- net/seeks/Makefile | 4 +- net/seeks/files/seeks.init | 17 +- net/shfs/Makefile | 89 + net/shfs/patches/100-kmod_build.patch | 100 + .../patches/101-shfs_0.35_2.6.18_dentry.patch | 166 + .../102-shfs_0.35_clean_inode_clear.patch | 22 + net/shfs/patches/103-shfs_0.35_gcc4.patch | 25 + .../patches/104-shfs_0.35_inode_and_fs.patch | 377 + net/shfs/patches/105-space_chars.patch | 70 + net/shfs/patches/106-uidgid32.patch | 38 + net/shfs/patches/107-df.patch | 38 + net/shfs/patches/108-no_update_mtab.patch | 28 + net/shfs/patches/109-linux_2.6.22.patch | 26 + net/shorewall-lite/Makefile | 8 +- .../patches/110-MODULESDIR.patch | 4 +- net/siproxd/Makefile | 52 +- net/siproxd/files/siproxd.config | 4 +- net/siproxd/files/siproxd.init | 343 +- .../010-fix-bogus-libltdl-dependency.patch | 18 +- net/smtptrapd/Makefile | 4 +- net/smtptrapd/files/smtptrapd.init | 151 +- net/snort/Makefile | 155 +- net/snort/files/snort.default | 2 +- net/snort/files/snort.local.rules | 5 - .../patches/750-lightweight-config.patch | 58 +- net/softflowd/Makefile | 8 +- net/softflowd/files/softflowd.config | 2 +- net/softflowd/files/softflowd.init | 67 +- net/speedtouch-usb-firmware/Makefile | 2 +- net/squid/Makefile | 7 +- net/srelay/Makefile | 4 +- net/srelay/files/srelay.init | 11 +- net/sshtunnel/Makefile | 5 +- .../files/{sshtunnel.init => initd_sshtunnel} | 0 net/sslh/Makefile | 14 +- net/sslh/files/sslh.config | 16 +- net/sslh/files/sslh.init | 148 +- net/sslh/patches/001-no_sslh_select.patch | 29 - net/sslh/patches/001-no_strip.patch | 10 + net/strongswan/Makefile | 97 + net/strongswan/files/ipsec.button | 34 + net/strongswan/files/ipsec.conf | 34 + net/strongswan/files/ipsec.config | 21 + net/strongswan/files/ipsec.cron | 2 + net/strongswan/files/ipsec.iface | 8 + net/strongswan/files/ipsec.init | 101 + net/strongswan/patches/100-ar-fixes.patch | 81 + net/strongswan/patches/110-make-ipsec.patch | 11 + net/strongswan/patches/120-make-pluto.patch | 13 + net/strongswan/patches/130-make-starter.patch | 21 + .../patches/200-wakeup-showstatus.patch | 234 + net/strongswan/patches/210-updown.patch | 662 + net/strongswan/patches/300-openwrt.patch | 26 + .../patches/310-make-ipsec-alg.patch | 19 + net/strongswan/patches/320-no-modprobe.patch | 108 + .../patches/350-make-programs.patch | 21 + .../patches/400-pluto-fix_CIRCLEQ.patch | 149 + net/strongswan4/Makefile | 41 +- net/stun/Makefile | 6 +- net/stun/files/stund.init | 20 +- net/subversion/Makefile | 2 +- net/subversion/files/subversion.init | 22 +- net/tctool/Makefile | 20 +- net/tftp-hpa/Makefile | 4 +- net/tftp-hpa/files/tftpd-hpa.init | 9 +- net/tinc/Makefile | 21 +- net/tinc/files/tinc.config | 56 - net/tinc/files/tinc.init | 232 - net/tinc/files/tinc.upgrade | 1 - net/tinyproxy/Makefile | 2 +- net/tinyproxy/files/tinyproxy.config | 2 +- net/tinyproxy/files/tinyproxy.init | 23 +- net/tor-alpha/Makefile | 69 +- net/tor-alpha/files/tor.init | 38 +- net/tor-alpha/patches/001-torrc.patch | 3 +- net/tor/Makefile | 46 +- net/tor/files/tor.init | 38 +- net/tor/patches/001-torrc.patch | 3 +- net/transmission/Makefile | 6 +- net/transmission/files/transmission.config | 11 +- net/transmission/files/transmission.init | 90 +- .../patches/010-opt_scrape_paused.patch | 131 + net/udpxy/Makefile | 7 +- net/uftp/Makefile | 163 - net/uhub/Makefile | 8 +- net/ulogd/Makefile | 4 +- net/ulogd/files/ulogd.init | 13 +- net/umurmur/Makefile | 18 +- net/unbound/Makefile | 145 +- net/unbound/files/named.cache | 5 +- net/unbound/files/{root.key => root.autokey} | 0 net/unbound/files/unbound.conf | 83 + net/unbound/patches/001-conf.patch | 154 - net/unfs3/Makefile | 8 +- net/unfs3/files/unfs3.init | 13 +- net/uob-nomad/Makefile | 11 +- net/updatedd/Makefile | 4 +- net/updatedd/files/updatedd.init | 23 +- net/usbip/Makefile | 48 +- ..._r152.patch => 000-upstream_svn_152.patch} | 0 net/usbip/patches/001-upstream_svn_r99.diff | 11 - net/vnstat/Makefile | 10 +- .../files/{vnstat.config => vnstat-uci.conf} | 0 net/vpzone/Makefile | 4 +- net/vpzone/files/vpzone.init | 10 +- net/vrrpd/Makefile | 20 +- net/vrrpd/files/vrrpd.config | 29 - net/vrrpd/files/vrrpd.default | 4 + net/vrrpd/files/vrrpd.init | 95 +- net/vsftpd/Makefile | 4 +- net/vsftpd/files/vsftpd.init | 9 +- net/wavemon/Makefile | 33 +- .../patches/000-upstream-config_menu.patch | 32 + .../patches/000-upstream-negative.patch | 40 + .../patches/000-upstream-terminate.patch | 90 + .../patches/000-upstream-wrapper.patch | 397 + net/weechat/Makefile | 4 +- net/wing/Makefile | 25 +- net/wing/files/etc/uci-defaults/wing | 33 +- net/wing/files/lib/network/wing.sh | 18 +- net/wing/files/usr/bin/wing_status | 124 - net/wing/patches/010-libc-compat.patch | 20 + net/wol/Makefile | 8 +- net/wshaper/Makefile | 5 - net/xinetd/Makefile | 4 +- net/xinetd/files/xinetd.init | 13 +- net/xtables-addons/Makefile | 16 +- .../patches/001-no_depmod.patch | 22 +- .../002-fix-kernel-version-detection.patch | 34 +- .../patches/003-redundant-bracket.patch | 6 +- .../patches/100-add-rtsp-conntrack.patch | 1332 - net/yaddns/Makefile | 4 +- net/znc/Makefile | 45 +- net/znc/files/znc.init | 4 +- .../001-move_rootcheck_after_config.patch | 4 +- net/znc/patches/002-Uclibcpp_build_fix.patch | 2 +- net/znc/patches/003-Reduce_rebuild_time.patch | 2 +- net/znc/patches/004-fix_memleak.patch | 14 + sound/alsa/Makefile | 67 + sound/alsa/files/alsa.modules | 10 + sound/alsa/patches/100-compile_fix.patch | 19 + sound/alsa/patches/110-cp_command.patch | 13 + sound/alsa/patches/120-sndfops.patch | 13 + sound/listener/Makefile | 48 - sound/listener/files/listener.conf | 20 - sound/listener/patches/100-makefile.patch | 31 - .../mocp/patches/001-moc-ffmpeg-update.patch | 34 - sound/mpd/Makefile | 189 +- sound/mpd/files/mpd.init | 16 +- sound/mpdas/Makefile | 6 +- sound/mpdas/files/mpdas.init | 10 +- sound/mpdas/patches/001-flags.patch | 19 +- sound/pulseaudio/Makefile | 168 +- sound/pulseaudio/files/pulseaudio.init | 21 +- .../patches/001-no_default_64mb_alloc.patch | 8 +- sound/scmpc/Makefile | 10 +- sound/scmpc/files/scmpc.init | 11 +- utils/anyremote/Makefile | 8 +- utils/anyremote/files/anyremote.init | 14 +- utils/ap51-flash/Makefile | 8 +- .../{ap51-flash.config => ap51-flash.conf} | 0 utils/at/Makefile | 2 +- utils/at/files/atd.init | 20 +- utils/avrusbboot/Makefile | 6 +- utils/bandwidthd/Makefile | 8 +- utils/bandwidthd/files/bandwidthd.init | 7 +- utils/bash-completion/Makefile | 12 +- utils/bemused/Makefile | 9 +- utils/bemused/files/bemused.init | 11 +- utils/bluez-utils/Makefile | 16 +- .../{bluetooth.config => bluetooth.conf} | 0 utils/bluez-utils/files/bluez-utils.init | 35 +- utils/boxbackup/Makefile | 140 - utils/boxbackup/files/bbstoreaccounts | 34 - utils/boxbackup/files/bbstored.config | 26 - utils/boxbackup/files/bbstored.init | 22 - utils/boxbackup/files/bbstored.sh | 164 - utils/broadcom-sdhc/Makefile | 63 + utils/bsdiff/Makefile | 42 - utils/bsdiff/patches/001-makefile.patch | 11 - utils/btrfs-progs/Makefile | 2 +- utils/bzip2/Makefile | 33 +- utils/cmdpad/Makefile | 12 +- utils/cmdpad/files/cmdpad.init | 12 +- utils/collectd/Makefile | 9 +- utils/collectd/files/collectd.init | 25 +- .../collectd/patches/004-version-gen-shell.sh | 8 - .../patches/400-fix-olsrd-get-all.patch | 11 - utils/cryptsetup/Makefile | 2 +- utils/cwiid/Makefile | 1 + utils/dash/Makefile | 10 +- utils/dbus-x/Makefile | 81 + utils/dbus/Makefile | 10 +- utils/dbus/files/dbus.init | 28 +- .../patches/002-no_wno_pointer_sign.patch | 12 + utils/dbus/patches/01-dbus-nopie-fix.patch | 22 + utils/dialog/Makefile | 22 +- utils/dstat/Makefile | 47 - utils/fancontroled/Makefile | 4 +- utils/fancontroled/files/fancontroled.init | 9 +- utils/flashrom/Makefile | 6 +- utils/gadgetfs-test/Makefile | 2 +- utils/gnuplot/Makefile | 23 +- utils/gnuplot/patches/010-Makefile.in.patch | 6 +- utils/hd-idle/Makefile | 6 +- utils/hd-idle/files/hd-idle.init | 17 +- utils/hplip/Makefile | 13 +- utils/hplip/files/hplib.conf | 2 - utils/i2c-tools/Makefile | 1 + utils/lcd4linux/Config.in | 409 +- utils/lcd4linux/Makefile | 297 +- utils/lcd4linux/files/lcd4linux.conf | 1224 + utils/lcd4linux/files/lcd4linux.init | 13 +- .../patches/100-drv_RouterBoard.patch | 6 +- .../patches/120-remove_parport_outb.patch | 12 +- .../patches/140-no_repnop_T6963.patch | 10 +- .../patches/150-addlibmpdclient.patch | 10 +- utils/lcd4linux/patches/160-uinput_defs.patch | 7 +- ...bc-logarithm-fix.patch => 170-log2f.patch} | 2 +- utils/lirc/Makefile | 1 + utils/loop-aes/Makefile | 4 +- utils/lrzsz/Makefile | 12 +- utils/lvm2/Makefile | 4 +- utils/mc/Config.in | 20 - utils/mc/Makefile | 60 +- utils/md5deep/Makefile | 40 - utils/md5deep/patches/101-cross_compile.patch | 20 - utils/mdadm/Makefile | 1 + utils/mksh/Makefile | 8 +- utils/msr-tools/Makefile | 54 - .../patches/100-multiprocessor.patch | 28 - utils/mtd-utils/Makefile | 87 +- .../100-mtd-debug-add-bad-block-counter.patch | 73 - utils/ntfsprogs/Makefile | 17 +- utils/owfs/Makefile | 23 +- utils/pcmciautils/Makefile | 9 +- utils/pcsc-lite/Makefile | 9 +- utils/pcsc-lite/files/pcscd.init | 9 +- utils/petitboot/Makefile | 113 - utils/petitboot/files/petitboot.init | 22 - .../patches/010-petitboot-fixups.diff | 391 - .../patches/020-petitboot-fix-pb-twin.diff | 1521 - utils/petitboot/petitboot-config.in | 65 - utils/powertop/Makefile | 13 +- utils/psmisc/Makefile | 8 +- utils/psplash/Makefile | 7 +- utils/psplash/files/{psplash.init => init} | 0 utils/retutahvo/Makefile | 41 + utils/retutahvo/files/src/Makefile | 4 + utils/retutahvo/files/src/retutahvo.c | 270 + utils/retutahvo/files/src/user_retu_tahvo.h | 75 + utils/rng-tools/Makefile | 44 - utils/rng-tools/files/rngd.init | 16 - utils/rrdcollect/Makefile | 94 +- utils/rrdcollect/files/rrdcollect.init | 19 +- utils/rrdtool/Makefile | 4 +- .../rrdtool/patches/020-x86-float-cast.patch | 13 - utils/sane-backends/Makefile | 16 +- .../patches/001-remove-unneeded.patch | 2 +- .../010-dont-add-host-include-path.patch | 4 +- .../patches/020-non-i386-qcam.patch | 4 +- utils/screen/Makefile | 10 +- utils/setserial/Makefile | 12 +- utils/setserial/files/serial.init | 7 + utils/setserial/files/setserial.config | 6 - utils/setserial/files/setserial.init | 34 - utils/sierra-pcmcia/Makefile | 2 +- utils/sispmctl/Makefile | 14 +- utils/smartmontools/Makefile | 49 +- utils/smartmontools/files/smartd.init | 22 +- utils/stress/Makefile | 1 + utils/tar/Makefile | 2 +- utils/tesseract/Makefile | 57 - utils/testusb/Makefile | 2 +- utils/time/Makefile | 57 - utils/time/patches/001-fix-configure.patch | 22 - utils/time/patches/002-fix-rusage.patch | 11 - utils/tmux/Makefile | 10 +- utils/ucmb-tools/Makefile | 41 + utils/ucmb-tools/tools/Makefile | 17 + utils/ucmb-tools/tools/ucmb.c | 120 + utils/ucmb/Makefile | 65 + utils/ucmb/driver/Makefile | 1 + utils/ucmb/driver/ucmb.c | 656 + utils/ucmb/driver/ucmb.h | 77 + .../atmel_avr8/ucmb.c | 233 + .../atmel_avr8/ucmb.h | 24 + .../atmel_avr8_optimized/ucmb.c | 530 + .../atmel_avr8_optimized/ucmb.h | 36 + utils/upx/Makefile | 6 +- utils/usb-modeswitch-data/Makefile | 6 +- utils/usb-modeswitch/Makefile | 8 +- utils/usb-modeswitch/files/modeswitch.hotplug | 15 +- utils/usbmuxd/Makefile | 84 - utils/usbutils/Makefile | 4 +- utils/wifitoggle/Makefile | 5 +- ...{wifitoggle.hotplug => hotplug_wifitoggle} | 0 .../{wifitoggle.config => uci_wifitoggle} | 0 utils/xdelta3/Makefile | 42 - .../001-decrease-default-window-size.patch | 19 - utils/zoneinfo/Makefile | 254 - 1210 files changed, 58669 insertions(+), 124868 deletions(-) create mode 100644 Xorg/app/dillo/Makefile create mode 100644 Xorg/app/dillo/files/dillo.desktop create mode 100644 Xorg/app/dillo/files/dillo.png create mode 100644 Xorg/app/dillo/patches/000-do-not-need-flt2-util.patch create mode 100644 Xorg/app/eterm/Makefile create mode 100644 Xorg/app/eterm/patches/010-dont-add-host-paths.patch create mode 100644 Xorg/app/gtkperf/Makefile create mode 100644 Xorg/app/gtkperf/patches/000-disable-autotools.patch create mode 100644 Xorg/app/gtkperf/patches/010-change-layout.patch create mode 100644 Xorg/app/matchbox-keyboard/Makefile create mode 100644 Xorg/app/packages create mode 100644 Xorg/app/pwrtray/Makefile create mode 100755 Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend create mode 100644 Xorg/app/pwrtray/files/etc/pwrtray-backendrc create mode 100644 Xorg/app/qwo/Makefile create mode 100644 Xorg/app/rxvt/Makefile create mode 100644 Xorg/app/rxvt/files/icon.png create mode 100644 Xorg/app/rxvt/files/rxvt.desktop create mode 100644 Xorg/app/template.mk create mode 100644 Xorg/app/xcalc/Makefile create mode 100644 Xorg/app/xclipboard/Makefile create mode 100644 Xorg/app/xdm/Makefile create mode 100644 Xorg/app/xeyes/Makefile create mode 100644 Xorg/app/xine-ui/Makefile create mode 100644 Xorg/app/xine-ui/patches/100-cflags.patch create mode 100644 Xorg/app/xine-ui/patches/110-xitk.patch create mode 100644 Xorg/app/xine-ui/patches/120-remove-delay.patch create mode 100644 Xorg/app/xinit/Makefile create mode 100644 Xorg/app/xmessage/Makefile create mode 100644 Xorg/app/xterm/Makefile create mode 100644 Xorg/app/xterm/files/terminal.png create mode 100644 Xorg/app/xterm/files/xterm.desktop create mode 100644 Xorg/app/xterm/patches/010-no-transform.patch create mode 100644 Xorg/driver/xf86-input-tslib/Makefile create mode 100644 Xorg/driver/xf86-input-tslib/files/pointercal.om_gta02 create mode 100644 Xorg/driver/xf86-input-tslib/patches/100-ifdef-debug-output.patch create mode 100644 Xorg/driver/xf86-video-glamo/Makefile create mode 100644 Xorg/driver/xf86-video-glamo/patches/001-include-glamo-engine.patch create mode 100644 Xorg/font/dejavu-fonts-ttf/Makefile create mode 100644 Xorg/font/liberation-fonts-ttf/Makefile create mode 100755 Xorg/generate.sh create mode 100644 Xorg/lib/atk/Makefile create mode 100644 Xorg/lib/atk/patches/010-do-not-use-GTK_DOC-macro.patch create mode 100644 Xorg/lib/atk/patches/020-do-not-build-examples_docs_pos_tests.patch create mode 100644 Xorg/lib/cairo/Makefile create mode 100644 Xorg/lib/cairomm/Makefile create mode 100644 Xorg/lib/fltk2/Makefile create mode 100644 Xorg/lib/fltk2/patches/000-do-not-build-fltk-and-tests create mode 100644 Xorg/lib/fltk2/patches/001-be-verbose create mode 100644 Xorg/lib/fltk2/patches/002-honor-cppflags create mode 100644 Xorg/lib/fltk2/patches/100-compile-fixes.patch create mode 100644 Xorg/lib/gtk1/Makefile create mode 100644 Xorg/lib/gtk2/Makefile create mode 100755 Xorg/lib/gtk2/files/gdk-pixbuf-query-loaders.init create mode 100644 Xorg/lib/gtk2/patches/010-do-not-use-GTK_DOC-macro.patch create mode 100644 Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch create mode 100644 Xorg/lib/gtk2/patches/030-dont-build-demos_tests_pos_examples.patch create mode 100644 Xorg/lib/gtk2/patches/100-compile_fix.patch create mode 100644 Xorg/lib/gtkmm/Makefile create mode 100644 Xorg/lib/gtkmm/patches/001-automake-compat.patch create mode 100644 Xorg/lib/gtkmm/patches/100-disable-tools-tests.patch create mode 100644 Xorg/lib/hippo-canvas/Makefile create mode 100644 Xorg/lib/hippo-canvas/patches/010-use-python-config create mode 100644 Xorg/lib/imlib2/Makefile create mode 100644 Xorg/lib/libast/Makefile create mode 100644 Xorg/lib/libast/patches/010-dont-add-host-paths.patch create mode 100644 Xorg/lib/libast/patches/100-configure.patch create mode 100644 Xorg/lib/libdrm/Makefile create mode 100644 Xorg/lib/libfakekey/Makefile create mode 100644 Xorg/lib/libmatchbox/Makefile create mode 100644 Xorg/lib/librsvg/Makefile create mode 100644 Xorg/lib/libxcb/Makefile create mode 100644 Xorg/lib/mesa/Makefile create mode 100644 Xorg/lib/mesa/patches/010-fix-pkgconfig-files.patch create mode 100644 Xorg/lib/packages create mode 100644 Xorg/lib/pango/Makefile create mode 100755 Xorg/lib/pango/files/pango-querymodules.init create mode 100644 Xorg/lib/pangomm/Makefile create mode 100644 Xorg/lib/pixman/Makefile create mode 100644 Xorg/lib/qt4/Config.in create mode 100644 Xorg/lib/qt4/Makefile create mode 100644 Xorg/lib/qt4/files/qmake.mk create mode 100644 Xorg/lib/qt4/files/qws-qmake.conf create mode 100644 Xorg/lib/qt4/files/qws-qplatformdefs.h create mode 100644 Xorg/lib/qt4/files/x11-qmake.conf create mode 100644 Xorg/lib/qt4/files/x11-qplatformdefs.h create mode 100644 Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch create mode 100644 Xorg/lib/qt4/patches/200-depend-on-decoration.patch create mode 100644 Xorg/lib/qt4/patches/300-compile-fixes.patch create mode 100644 Xorg/lib/qt4/patches/400-do-not-pack-structs.patch create mode 100644 Xorg/lib/qt4/patches/500-allow-device-grabbing.patch create mode 100644 Xorg/lib/template.mk create mode 100644 Xorg/lib/tslib/Makefile create mode 100644 Xorg/lib/tslib/files/pointercal_om_gta02 create mode 100644 Xorg/lib/tslib/files/ts.conf create mode 100644 Xorg/lib/tslib/patches/devfs.patch create mode 100644 Xorg/lib/tslib/patches/event1.patch create mode 100644 Xorg/lib/tslib/patches/fix_version.patch create mode 100644 Xorg/lib/tslib/patches/tslib-input_raw-grab_events.patch create mode 100644 Xorg/lib/vte/Makefile create mode 100644 Xorg/lib/vte/patches/100-compile-fixes.patch create mode 100644 Xorg/lib/wnck/Makefile create mode 100644 Xorg/lib/wnck/patches/100-optional_gdk_pixbuf_csource.patch create mode 100644 Xorg/lib/xcbproto/Makefile create mode 100644 Xorg/lib/xine-lib/Makefile create mode 100644 Xorg/lib/xine-lib/patches/100-compile_fix.patch create mode 100644 Xorg/wm/fluxbox/Makefile create mode 100644 Xorg/wm/fluxbox/files/init create mode 100644 Xorg/wm/fluxbox/files/menu create mode 100644 Xorg/wm/fluxbox/files/uci-defaults/x11 create mode 100644 Xorg/wm/fluxbox/patches/010-fix-includes.patch create mode 100644 Xorg/wm/fluxbox/patches/100-fbrun-compile.patch create mode 100644 Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch create mode 100644 Xorg/wm/matchbox-window-manager/Makefile create mode 100644 Xorg/wm/matchbox-window-manager/files/uci-defaults/x11 create mode 100644 Xorg/xorg/app/font-util/Makefile create mode 100644 Xorg/xorg/app/fontconfig/Makefile create mode 100644 Xorg/xorg/app/iceauth/Makefile create mode 100644 Xorg/xorg/app/smproxy/Makefile create mode 100644 Xorg/xorg/app/x11perf/Makefile create mode 100644 Xorg/xorg/app/xauth/Makefile create mode 100644 Xorg/xorg/app/xkbcomp/Makefile create mode 100644 Xorg/xorg/app/xprop/Makefile create mode 100644 Xorg/xorg/app/xrandr/Makefile create mode 100644 Xorg/xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch create mode 100644 Xorg/xorg/app/xrdb/Makefile create mode 100644 Xorg/xorg/app/xset/Makefile create mode 100644 Xorg/xorg/app/xsetroot/Makefile create mode 100644 Xorg/xorg/app/xwd/Makefile create mode 100644 Xorg/xorg/data/xbitmaps/Makefile create mode 100644 Xorg/xorg/data/xkbdata/Makefile create mode 100644 Xorg/xorg/data/xkbdata/files/nokia_n810/rx-44 create mode 100644 Xorg/xorg/data/xkbdata/files/nokia_n810/su-8w create mode 100644 Xorg/xorg/data/xkeyboard-config/Makefile create mode 100644 Xorg/xorg/driver/xf86-input-evdev/Makefile create mode 100644 Xorg/xorg/driver/xf86-input-keyboard/Makefile create mode 100644 Xorg/xorg/driver/xf86-input-mouse/Makefile create mode 100644 Xorg/xorg/driver/xf86-video-ati/Makefile create mode 100644 Xorg/xorg/driver/xf86-video-fbdev/Makefile create mode 100644 Xorg/xorg/driver/xf86-video-geode/Makefile create mode 100644 Xorg/xorg/driver/xf86-video-intel/Makefile create mode 100644 Xorg/xorg/driver/xf86-video-nv/Makefile create mode 100644 Xorg/xorg/driver/xf86-video-omap/Makefile create mode 100644 Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch create mode 100644 Xorg/xorg/driver/xf86-video-vesa/Makefile create mode 100644 Xorg/xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch create mode 100644 Xorg/xorg/font/encodings/Makefile create mode 100644 Xorg/xorg/font/font-alias/Makefile create mode 100644 Xorg/xorg/font/font-bh-75dpi/Makefile create mode 100644 Xorg/xorg/font/font-cursor-misc/Makefile create mode 100644 Xorg/xorg/font/font-daewoo-misc/Makefile create mode 100644 Xorg/xorg/font/font-dec-misc/Makefile create mode 100644 Xorg/xorg/font/font-ibm-type1/Makefile create mode 100644 Xorg/xorg/font/font-isas-misc/Makefile create mode 100644 Xorg/xorg/font/font-jis-misc/Makefile create mode 100644 Xorg/xorg/font/font-micro-misc/Makefile create mode 100644 Xorg/xorg/font/font-misc-cyrillic/Makefile create mode 100644 Xorg/xorg/font/font-misc-misc/Makefile create mode 100644 Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-base create mode 100644 Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc create mode 100644 Xorg/xorg/font/font-xfree86-type1/Makefile create mode 100644 Xorg/xorg/font/packages create mode 100644 Xorg/xorg/font/template.mk create mode 100644 Xorg/xorg/lib/libICE/Makefile create mode 100644 Xorg/xorg/lib/libSM/Makefile create mode 100644 Xorg/xorg/lib/libX11/Makefile create mode 100644 Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch create mode 100644 Xorg/xorg/lib/libX11/patches/010-ignore-groff-warnings.patch create mode 100644 Xorg/xorg/lib/libXau/Makefile create mode 100644 Xorg/xorg/lib/libXaw/Makefile create mode 100644 Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch create mode 100644 Xorg/xorg/lib/libXcomposite/Makefile create mode 100644 Xorg/xorg/lib/libXcursor/Makefile create mode 100644 Xorg/xorg/lib/libXdamage/Makefile create mode 100644 Xorg/xorg/lib/libXdmcp/Makefile create mode 100644 Xorg/xorg/lib/libXext/Makefile create mode 100644 Xorg/xorg/lib/libXfixes/Makefile create mode 100644 Xorg/xorg/lib/libXfont/Makefile create mode 100644 Xorg/xorg/lib/libXft/Makefile create mode 100644 Xorg/xorg/lib/libXi/Makefile create mode 100644 Xorg/xorg/lib/libXmu/Makefile create mode 100644 Xorg/xorg/lib/libXpm/Makefile create mode 100644 Xorg/xorg/lib/libXrandr/Makefile create mode 100644 Xorg/xorg/lib/libXrender/Makefile create mode 100644 Xorg/xorg/lib/libXt/Makefile create mode 100644 Xorg/xorg/lib/libXtst/Makefile create mode 100644 Xorg/xorg/lib/libXv/Makefile create mode 100644 Xorg/xorg/lib/libXvMC/Makefile create mode 100644 Xorg/xorg/lib/libXxf86vm/Makefile create mode 100644 Xorg/xorg/lib/libfontenc/Makefile create mode 100644 Xorg/xorg/lib/libpciaccess/Makefile create mode 100644 Xorg/xorg/lib/libxkbfile/Makefile create mode 100644 Xorg/xorg/lib/xtrans/Makefile create mode 100644 Xorg/xorg/proto/applewmproto/Makefile create mode 100644 Xorg/xorg/proto/bigreqsproto/Makefile create mode 100644 Xorg/xorg/proto/calibrateproto/Makefile create mode 100644 Xorg/xorg/proto/calibrateproto/src/ChangeLog create mode 100644 Xorg/xorg/proto/calibrateproto/src/Makefile create mode 100644 Xorg/xorg/proto/calibrateproto/src/Makefile.am create mode 100644 Xorg/xorg/proto/calibrateproto/src/Makefile.in create mode 100644 Xorg/xorg/proto/calibrateproto/src/aclocal.m4 create mode 100755 Xorg/xorg/proto/calibrateproto/src/autogen.sh create mode 100644 Xorg/xorg/proto/calibrateproto/src/config.log create mode 100755 Xorg/xorg/proto/calibrateproto/src/config.status create mode 100755 Xorg/xorg/proto/calibrateproto/src/configure create mode 100644 Xorg/xorg/proto/calibrateproto/src/configure.ac create mode 100755 Xorg/xorg/proto/calibrateproto/src/install-sh create mode 100755 Xorg/xorg/proto/calibrateproto/src/missing create mode 100644 Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.h create mode 100644 Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc create mode 100644 Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc.in create mode 100644 Xorg/xorg/proto/calibrateproto/src/xcalibratewire.h create mode 100644 Xorg/xorg/proto/compositeproto/Makefile create mode 100644 Xorg/xorg/proto/damageproto/Makefile create mode 100644 Xorg/xorg/proto/dmxproto/Makefile create mode 100644 Xorg/xorg/proto/dri2proto/Makefile create mode 100644 Xorg/xorg/proto/fixesproto/Makefile create mode 100644 Xorg/xorg/proto/fontcacheproto/Makefile create mode 100644 Xorg/xorg/proto/fontsproto/Makefile create mode 100644 Xorg/xorg/proto/glproto/Makefile create mode 100644 Xorg/xorg/proto/inputproto/Makefile create mode 100644 Xorg/xorg/proto/kbproto/Makefile create mode 100644 Xorg/xorg/proto/printproto/Makefile create mode 100644 Xorg/xorg/proto/randrproto/Makefile create mode 100644 Xorg/xorg/proto/recordproto/Makefile create mode 100644 Xorg/xorg/proto/renderproto/Makefile create mode 100644 Xorg/xorg/proto/resourceproto/Makefile create mode 100644 Xorg/xorg/proto/scrnsaverproto/Makefile create mode 100644 Xorg/xorg/proto/videoproto/Makefile create mode 100644 Xorg/xorg/proto/windowswmproto/Makefile create mode 100644 Xorg/xorg/proto/xcmiscproto/Makefile create mode 100644 Xorg/xorg/proto/xextproto/Makefile create mode 100644 Xorg/xorg/proto/xf86bigfontproto/Makefile create mode 100644 Xorg/xorg/proto/xf86dgaproto/Makefile create mode 100644 Xorg/xorg/proto/xf86driproto/Makefile create mode 100644 Xorg/xorg/proto/xf86vidmodeproto/Makefile create mode 100644 Xorg/xorg/proto/xineramaproto/Makefile create mode 100644 Xorg/xorg/proto/xproto/Makefile create mode 100644 Xorg/xorg/xserver/xorg-kdrive/Config.in create mode 100644 Xorg/xorg/xserver/xorg-kdrive/Makefile create mode 100644 Xorg/xorg/xserver/xorg-kdrive/patches/001-tslib.patch create mode 100644 Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch create mode 100644 Xorg/xorg/xserver/xorg-server/Config.in create mode 100644 Xorg/xorg/xserver/xorg-server/Makefile create mode 100644 Xorg/xorg/xserver/xorg-server/files/config.uci/generic create mode 100644 Xorg/xorg/xserver/xorg-server/files/config.uci/olpc create mode 100644 Xorg/xorg/xserver/xorg-server/files/config.uci/om_gta02 create mode 100644 Xorg/xorg/xserver/xorg-server/files/config.xorg/generic create mode 100644 Xorg/xorg/xserver/xorg-server/files/config.xorg/nokia_n810 create mode 100644 Xorg/xorg/xserver/xorg-server/files/config.xorg/olpc create mode 100644 Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 create mode 100644 Xorg/xorg/xserver/xorg-server/files/tmp/x11.uci create mode 100755 Xorg/xorg/xserver/xorg-server/files/x.init create mode 100644 Xorg/xorg/xserver/xorg-server/files/xorg-driver.mk create mode 100644 Xorg/xserver/xglamo/Makefile create mode 100644 Xorg/xserver/xglamo/files/config/x11.om_gta02 create mode 100644 Xorg/xserver/xglamo/files/pointercal.om_gta02 create mode 100755 Xorg/xserver/xglamo/files/x.init create mode 100644 Xorg/xserver/xglamo/patches/001-fix-aclocal.patch create mode 100644 admin/htop/patches/001-uClibc-friendly.patch delete mode 100644 admin/pmacct/files/sfacctd.conf delete mode 100644 admin/pmacct/files/sfacctd.default delete mode 100644 admin/pmacct/files/sfacctd.init create mode 100644 devel/boost-jam/Makefile delete mode 100644 devel/perf/Makefile delete mode 100644 ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch create mode 100644 ipv6/ahcpd/patches/001-autoconf-prefixes.patch rename ipv6/aiccu/files/{aiccu.config => aiccu.conf} (100%) create mode 100644 ipv6/aiccu/files/aiccu.hotplug delete mode 100644 ipv6/aiccu/patches/400-retry-on-time-or-network-failure.patch delete mode 100644 ipv6/ndppd/Makefile delete mode 100644 ipv6/ndppd/files/ndppd.init create mode 100644 ipv6/radvd/files/radvd.hotplug delete mode 100644 ipv6/radvd/patches/100-silent-netlink-config-reload.patch create mode 100644 ipv6/shorewall6-lite/patches/100-hostname.patch create mode 100644 ipv6/shorewall6-lite/patches/130-portability.patch delete mode 100644 ipv6/tayga/Makefile delete mode 100644 ipv6/tayga/files/tayga.hotplug delete mode 100644 ipv6/tayga/files/tayga.sh rename ipv6/wide-dhcpv6/files/{dhcp6c.config => dhcp6c.conf} (100%) rename ipv6/wide-dhcpv6/files/{dhcp6s.config => dhcp6s.conf} (100%) delete mode 100644 lang/perl-net-telnet/Makefile create mode 100644 lang/php5/files/php.init delete mode 100644 lang/php5/files/php5-fastcgi.config delete mode 100644 lang/php5/files/php5-fastcgi.init delete mode 100644 lang/php5/patches/010-PECL-dio.patch delete mode 100644 lang/php5/patches/011-PECL-dio-additional-baudrates.patch delete mode 100644 lang/php5/patches/020-PECL-add-libevent.patch delete mode 100644 lang/php5/patches/030-PECL-add-http.patch create mode 100644 lang/php5/patches/100-fix_membar_producer_link_error_gcc41.patch delete mode 100644 lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch delete mode 100644 lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch delete mode 100644 lang/php5/pecl.mk create mode 100644 lang/pycairo/Makefile delete mode 100644 lang/pyclips/Makefile create mode 100644 lang/pygtk/Makefile create mode 100644 lang/pygtk/patches/001-automake-compat.patch create mode 100644 lang/pyqt4/Makefile create mode 100755 lang/pyqt4/files/fixup.sh create mode 100755 lang/pyqt4/files/qt_versioning.sh create mode 100644 lang/pyqt4/patches/100-cross-compile.patch delete mode 100644 lang/pyrrd/Makefile delete mode 100644 lang/pyrrd/patches/101-cross.patch delete mode 100644 lang/python-django/Makefile delete mode 100644 lang/python-eeml/Makefile delete mode 100644 lang/python-eeml/patches/101-cross.patch create mode 100644 lang/python-gnome-desktop2/Makefile delete mode 100644 lang/python-imaging-library/Makefile delete mode 100644 lang/python-imaging-library/patches/101-cross_compile.patch delete mode 100644 lang/python/patches/011-linux-3.x-compat.patch delete mode 100644 lang/simplejson/Makefile create mode 100644 libs/boost/patches/010-one-cpu.patch create mode 100644 libs/boost/patches/020-buildin-offsetof.patch delete mode 100644 libs/boost/patches/100-do-not-use-librt.patch create mode 100644 libs/curl/patches/510-no_sslv2.patch delete mode 100644 libs/ftplib/Makefile delete mode 100644 libs/ftplib/patches/001-fix_ascii_read_without_eol.patch delete mode 100644 libs/ftplib/patches/002-check_getserv_by_name.patch create mode 100644 libs/gconf2/Makefile create mode 100644 libs/gconf2/patches/010-do-not-use-GTK_DOC-macro.patch create mode 100644 libs/gconf2/patches/020-do-not-build-examples_docs_pos_tests.patch create mode 100644 libs/gdbm/patches/100-fix-build-with-libtool2.patch delete mode 100644 libs/gpgme/Makefile delete mode 100644 libs/jansson/Makefile delete mode 100644 libs/jansson/patches/01-jansson-add-jason_object_deep_update.patch delete mode 100644 libs/jansson/patches/100-add-jason_object_deep_update.patch delete mode 100644 libs/leptonica/Makefile delete mode 100644 libs/libassuan/Makefile delete mode 100644 libs/libcap/Makefile delete mode 100644 libs/libdlna/patches/300-ffmpeg_compat.patch create mode 100644 libs/libgcrypt/patches/001-mips-h-constraint.patch rename libs/libgcrypt/patches/{001-no_docs_tests.patch => 002-no_docs_tests.patch} (52%) delete mode 100644 libs/libimobiledevice/Makefile delete mode 100644 libs/libmbus/Makefile delete mode 100644 libs/libmnl/Makefile delete mode 100644 libs/libmpeg2/Makefile delete mode 100644 libs/libmpeg2/patches/101-ppc_no_altivec.patch delete mode 100644 libs/libpam/patches/000-OE-libpam-xtests.patch delete mode 100644 libs/libpam/patches/005-fix_ruserok.patch delete mode 100644 libs/libpam/patches/006-fix_xdr.patch delete mode 100644 libs/libplist/Makefile delete mode 100644 libs/libsml/Makefile delete mode 100644 libs/libsml/patches/010-no-examples-tests.patch delete mode 100644 libs/libsml/patches/020-ldflags.patch delete mode 100644 libs/libsml/patches/030-cross-compile.patch delete mode 100644 libs/libspe2/Makefile delete mode 100644 libs/libspe2/patches/001-remove_tls_requirement.patch delete mode 100644 libs/libsrtp/Makefile delete mode 100644 libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch delete mode 100644 libs/libsrtp/patches/1005_fix_data_alignment.patch delete mode 100644 libs/libsrtp/patches/1007_update_Doxyfile.patch delete mode 100644 libs/libsrtp/patches/1008_shared-lib.patch delete mode 100644 libs/polarssl/patches/100-disable-testsuites.patch create mode 100644 libs/polarssl/patches/100-shared.patch create mode 100644 libs/polarssl/patches/110-make.patch delete mode 100644 libs/protobuf-c/Makefile delete mode 100644 libs/rem/Makefile delete mode 100644 libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch delete mode 100644 libs/tokyocabinet/patches/200-uclibc_0.9.30_compat.patch delete mode 100644 libs/wt/Makefile delete mode 100644 multimedia/crtmpserver/patches/050-add-missing-make-defines.patch delete mode 100644 multimedia/darkice/Makefile delete mode 100644 multimedia/darkice/patches/001-upstream_svn_r494.patch create mode 100644 multimedia/ffmpeg/patches/901-fix_libswscale_on_x86.patch rename multimedia/ftpd-topfield/files/{ftpd-topfield.config => ftpd-topfield.conf} (100%) rename multimedia/ftpd-topfield/files/{ftpd-topfield.init => ftpd-topfield.sh} (100%) rename {sound => multimedia}/mocp/Makefile (97%) delete mode 100644 net/aria2/Makefile delete mode 100644 net/asterisk-chan-sccp-b/Makefile delete mode 100644 net/asterisk-chan-sccp-b/files/sccp.openwrt.conf delete mode 100644 net/asterisk-chan-sccp-b/patches/200-register-file-version.patch delete mode 100644 net/asterisk-chan-sccp-b/patches/300-stdarg.patch create mode 100644 net/babel/patches/001-fix-local_notify_route.patch create mode 100644 net/baresip/Config.in delete mode 100644 net/batman-adv/files/lib/batman-adv/config.sh delete mode 100644 net/bind/patches/100-configure-GOST.patch create mode 100644 net/bind/patches/100-cross_compile.patch rename net/darkstat/files/{darkstat.config => darkstat.conf} (100%) create mode 100644 net/ditg/patches/001-no_stropts.h rename net/dudders/files/{dudders.config => dudders.conf} (100%) delete mode 100644 net/freeswitch/files/etc.minimal/autoload_configs/dingaling.conf.xml delete mode 100644 net/freeswitch/files/etc.packages/blacklist/autoload_configs/blacklist.conf.xml delete mode 100644 net/freeswitch/files/etc.packages/blacklist/blacklists/blocked.list delete mode 100644 net/freeswitch/files/etc.packages/event_multicast/autoload_configs/event_multicast.conf.xml delete mode 100644 net/freeswitch/files/etc.packages/http_cache/autoload_configs/http_cache.conf.xml delete mode 100644 net/freeswitch/files/etc.packages/pocketsphinx/autoload_configs/pocketsphinx.conf.xml delete mode 100644 net/freeswitch/files/etc.packages/say-en/lang/en/ivr/sounds.xml delete mode 100644 net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo-ivr.xml delete mode 100644 net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo.xml delete mode 100644 net/freeswitch/files/etc.packages/say-he/lang/he/dir/sounds.xml delete mode 100644 net/freeswitch/files/etc.packages/say-he/lang/he/he.xml delete mode 100644 net/freeswitch/files/etc.packages/say-he/lang/he/vm/sounds.xml delete mode 100644 net/freeswitch/files/etc.packages/sms/chatplan/default.xml delete mode 100644 net/freeswitch/files/etc.packages/unimrcp/autoload_configs/unimrcp.conf.xml delete mode 100644 net/freeswitch/patches/000-build-openwrt_rules.mk.patch create mode 100644 net/freeswitch/patches/001-Makefile.am.patch delete mode 100644 net/freeswitch/patches/001-build-modules_conf_in.patch delete mode 100644 net/freeswitch/patches/002-Makefile.am.patch rename net/freeswitch/patches/{003-libs-esl-Makefile.patch => 002-libs-esl-Makefile.patch} (76%) create mode 100644 net/freeswitch/patches/003-src-mod-event_handlers-mod_event_zmq-Makefile.patch create mode 100644 net/freeswitch/patches/004-build-modules_conf_in.patch rename net/freeswitch/patches/{004-src-mod-applications-mod_mp4-mp4_helper_hpp.patch => 005-src-mod-applications-mod_mp4-mp4_helper_hpp.patch} (100%) delete mode 100644 net/freeswitch/patches/005-src-mod-codecs-mod_opus-Makefile.patch delete mode 100644 net/freeswitch/patches/006-src-include-timerfd_wrap_h.patch delete mode 100644 net/freeswitch/patches/007-src-mod-endpoints-mod_gsmopen-Makefile.patch delete mode 100644 net/freeswitch/patches/008-src-mod-event_handlers-mod_snmp-Makefile.patch delete mode 100644 net/freeswitch/patches/009-src-mod-codecs-mod_silk-Makefile.patch delete mode 100644 net/frickin/files/frickin.config create mode 100644 net/frickin/files/frickin.default delete mode 100644 net/fwknop/Makefile delete mode 100644 net/fwknop/patches/001-fix_config.patch delete mode 100644 net/haproxy/patches/001-haproxy-1.4.x-sendproxy.patch create mode 100644 net/horst/patches/001-endian_fixes.patch create mode 100644 net/httping/patches/001-extra_flags.patch rename net/httptunnel/files/{httptunnel.config => httptunnel.conf} (100%) delete mode 100644 net/ipsec-tools/files/racoon.init delete mode 100644 net/ipsec-tools/patches/001-ipsec-tools-def-psk.patch delete mode 100644 net/ipsec-tools/patches/002-patch8-utmp.patch create mode 100644 net/ipsec-tools/patches/003-linux_2.6.19_rtnetlink_changes.diff delete mode 100644 net/ipsec-tools/patches/003-microsoft-fqdn-in-main.patch create mode 100644 net/ipsec-tools/patches/004-opennhrp.patch delete mode 100644 net/ipsec-tools/patches/005-isakmp-fix.patch delete mode 100644 net/ipset/Makefile delete mode 100644 net/ipset/patches/001-2.6.35.patch delete mode 100644 net/l2tpv3tun/Makefile delete mode 100644 net/l2tpv3tun/files/l2tp.sh delete mode 100644 net/l2tpv3tun/patches/010-custom_ifname.patch delete mode 100644 net/l2tpv3tun/patches/100-nl_handle_alloc.patch delete mode 100644 net/leafnode/files/leafnode.init create mode 100644 net/lighttpd/files/lighttpd.default delete mode 100644 net/lighttpd/patches/001-no_ec.patch delete mode 100644 net/live/Makefile delete mode 100644 net/live/patches/101-openwrt.patch rename net/madwimax/files/{madwimax.init => madwimax} (100%) delete mode 100644 net/mdnsresponder/files/mDNSResponder.conf delete mode 100755 net/mdnsresponder/files/mdnsd.init delete mode 100644 net/mosquitto/Makefile delete mode 100644 net/mosquitto/patches/100-disable-memory-reporting.patch delete mode 100644 net/mosquitto/patches/101-disable-docbook.patch delete mode 100644 net/mrtg/Makefile delete mode 100644 net/mrtg/patches/001-rm-printf-longlong-fmt-test.patch create mode 100644 net/ndyndns/files/ndyndns.default create mode 100644 net/netatalk/files/AppleVolumes.system delete mode 100644 net/netatalk/patches/001-automake-compat.patch create mode 100644 net/nfs-kernel-server/patches/001-nfs_utils_uclibc.patch create mode 100644 net/nfs-kernel-server/patches/002-no_ttycom_h.patch rename net/nfs-kernel-server/patches/{101-no_malloc_h.patch => 003-no_malloc_h.patch} (78%) delete mode 100644 net/nfs-kernel-server/patches/100-nfs_utils_uclibc.patch create mode 100644 net/nginx/patches/001-feature_test_fix rename net/nginx/patches/{102-sizeof_test_fix.patch => 002-sizeof_test_fix} (100%) delete mode 100644 net/nginx/patches/101-feature_test_fix.patch delete mode 100644 net/nginx/patches/103-sys_nerr.patch delete mode 100644 net/ntripcaster/Makefile delete mode 100644 net/ntripclient/Makefile delete mode 100644 net/ntripserver/Makefile delete mode 100644 net/nuttcp/Makefile create mode 100644 net/olsrd/patches/200-txtinfo_gateways_formatting.patch delete mode 100644 net/openl2tp/patches/002-no_libfl.patch create mode 100644 net/opennhrp/patches/100-compile-fix.patch delete mode 100644 net/openssh/patches/140-pam_uclibc_pthreads_fix.patch delete mode 100644 net/openswan/files/ipsec.conf delete mode 100644 net/openswan/files/ipsec.config delete mode 100644 net/openswan/files/ipsec.secrets delete mode 100644 net/openswan/files/ipsec.upgrade create mode 100644 net/openswan/patches/110-scripts.patch create mode 100644 net/openswan/patches/130-compat_net_dev_ops.patch delete mode 100644 net/openvpn-polarssl/Makefile delete mode 120000 net/openvpn-polarssl/files delete mode 100644 net/openvpn-polarssl/patches/300-fix-plugin_call-with-ssl.patch delete mode 100644 net/openvpn-polarssl/patches/400-fix-undefined-print_default.gateway.patch delete mode 100644 net/openvpn/Config.in rename net/p910nd/files/{p910nd.config => p910nd.conf} (100%) delete mode 100644 net/paris-traceroute/Makefile delete mode 100755 net/parprouted/files/parprouted.config create mode 100755 net/parprouted/files/parprouted.default rename net/ptunnel/files/{ptunnel.config => ptunnel.conf} (100%) delete mode 100644 net/pyload/Makefile delete mode 100644 net/pyload/files/pyload.init delete mode 100644 net/pyrit/Makefile create mode 100644 net/quagga/patches/010-fix-format-warnings.patch create mode 100644 net/quagga/patches/020-fix-ipv6-build-failure.patch create mode 100644 net/quagga/patches/030-fix-opaque-support.patch delete mode 100644 net/rarpd/files/rarpd.config create mode 100644 net/rarpd/files/rarpd.default delete mode 100755 net/samba3/files/samba-nmbd.init create mode 100644 net/samba3/patches/140-no_mmap.patch create mode 100644 net/samba3/patches/180-fix_duplicate_define.patch delete mode 100644 net/samba3/patches/200-fix-configure.patch delete mode 100644 net/samba3/patches/500-remove_avm_smaller.patch delete mode 100644 net/samba3/patches/510-remove-printing.patch create mode 100644 net/shfs/Makefile create mode 100644 net/shfs/patches/100-kmod_build.patch create mode 100644 net/shfs/patches/101-shfs_0.35_2.6.18_dentry.patch create mode 100644 net/shfs/patches/102-shfs_0.35_clean_inode_clear.patch create mode 100644 net/shfs/patches/103-shfs_0.35_gcc4.patch create mode 100644 net/shfs/patches/104-shfs_0.35_inode_and_fs.patch create mode 100644 net/shfs/patches/105-space_chars.patch create mode 100644 net/shfs/patches/106-uidgid32.patch create mode 100644 net/shfs/patches/107-df.patch create mode 100644 net/shfs/patches/108-no_update_mtab.patch create mode 100644 net/shfs/patches/109-linux_2.6.22.patch delete mode 100644 net/snort/files/snort.local.rules rename net/sshtunnel/files/{sshtunnel.init => initd_sshtunnel} (100%) delete mode 100644 net/sslh/patches/001-no_sslh_select.patch create mode 100644 net/sslh/patches/001-no_strip.patch create mode 100644 net/strongswan/Makefile create mode 100644 net/strongswan/files/ipsec.button create mode 100644 net/strongswan/files/ipsec.conf create mode 100644 net/strongswan/files/ipsec.config create mode 100644 net/strongswan/files/ipsec.cron create mode 100644 net/strongswan/files/ipsec.iface create mode 100644 net/strongswan/files/ipsec.init create mode 100644 net/strongswan/patches/100-ar-fixes.patch create mode 100644 net/strongswan/patches/110-make-ipsec.patch create mode 100644 net/strongswan/patches/120-make-pluto.patch create mode 100644 net/strongswan/patches/130-make-starter.patch create mode 100644 net/strongswan/patches/200-wakeup-showstatus.patch create mode 100644 net/strongswan/patches/210-updown.patch create mode 100644 net/strongswan/patches/300-openwrt.patch create mode 100644 net/strongswan/patches/310-make-ipsec-alg.patch create mode 100644 net/strongswan/patches/320-no-modprobe.patch create mode 100644 net/strongswan/patches/350-make-programs.patch create mode 100644 net/strongswan/patches/400-pluto-fix_CIRCLEQ.patch delete mode 100644 net/tinc/files/tinc.config delete mode 100644 net/tinc/files/tinc.init delete mode 100644 net/tinc/files/tinc.upgrade create mode 100644 net/transmission/patches/010-opt_scrape_paused.patch delete mode 100644 net/uftp/Makefile rename net/unbound/files/{root.key => root.autokey} (100%) create mode 100644 net/unbound/files/unbound.conf delete mode 100644 net/unbound/patches/001-conf.patch rename net/usbip/patches/{002-upstream_svn_r152.patch => 000-upstream_svn_152.patch} (100%) delete mode 100644 net/usbip/patches/001-upstream_svn_r99.diff rename net/vnstat/files/{vnstat.config => vnstat-uci.conf} (100%) delete mode 100644 net/vrrpd/files/vrrpd.config create mode 100644 net/vrrpd/files/vrrpd.default create mode 100644 net/wavemon/patches/000-upstream-config_menu.patch create mode 100644 net/wavemon/patches/000-upstream-negative.patch create mode 100644 net/wavemon/patches/000-upstream-terminate.patch create mode 100644 net/wavemon/patches/000-upstream-wrapper.patch delete mode 100755 net/wing/files/usr/bin/wing_status create mode 100644 net/wing/patches/010-libc-compat.patch delete mode 100644 net/xtables-addons/patches/100-add-rtsp-conntrack.patch create mode 100644 net/znc/patches/004-fix_memleak.patch create mode 100644 sound/alsa/Makefile create mode 100644 sound/alsa/files/alsa.modules create mode 100644 sound/alsa/patches/100-compile_fix.patch create mode 100644 sound/alsa/patches/110-cp_command.patch create mode 100644 sound/alsa/patches/120-sndfops.patch delete mode 100644 sound/listener/Makefile delete mode 100644 sound/listener/files/listener.conf delete mode 100644 sound/listener/patches/100-makefile.patch delete mode 100644 sound/mocp/patches/001-moc-ffmpeg-update.patch rename utils/ap51-flash/files/{ap51-flash.config => ap51-flash.conf} (100%) rename utils/bluez-utils/files/{bluetooth.config => bluetooth.conf} (100%) delete mode 100644 utils/boxbackup/Makefile delete mode 100755 utils/boxbackup/files/bbstoreaccounts delete mode 100644 utils/boxbackup/files/bbstored.config delete mode 100644 utils/boxbackup/files/bbstored.init delete mode 100644 utils/boxbackup/files/bbstored.sh create mode 100644 utils/broadcom-sdhc/Makefile delete mode 100644 utils/bsdiff/Makefile delete mode 100644 utils/bsdiff/patches/001-makefile.patch delete mode 100644 utils/collectd/patches/004-version-gen-shell.sh delete mode 100644 utils/collectd/patches/400-fix-olsrd-get-all.patch create mode 100644 utils/dbus-x/Makefile create mode 100644 utils/dbus/patches/002-no_wno_pointer_sign.patch create mode 100644 utils/dbus/patches/01-dbus-nopie-fix.patch delete mode 100644 utils/dstat/Makefile delete mode 100644 utils/hplip/files/hplib.conf create mode 100644 utils/lcd4linux/files/lcd4linux.conf rename utils/lcd4linux/patches/{110-uclibc-logarithm-fix.patch => 170-log2f.patch} (85%) delete mode 100644 utils/mc/Config.in delete mode 100644 utils/md5deep/Makefile delete mode 100644 utils/md5deep/patches/101-cross_compile.patch delete mode 100644 utils/msr-tools/Makefile delete mode 100644 utils/msr-tools/patches/100-multiprocessor.patch delete mode 100644 utils/mtd-utils/patches/100-mtd-debug-add-bad-block-counter.patch delete mode 100644 utils/petitboot/Makefile delete mode 100644 utils/petitboot/files/petitboot.init delete mode 100644 utils/petitboot/patches/010-petitboot-fixups.diff delete mode 100644 utils/petitboot/patches/020-petitboot-fix-pb-twin.diff delete mode 100644 utils/petitboot/petitboot-config.in rename utils/psplash/files/{psplash.init => init} (100%) create mode 100644 utils/retutahvo/Makefile create mode 100644 utils/retutahvo/files/src/Makefile create mode 100644 utils/retutahvo/files/src/retutahvo.c create mode 100644 utils/retutahvo/files/src/user_retu_tahvo.h delete mode 100644 utils/rng-tools/Makefile delete mode 100644 utils/rng-tools/files/rngd.init delete mode 100644 utils/rrdtool/patches/020-x86-float-cast.patch create mode 100644 utils/setserial/files/serial.init delete mode 100644 utils/setserial/files/setserial.config delete mode 100644 utils/setserial/files/setserial.init delete mode 100644 utils/tesseract/Makefile delete mode 100644 utils/time/Makefile delete mode 100644 utils/time/patches/001-fix-configure.patch delete mode 100644 utils/time/patches/002-fix-rusage.patch create mode 100644 utils/ucmb-tools/Makefile create mode 100644 utils/ucmb-tools/tools/Makefile create mode 100644 utils/ucmb-tools/tools/ucmb.c create mode 100644 utils/ucmb/Makefile create mode 100644 utils/ucmb/driver/Makefile create mode 100644 utils/ucmb/driver/ucmb.c create mode 100644 utils/ucmb/driver/ucmb.h create mode 100644 utils/ucmb/microcontroller_examples/atmel_avr8/ucmb.c create mode 100644 utils/ucmb/microcontroller_examples/atmel_avr8/ucmb.h create mode 100644 utils/ucmb/microcontroller_examples/atmel_avr8_optimized/ucmb.c create mode 100644 utils/ucmb/microcontroller_examples/atmel_avr8_optimized/ucmb.h delete mode 100644 utils/usbmuxd/Makefile rename utils/wifitoggle/files/{wifitoggle.hotplug => hotplug_wifitoggle} (100%) rename utils/wifitoggle/files/{wifitoggle.config => uci_wifitoggle} (100%) delete mode 100644 utils/xdelta3/Makefile delete mode 100644 utils/xdelta3/patches/001-decrease-default-window-size.patch delete mode 100644 utils/zoneinfo/Makefile diff --git a/Xorg/app/dillo/Makefile b/Xorg/app/dillo/Makefile new file mode 100644 index 0000000000..ad2f51f82a --- /dev/null +++ b/Xorg/app/dillo/Makefile @@ -0,0 +1,68 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dillo +PKG_REV:=cc974615ae39 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE_PROTO:=hg +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://hg.dillo.org/dillo +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +define Package/dillo + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + TITLE:=Dillo2 + URL:=http://fltk.org/ + DEPENDS:=+libXft +libstdcpp +libpthread +zlib +fltk2 +libjpeg +libpng $(ICONV_DEPENDS) +endef + +define Package/dillo/description + Dillo is a web browser project completely written in C. + Dillo aims to be a multi-platform browser alternative that + is small, stable, developer-friendly, usable, fast, and + extensible. + + Note: This is the fltk2 based dillo. +endef + +EXTRA_CPPFLAGS+=-I$(ICONV_PREFIX)/include +EXTRA_LDFLAGS+=-L$(ICONV_PREFIX)/lib -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Build/Configure + (cd $(PKG_BUILD_DIR); ./autogen.sh ); + $(call Build/Configure/Default) +endef + +define Build/Install + DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) install +endef + +define Package/dillo/install + $(INSTALL_DIR) $(1)/etc $(1)/usr/share/applications $(1)/usr/share/icons + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/* $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dillo $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dpid $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/dpidc $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/dillo $(1)/usr/lib/ + $(CP) ./files/dillo.png $(1)/usr/share/icons/ + $(INSTALL_DATA) ./files/dillo.desktop $(1)/usr/share/applications/ +endef + +$(eval $(call BuildPackage,dillo)) diff --git a/Xorg/app/dillo/files/dillo.desktop b/Xorg/app/dillo/files/dillo.desktop new file mode 100644 index 0000000000..ed31c1b116 --- /dev/null +++ b/Xorg/app/dillo/files/dillo.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +GenericName=Web Browser +GenericName[lt]=Web naršyklė +Name=Dillo +Comment=Lightweight browser +Comment[lt]=Labai paprasta naršyklė +MimeType=text/html;text/xml;application/xhtml+xml; +Exec=dillo +Terminal=false +Type=Application +Categories=Application;Network; +Icon=/usr/share/icons/dillo.png diff --git a/Xorg/app/dillo/files/dillo.png b/Xorg/app/dillo/files/dillo.png new file mode 100644 index 0000000000000000000000000000000000000000..bcb89a30ed755b21296280f4a798e653e95cd9c8 GIT binary patch literal 5555 zcmV;k6-?@hP)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOG? z4-X)><6pc002MPyL_t(&-o=`EjAYk!-hcPrx75~M)zw`+-80jio{h6`W=M*nLP-`y z5u_bTi5xkK6gdv!7=q;3iDCgx@|Teq0Tcs@0Yx?>I{_jDhOEU&Ajn8W$+k>O)IyQs z49QuWGt;y5^uAPA*Ye)G%gG9=2Iy5LZW(F#0p>-7nds5vWHDROJSzov{ zfAuQ8&NpRk{@a7j);!Sr{{p~7(PZo3iTAqJvG>XTlP997*+#l&KO?mY^;*KQR>a?$ z(HJT`esG3HDdPG@kH4H-<-dRX63?Bx*hyC|T#4>n_>=DZ`Oi9MZ~wmn&^&PF)CXoB zy6=Na6Zg-$(h2sp>KvYmXpAJ(s~Rg22OGk%QNy2K8{yu`GDpWsoSCek6>MjYFJ4*W zcb~q=wQDz#YiAdttAF-iw=X{b31H>NTF4*ui&30JwPx#Arr-LrpMLOH-}(!`_TD#+ zJ@JNvj5bENt6AdIEF7OLSnZb>D{FLQXpT7!j0RrZvi#2*ImdDdN;*jXPOj zW@ePX|LES)zu@%`*C)o_YkKP)ap8qv3;C%5C{=3{%_H~z{^?(O^tXQbgAX*`b>@^h z+}KMu3e-o1*Uv^ov7rbNNn|)QDa4UstzY4VtrBlJlJVd;d}~#h+xDDlrX*VN%yN(U z9butYWzSe$?KF?o&0U9oKFK#83_IqCr($7-2197360LCU-Z&0(Z|GYi@__3J-N6}`I6VnNY zCQ7vNbX8#68cI=2C5}j{q6|q{iSV&OX+t&9)S?8XHBP}|&v13UiYSdoqjccd}ic5#xOmm z`MF~;aimD%GFmGlWAIw&5$FXWP8>618G?{|MdlP|CLH@?!*r}@q{3YjJ<3twR>zPz z!Fd4@WH=$-QPF}{iZwmaoGEWSnl0XWs$`;O8bwp3C^~Fl!-n9Z*JPV0Hub65k7m>N zo!qx?nyKa}O2B%Uu3GSle!pNWDU&OW-Yu&0n?j|en5-E_B4MP|VPU7o+*%D~3N$GR z3I|LlLVvu^jkf2dop_L)u@?K!eT~*GZ3w`3;L=t2J)n4H2aGY3!HoVhTdAq3 zW}P5`!aF>gN;&Yvp%~*GNgNXlWJMqB03D?i!DA%Q4Hjo$(K;q-ip6fsK0N1EHD{VJ z9oyrR&rGnj6VZ2|LO_Y2B%p)ff=64AWPSYF9i+WZvAOmtTDv{mfwREQt6XS&V)ETP zlxIt6g^_ZKa~_AsiKkJ`*s+FkUr3WOJA)qORI}aNW~?zq31P|S^ktZd3IdhXa4_}c zS<1tcuxfL@u~=rauj$zD8&43l1PFo(f)Rx>3Em{wK^NxEGMOakqJUki7nSNF!{qTj z0Ey`M7fDhY)dc4Q);YXHIB{5UthIYICL*l2R7+*%S5`Q6u*tw@tlJ*jK4&|41_3Im zqZY-aCZZK-7Ba^-RyALEafHGvkTC2B0;mA)dmy|ZK`>E@9&Hh|az^t$O|8+pO~hg; zA-TKtGrV}G26Q!#Jw}|S2TfW&Av$8DQo=chbDqLG3TG(>p0pgZBSI;Oh*Thr6vile zE@#_i^jtwAV1m#oELm`rm10UIEZKsqYi07F(MqAT2BnbQPDcPAzz4wxa2P^bgKC4> zL65{*%x(za|##9HB;#o7XE3%vEbycBWvR>9?d zo1QJ$?su4(Y>_4v+IGOE&FK_5ed}24XT(a;)Dbf(rH4YF@97^kV)gBzW(B;dj-|Ia}Ws=w^LI`+k z2`GYST+leBSlSZYh~o|8Wk#b0aU9X}1&hTF%Xvn-@btVzYeVK7T?ssw@358&-?=%# z+;W{#wCf7H20JzEGlLI!HKY_?1POr<0_N6b4%q_jJpcn>y>%D8ohB--J;b-a{Ra{2 z>v46Wb#SXFhzU5G6I6^13MU313|4FAmw_arzrV-mND9WVk#|ud3<^)TaO7xeCSu15 zclrg!M4Y=l!PVs^C8N=L=t3fb^|A{_us%l$3mB9@@B%(Ca`PhlwSFZ7-82!!*c8RK zA*s}7$QI%VYvU*~lx}GbWTO{5wKCzdLV!-8mhvlAS zex*+CW2%*uTboTLM*}l0hsKaZhBVSdTA@++JfoO9h{-)-YR{rmj$J6AaT@*LZ%t9;pe{&IYZl>;Zqbxe6tERFlKFz6d9r;yom`WCIn9q0fAfV2}M-m>vt5> zqwCaa4H}`!AT#L5K&+8SL8MVeQBGjKUB|C3Gy6yXk@sJ_gr1vY#W_Az9pU`Xy$5sT z45mLoXBoZ1^3>`b+TZ+B{!M3tu^*s0*MUK01m!Fu0(w};G)kd#Jj?{H!1-M_Dl(kS z@y;UNAp~qtpkTS1QZA3;0ywQ8RuCyLifSb=UiX+pG1JJI3`^Ymng75C&p%Im`7#~n z_;1w_F1+J?nCThvrJLA|JB02wVl#Aof^#Py;(}5{KTv6}pird|g7+XE@qU2TL6aml zEtR(~|;dwWQv zc)43*^`jr>J!fAexp|Wi0$+(E^1t^Oje3Nv&f|Jphyqosq3h$Qu@-9f9yW}5CI9PE zi7TZt#4$kvA^}{nO&q(3YBkfw+y*)1t*0moFcwmWC_nrG0!q*ZP>RJtiGTO4h+jOd zdHi67#|~RY_Vg*IhN)4*vr9EHrOBUulHZ;?OKo8R34xoymk*yH*c#inmxuAyXrU&i zNg6E*Q-J`X+va3iB63}nF}P#LxG{g5pd+jV41&rB>y*nj;+}i_&WkTBD;Y|dHYZe35bn?H!R)G~WAOUWy_*w^#AIoQU8N z$*yzwaIR^!(rC2)jMf?vPmvGsw!k|}a264dh#*=GQ&^-3ktRe2l|4H4D6f5?3so}6RK50sl@Sx zIm${g`tZX{{Q9r++_`gPr7B*TA%_}t31ZK3=1hnvmB>q_a|!GyZ%4dyxWYnY5nDj8 z!=NDy*_6>JV^Fa{B7-CvlNcm1Jlikx-D`$D<-l7$_ay(I+Z~dyYL%PLu~e;*7ClDx zjC1tv7UjG5Q0%L7Xj*ZuZMnP{qp5O|U z&5R#&;z-C<;Ggj%)A zzUguLlM_rd>iqm@6B14AEXiobO8YGLzwUlasf4VoF#r7Xti~x)sz96)vH`y6JjvY; zFHtIqW^7ET*Hx!f`jaS*ZW?mLdwfwKMM3CiNG~Jg1A@!I6{uj5;DOz)>XmkTNHv?+ z=a?KHM>aQ+l@;vGn_TO3NKC|7eT2|zk~T-FS4tqB$iw-pN8fr{7v~voG?3+G+?_j| zzjTqTS!U+ArqL8+ZE=lO^|PdDhmU+jG~?rrB=O<#$M29PpK{qiw0Q82kY`BNBkc4E zTRlR*N67nxVt^F+Fvz__c|R;L-XkGUTUnx}6tc90EHBf$c8#t!Bx!;f8zr4+perTv zNV6k~wJfL8%UN7nXYchTY9h$e68^>wUfkHAI$33Ex=!8^@tX^O$lITIf#3NZ8TJG3 zfB*NE(C!>K@QLamdpx+on|+ib-h$1b-$mL9Dvk+pj7o+&unb)(u;Hai-AS8+W>Ud*0|s;^{Fvd zwrh0eZ!F2E{2`@M@rn@lDplz1Z(q}&|J;Xt-usSDs)!^6Yf)-|^mY&oN<}E8P#TmH z6af*B4kdK(M6t#yMZUQSseImc9zKnPU(eHuZS2L>XTtf0Typ`gv6 zpHcMsXXmYjP=2)e&E1d)$h!ZY3 zkG7V6uZw7*@PT5GWBYy57ccX#eZ;8u(C;H5uvFxzkvgj{&R>#>|ChYs!HmHG8jT-N zr_Y~Dw1`ra9#%m_z*#5?C_K`4NY6sIfILU?0Rf@% z((^p(9cfXZih{9fmH&|!6qDm*rG(5n2E9JT<|cceex8rsT<6WJtCYK4w6$n!S=5G4 zZ?ihE_MJTP#w&dFt4%}_S}n^HPY6#wiQ$PS6rcIbYb5sU;fJ@(+Uj?8-hGQ;CRCIn zIznkR6gYwhpCiR?t>_ofDUeQ%^el@zZQiuDzyUy8%ak!p)<$@tv%^NOhuzp@&$U~; z>+)^>{pvPfxqgic?QI?sL3@vKjy=sLy;`X|QPO))FD}04?>l`FXW?pugSe}V0vi@wYbO^mX`RpD)60C z2hjB@tFdBprOkK<#3Hmq;9|GS=QcL@-L0)VpZ5OaTeGvDBS{8W>*#j9;w^7coIWkD zih~~>M~-0HZKL|VU(zQ1Z8bV`7o!tO;uKNQkkl~*BT9WgR)R&k>y+2#Iow(2?%){# zwiH~6Bi5(JVgDGqRw60KbZ=~IcP=gbmzJ{+jE1n^!=SD8wXHOLDvXW&71in*QPiPU z8_;ZezVsy&QKUF}6lyj3zwX2<`ujfE+S(Iq{jVe*`KP9~r%81TsgzJeh#msLs38yy z*aB=H8SEha4!DBxI*g2!k%Cq(|0^mgzeAFdy=HVmOIpK}%Y-P}jTMDxjY5Xp zNi6j=XQr`DJImbG%GQ<6TIWl?6F$XQ^CGuz|HM}f)Q^3GWO8zthO_L5a_-IeaIezo z3F7oLq9=$dnxv#LhN0Y@4Rp%+TDf=A+H5Y{F23wle1Uqs&F$Mi@$D7$L-SAeN3|M+ zpz%J!`x+s{gz)Nn7{+*v>5--xNg`}){8X;o{2wV(WRG>m{p|n%002ovPDHLkV1h)J BuMz+N literal 0 HcmV?d00001 diff --git a/Xorg/app/dillo/patches/000-do-not-need-flt2-util.patch b/Xorg/app/dillo/patches/000-do-not-need-flt2-util.patch new file mode 100644 index 0000000000..3dcf47e29b --- /dev/null +++ b/Xorg/app/dillo/patches/000-do-not-need-flt2-util.patch @@ -0,0 +1,21 @@ +--- dillo-rcc974615ae39.orig/configure.in 2009-03-09 15:40:08.000000000 +0100 ++++ dillo-rcc974615ae39/configure.in 2009-03-09 15:52:42.000000000 +0100 +@@ -145,14 +145,10 @@ + dnl + dnl For debugging and to be user friendly + AC_MSG_CHECKING([FLTK2]) +-if sh -c "fltk2-config --version" >/dev/null 2>&1 +-then AC_MSG_RESULT(yes) +- LIBFLTK_CXXFLAGS=`fltk2-config --cxxflags` +- LIBFLTK_CFLAGS=`fltk2-config --cflags` +- LIBFLTK_LIBS=`fltk2-config --use-images --ldflags` +-else AC_MSG_RESULT(no) +- AC_ERROR(FLTK2 must be installed!) +-fi ++AC_MSG_RESULT(yes) ++ LIBFLTK_CXXFLAGS="-I. -I/usr/include/freetype2 -Wno-non-virtual-dtor" ++ LIBFLTK_CFLAGS="-I." ++ LIBFLTK_LIBS="-L./lib -Wl,-rpath,/usr/local/lib -lfltk2_images -lfltk2_images -lfltk2 -lX11 -lXi -lXft -lpthread -lm -lXext -lsupc++" + + + dnl ---------------- diff --git a/Xorg/app/eterm/Makefile b/Xorg/app/eterm/Makefile new file mode 100644 index 0000000000..b1f0b26979 --- /dev/null +++ b/Xorg/app/eterm/Makefile @@ -0,0 +1,69 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=eterm +PKG_VERSION:=0.9.4 +PKG_RELEASE:=2 + +PKG_SOURCE:=Eterm-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.eterm.org/download/ +PKG_BUILD_DIR:=$(BUILD_DIR)/Eterm-$(PKG_VERSION) +PKG_MD5SUM:=b8869ee9c9b9516231af9eefa595cee3 + +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +define Package/eterm/Default + SECTION:=xorg-extra + CATEGORY:=Xorg + SUBMENU:=terminals + +endef + +define Package/eterm +$(call Package/eterm/Default) + TITLE:=eterm + DEPENDS:=+libX11 +libXcursor +imlib2 +libast $(ICONV_DEPENDS) +endef + +define Package/esetroot +$(call Package/eterm/Default) + TITLE:=esetroot + DEPENDS:=eterm +endef + +CONFIGURE_ARGS += \ + --with-imlib=$(STAGING_DIR)/usr/ + +CONFIGURE_VARS += \ + LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)\ + CPPFLAGS="$(TARGET_CPPFLAGS) -I$(ICONV_PREFIX)/include/" \ + LDFLAGS="$(TARGET_LDFLAGS) -L$(ICONV_PREFIX)/lib/" + $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" install +endef + +define Package/eterm/install + $(INSTALL_DIR) $(1)/usr/{bin,lib} + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Eterm $(1)/usr/bin +endef + +define Package/esetroot/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/Esetroot $(1)/usr/bin +endef + +$(eval $(call BuildPackage,esetroot)) +$(eval $(call BuildPackage,eterm)) diff --git a/Xorg/app/eterm/patches/010-dont-add-host-paths.patch b/Xorg/app/eterm/patches/010-dont-add-host-paths.patch new file mode 100644 index 0000000000..a66efae2e0 --- /dev/null +++ b/Xorg/app/eterm/patches/010-dont-add-host-paths.patch @@ -0,0 +1,17 @@ +diff --git a/configure b/configure +index c2c0c91..321e0fb 100755 +--- a/configure ++++ b/configure +@@ -26704,10 +26704,10 @@ else + fi + + +-CPPFLAGS=`eval eval eval eval eval echo "-I$includedir -I$prefix/include $CPPFLAGS"` ++CPPFLAGS=`eval eval eval eval eval echo "$CPPFLAGS"` + CPPFLAGS=`echo $CPPFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` + CFLAGS=${CFLAGS--O} +-LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"` ++LDFLAGS=`eval eval eval eval eval echo "${LDFLAGS--O}"` + LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` + LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" + diff --git a/Xorg/app/gtkperf/Makefile b/Xorg/app/gtkperf/Makefile new file mode 100644 index 0000000000..9a5ad56953 --- /dev/null +++ b/Xorg/app/gtkperf/Makefile @@ -0,0 +1,44 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=gtkperf +PKG_VERSION:=0.40 +PKG_RELEASE:=2 + +PKG_SOURCE_URL:=@SF/gtkperf +PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME) +PKG_MD5SUM:=4331dde4bb83865e15482885fcb0cc53 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +TARGET_LDFLAGS+=\ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + +define Package/gtkperf + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+gtk2 + TITLE:=gtkperf + URL:=http://gtkperf.sourceforge.net +endef + +define Package/gtkperf/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin +endef + +$(eval $(call BuildPackage,gtkperf)) diff --git a/Xorg/app/gtkperf/patches/000-disable-autotools.patch b/Xorg/app/gtkperf/patches/000-disable-autotools.patch new file mode 100644 index 0000000000..8e2cb80e80 --- /dev/null +++ b/Xorg/app/gtkperf/patches/000-disable-autotools.patch @@ -0,0 +1,19 @@ +diff -ruN gtkperf.orig/Makefile.in gtkperf/Makefile.in +--- gtkperf.orig/Makefile.in 2005-06-07 18:09:49.000000000 +0200 ++++ gtkperf/Makefile.in 2009-10-14 12:29:30.000000000 +0200 +@@ -40,10 +40,10 @@ + + top_builddir = . + +-ACLOCAL = @ACLOCAL@ +-AUTOCONF = @AUTOCONF@ +-AUTOMAKE = @AUTOMAKE@ +-AUTOHEADER = @AUTOHEADER@ ++ACLOCAL = /bin/true ++AUTOCONF = /bin/true ++AUTOMAKE = /bin/true ++AUTOHEADER = /bin/true + + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +Binary files gtkperf.orig/.Makefile.in.swp and gtkperf/.Makefile.in.swp differ diff --git a/Xorg/app/gtkperf/patches/010-change-layout.patch b/Xorg/app/gtkperf/patches/010-change-layout.patch new file mode 100644 index 0000000000..ab90329b6c --- /dev/null +++ b/Xorg/app/gtkperf/patches/010-change-layout.patch @@ -0,0 +1,77 @@ +--- gtkperf/src/interface.c 2005-06-07 18:15:24.000000000 +0200 ++++ gtkperf.orig/src/interface.c 2009-10-15 12:17:43.000000000 +0200 +@@ -44,12 +44,13 @@ + GtkWidget *vbox_main; + GtkWidget *vbox_info; + GtkWidget *hbox1; ++ GtkWidget *hbox2; + GtkWidget *button_clear; + GtkWidget *label8; + GtkObject *spinbutton_count_adj; + GtkWidget *button_start; + GtkWidget *alignment1; +- GtkWidget *hbox2; ++ GtkWidget *hbox_start; + GtkWidget *image1; + GtkWidget *label6; + GtkWidget *scrolledwindow1; +@@ -91,8 +92,8 @@ + appdata->window_main = gtk_window_new (GTK_WINDOW_TOPLEVEL); + gtk_window_set_title (GTK_WINDOW (appdata->window_main), + _("GtkPerf")); +- gtk_window_set_default_size (GTK_WINDOW (appdata->window_main), 500, +- 300); ++ gtk_window_set_default_size (GTK_WINDOW (appdata->window_main), 320, ++ 240); + gtk_widget_show(appdata->window_main); + + #endif +@@ -115,6 +116,9 @@ + hbox1 = gtk_hbox_new (FALSE, 10); + gtk_widget_show (hbox1); + gtk_box_pack_start (GTK_BOX (vbox_info), hbox1, FALSE, TRUE, 4); ++ hbox2 = gtk_hbox_new (FALSE, 10); ++ gtk_widget_show (hbox2); ++ gtk_box_pack_start (GTK_BOX (vbox_info), hbox2, FALSE, TRUE, 4); + + button_clear = gtk_button_new_from_stock ("gtk-clear"); + gtk_widget_show (button_clear); +@@ -134,7 +138,7 @@ + gtk_widget_set_size_request (appdata->spinbutton_count, 100, -1); + appdata->combobox_testtype = gtk_combo_box_new_text (); + gtk_widget_show (appdata->combobox_testtype); +- gtk_box_pack_start (GTK_BOX (hbox1), appdata->combobox_testtype, TRUE, ++ gtk_box_pack_start (GTK_BOX (hbox2), appdata->combobox_testtype, TRUE, + TRUE, 0); + gtk_combo_box_append_text (GTK_COMBO_BOX (appdata->combobox_testtype), + _("Test All")); +@@ -169,23 +173,23 @@ + + button_start = gtk_button_new (); + gtk_widget_show (button_start); +- gtk_box_pack_start (GTK_BOX (hbox1), button_start, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (hbox2), button_start, FALSE, FALSE, 0); + + alignment1 = gtk_alignment_new (0.5, 0.5, 0, 0); + gtk_widget_show (alignment1); + gtk_container_add (GTK_CONTAINER (button_start), alignment1); + +- hbox2 = gtk_hbox_new (FALSE, 2); +- gtk_widget_show (hbox2); +- gtk_container_add (GTK_CONTAINER (alignment1), hbox2); ++ hbox_start = gtk_hbox_new (FALSE, 2); ++ gtk_widget_show (hbox_start); ++ gtk_container_add (GTK_CONTAINER (alignment1), hbox_start); + image1 = gtk_image_new_from_stock ("gtk-execute", + GTK_ICON_SIZE_BUTTON); + gtk_widget_show (image1); +- gtk_box_pack_start (GTK_BOX (hbox2), image1, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (hbox_start), image1, FALSE, FALSE, 0); + + label6 = gtk_label_new_with_mnemonic (_("Start")); + gtk_widget_show (label6); +- gtk_box_pack_start (GTK_BOX (hbox2), label6, FALSE, FALSE, 0); ++ gtk_box_pack_start (GTK_BOX (hbox_start), label6, FALSE, FALSE, 0); + + scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); + gtk_widget_show (scrolledwindow1); diff --git a/Xorg/app/matchbox-keyboard/Makefile b/Xorg/app/matchbox-keyboard/Makefile new file mode 100644 index 0000000000..5ca8915e44 --- /dev/null +++ b/Xorg/app/matchbox-keyboard/Makefile @@ -0,0 +1,60 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=matchbox-keyboard +PKG_REV:=2111 +PKG_VERSION:=svn$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE:=matchbox-keyboard-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://svn.o-hand.com/repos/matchbox/trunk/matchbox-keyboard +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk + +define Package/matchbox-keyboard + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + TITLE:=matchbox-keyboard + MAINTAINER:=Michael Buesch + URL:=http://matchbox-project.org/?p=1 + DEPENDS:=+libfakekey +cairo +gtk2 +libexpat +endef + +define Package/matchbox-keyboard/description + Virtual keyboard +endef + +EXTRA_LDFLAGS:=\ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/matchbox-keyboard/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share $(1)/usr/share/applications \ + $(1)/usr/share/matchbox-keyboard $(1)/usr/share/pixmaps + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/applications/inputmethods/matchbox-keyboard.desktop \ + $(1)/usr/share/applications/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/matchbox-keyboard/* \ + $(1)/usr/share/matchbox-keyboard/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/pixmaps/* \ + $(1)/usr/share/pixmaps/ +endef + +$(eval $(call BuildPackage,matchbox-keyboard)) diff --git a/Xorg/app/packages b/Xorg/app/packages new file mode 100644 index 0000000000..f08db70c46 --- /dev/null +++ b/Xorg/app/packages @@ -0,0 +1,9 @@ +xcalc-1.0.2|+libX11+libXaw +xclipboard-1.0.1|+libX11 +xdm-1.1.6|+libX11 +xeyes-1.0.1|+libX11 +xinit-1.0.5|+libX11 +xlogo-1.0.1|+libX11 +xmessage-1.0.2|+libX11 +xset-1.0.3|+libX11 +xsetroot-1.0.2|+libX11 diff --git a/Xorg/app/pwrtray/Makefile b/Xorg/app/pwrtray/Makefile new file mode 100644 index 0000000000..1e1c55507e --- /dev/null +++ b/Xorg/app/pwrtray/Makefile @@ -0,0 +1,107 @@ +# +# Copyright (C) 2010-2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +#LOCAL_SRC:=1 + +PKG_NAME:=pwrtray +PKG_REV:=7581cda95d1cbe10ef0665840801a3120004db79 +PKG_VERSION:=1 +PKG_RELEASE:=1 + +ifeq ($(LOCAL_SRC),) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=git://git.bu3sch.de/pwrtray.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +endif + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +PKG_CONFIG_DEPENDS:= \ + CONFIG_PACKAGE_pwrtray-backend \ + CONFIG_PACKAGE_pwrtray + +include $(INCLUDE_DIR)/package.mk + +define Package/pwrtray-common + MAINTAINER:=Michael Buesch + URL:=http://bu3sch.de/gitweb?p=pwrtray.git;a=summary +endef + +define Package/pwrtray-backend + $(call Package/pwrtray-common) + SECTION:=utils + CATEGORY:=Utilities + TITLE:=System power control daemon + DEPENDS:=+FEATURE_drawing-backend_libX11:libX11 +endef + +define Package/pwrtray-backend/description + Tiny system power control daemon. +endef + +define Package/pwrtray + $(call Package/pwrtray-common) + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + TITLE:=Frontend to pwrtray-backend daemon + DEPENDS:=+pwrtray-backend +qt4 +qt4-gui +endef + +define Package/pwrtray/description + Small system-tray frontend to the power control daemon. +endef + +EXTRA_CFLAGS:= \ + -I$(PKG_BUILD_DIR)/tray/moc \ + -I$(STAGING_DIR)/usr/include/QtCore \ + -I$(STAGING_DIR)/usr/include/QtGui + +EXTRA_LDFLAGS:= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -Wl,-rpath=/usr/lib/ + +MAKE_VARS+= \ + MOC="$(STAGING_DIR_HOST)/bin/moc" \ + STRIP="$(STRIP)" \ + $(if $(CONFIG_PACKAGE_libX11),FEATURE_XLOCK=y,FEATURE_XLOCK=n) \ + $(if $(CONFIG_PACKAGE_pwrtray),FEATURE_TRAY=y,FEATURE_TRAY=n) + +#MAKE_FLAGS+= \ +# V=1 + +define Build/Prepare + $(if $(LOCAL_SRC), \ + $(CP) ./files/src/* $(PKG_BUILD_DIR)/ \ + , \ + $(call Build/Prepare/Default) \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) clean + $(call Build/Compile/Default) +endef + +define Package/pwrtray-backend/install + $(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/bin $(1)/usr/share + $(INSTALL_BIN) ./files/etc/init.d/* $(1)/etc/init.d/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray-backend $(1)/usr/bin/ + $(if $(CONFIG_PACKAGE_libX11),$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray-xlock $(1)/usr/bin/) + $(if $(CONFIG_PACKAGE_pwrtray),$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/pwrtray $(1)/usr/bin/) + $(if $(CONFIG_PACKAGE_pwrtray),$(CP) $(PKG_INSTALL_DIR)/usr/share/pwrtray $(1)/usr/share/) + [ -e $(1)/etc/pwrtray-backendrc ] || \ + $(INSTALL_DATA) ./files/etc/pwrtray-backendrc $(1)/etc/ +endef + +$(eval $(call BuildPackage,pwrtray-backend)) +$(eval $(call BuildPackage,pwrtray)) diff --git a/Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend b/Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend new file mode 100755 index 0000000000..e13893935d --- /dev/null +++ b/Xorg/app/pwrtray/files/etc/init.d/pwrtray-backend @@ -0,0 +1,12 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2010 OpenWrt.org + +START=99 + +start() { + [ -x /usr/bin/pwrtray-backend ] && /usr/bin/pwrtray-backend -B -f +} + +stop() { + killall -q pwrtray-backend +} diff --git a/Xorg/app/pwrtray/files/etc/pwrtray-backendrc b/Xorg/app/pwrtray/files/etc/pwrtray-backendrc new file mode 100644 index 0000000000..d03004a3fe --- /dev/null +++ b/Xorg/app/pwrtray/files/etc/pwrtray-backendrc @@ -0,0 +1,16 @@ +# pwrtray-backend configuration + +[BACKLIGHT] +# List of auto-dimming steps. +# idle-seconds/brightness-percent idle-seconds/brightness-percent ... +# idle-seconds value must be growing. +autodim_steps=15/65 20/50 25/25 30/10 35/0 +# Default maximum brightness value for the autodimmer, in percent. +autodim_default_max=75 +# Enable auto-dimming by default? +autodim_default_on=1 + +[SCREEN] +# Framebuffer device for screen blanking +fbdev=/dev/fb0 + diff --git a/Xorg/app/qwo/Makefile b/Xorg/app/qwo/Makefile new file mode 100644 index 0000000000..a01a1cc409 --- /dev/null +++ b/Xorg/app/qwo/Makefile @@ -0,0 +1,48 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=qwo +PKG_VERSION:=0.3 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://mirrors.zerg.biz/nongnu/qwo/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=4a3cfc9ad505c60cdf0d896f0323aab2 + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/qwo + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 +libXext +libXau +libXtst +imlib2 + TITLE:=qwo + URL:=http://www.nongnu.org/qwo/ +endef + +define Package/qwo/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share/qwo $(1)/usr/share/applications + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/qwo/* \ + $(1)/usr/share/qwo/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/qwo/qwo.desktop \ + $(1)/usr/share/applications/ +endef + +$(eval $(call BuildPackage,qwo)) diff --git a/Xorg/app/rxvt/Makefile b/Xorg/app/rxvt/Makefile new file mode 100644 index 0000000000..29504dfcc3 --- /dev/null +++ b/Xorg/app/rxvt/Makefile @@ -0,0 +1,50 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=rxvt +PKG_RELEASE:=2 +PKG_VERSION:=2.7.10 + +PKG_SOURCE_URL:=@SF/rxvt +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=302c5c455e64047b02d1ef19ff749141 + +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk + +PKG_INSTALL:=1 + +#TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/rxvt + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 +libXext +libXau +libXtst +imlib2 + TITLE:=rxvt + URL:=http://rxvt.sourceforge.net +endef + +define Package/rxvt/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/share/applications $(1)/usr/share/icons + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ + $(INSTALL_DATA) \ + ./files/rxvt.desktop \ + $(1)/usr/share/applications/rxvt.desktop + $(INSTALL_DATA) \ + ./files/icon.png \ + $(1)/usr/share/icons/rxvt.png +endef + +$(eval $(call BuildPackage,rxvt)) diff --git a/Xorg/app/rxvt/files/icon.png b/Xorg/app/rxvt/files/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..9206d2ff092b454523fd466ce644e92112cc7c0b GIT binary patch literal 8518 zcmaJ{byQqEu-}D6iY)G0+$pfYBBelaDN?k!OK~Z*KyhEJ$l??z6nA%Bpg6R+Ebi78 zEB5w#|G#(cBy(?0PLjEq`AsHCwB{Q{d>m>V004lmtR$z6;=cbSY)n)xW-T&A!Dfdfjn)00hP~N+cX-_Nr+xoLzr@y6eQ`s+{@%$+n58nt!gLnHfG_ zU^C4m{sP*9*Yiepm|Aw27R&(xV7t@y{2TLq&iL)T@^Y;+;l}Z4Vo6c5>wIm^Y+=4O z@7SmAPkX{feZugE6Ll`RCZ2sy1zV=N4C%Sj9c8KQq^pkld$jnty!Qw z)&x z^UkXFpS2yQBMiobvNF%6IatMHhc!juep^ew%3nQfk7cL=egk}!gY+94fhlO&{Doon z6ce{3cuGHYbd%E3Y$5yxL5GL$I5uANw03OWi|gLB+kd;mqgG;x_#Q`NJz<;)eu$E7)W?F-qR8@`wo{tbeex+`|VBXO0@$GU)!m z>H^b1zS9USXll9&-re0ze);lcKY(o;KqKx=Z{=hnNk6po>m+>^LR0ERoLL+^lh{gw zg^hI^61MuP64BdgQ%?C%>A*GP5Z|`s*udw|i@cm9iX9{$w5k;WumisFkVj@8!h;C4 z3myL5XJ$H%<*kF{^O4yy`9Cp5N#hx*V?(ta9lcC@Eg}|F0Nb91+rN0C7RPb&0hAo9 zCEbPO(Y~Z3IxU%8KO_M@fc<1Nr+>LbU>!wfA{JtI&Do_bw*LNUkmIR+-@*+`)%^yJ zjxKsB;YY+ft1TxU(+2F@F&1qSW|0h@WM z(nH7vwv4(7v%=8Zn`MSa?C)=KLW&*8NNsC`MJI=ZCM82pmQUsRvcfV)q5dAS(cvOJ zA1S35NX)rESqF?)7M_P-Ck$@x`yRaj(=H_FaD^N2*hV>;63xzXWj~YQgTD?8WU#EI z6mjjsQsKZ8&JyWuxVPb!mhA!JScNi#%9uyoVTT(%3Qh<>Ab1GMvhs5G$(PrRc zlp5@xp7MpsM6<8Hd`Yc=i51=P0+Bemmo&P=1<>%cg2~LIgHn#6;wtFJQ@tR@ln_E3 za6gYv=!95gvBMOk673vsA88qcOS=6+$G-O!xW_#5NghO>+;_2RNMbV24VWbC`HphPxx7ra3K*!H1QDwNrjn?OC=$uuWW$_va9Ja&YQLXRvdl8KpHU>bh0$D zHjN6@DJj3j1#pQkpwqt6Hdv26>%77b;|H7)@m=A2kyh~9)oh^}ze1BIElmSD8usg% zxliPmmGys45?0|vAP_JaKs2;bo=3Ptj~-;MLBtDxd@`uC-_&xq1P+T~S&eo1=;}KA z2*5|5=S{wzg=~9>-T93ck!Em$qqLpiztaE;e?zhA3u5IUN$E~cQSy+YpVO@{0h(cd zsRR_Mv4x_@m@m>vyq+)0Efx%JGBO zs?7T{f>KAfv9}>e?fdMoZM{fIa0r2rccoifRg=h0F7eVb0UzU$7?c(ug!s{hT&%Y% z?CM$*cmds`q@x>*GDK6cWh8J2b`;Rj)kTe$X3R_6IrL6G*pROXADtTz8v9@#NHAtu zP*!FmknS1pch*Tk@an$iwPf+E!~Jh~_dqZ@77A*=lWC$cYZV-c*R|3LvZa^m9OByT z>FhL62JRZWc>4j=XqkGQ_|aH^>qKtz=p|og?L>6>)qBh% z{yj@iDX*d6B9C?{srCV+&Lxf5@@L?v;@4E^Ys@?HP>q-^YOsR@2HmkZggqW7FsWCD z_>nxz%cQwdga4W(Z<09!g7eU~@j^B~@k~svX?MnfW!8b^EvNOY!?q6D7+R{fGz7WA z*oOaRaXs6QASNRWP8i+RP?J#rW(%ntWaVn1e#mCmx{lhe=rdwRp0OV2%PRH`T>2ey65G%5J{d z_->x@GusF0QlJ}m25(yrh_S(|WLh+9TZv8(*Xer&n5p2;tt4?Yi2ma?k^g16+2Bl( z>h!{b0mzMoxHkfyrpECXmvy}%OR_Q^KK{nf(zgrEt_*x;UB_;Zf68L4#p86uok3(3 z!Mp6AZIBCv>7&=)q5OA7S9cC*%ZEN0GEC87^wTjVWFkp$vCNU0axeVN75W^( z{(;BH%22~Un|D2Iteu%bNjz}&6L(2fIX__b){BfvGWff3f z784PHDS5r(xln6`)wfYoy{yBPxbA*TDRpuz#|9VjIvfWa4oOn^?f|Gs&jk|{Sv+g; zSxUYW(7u?mkWioL!uV?stV{yFHsEWh4M|h^j=4OiZyS3}{IV0C#?Uc?@RN#x36 zeaojyE@;v3sJEQBhP!C175h1FYMl=rzYKXsaK`n-4{p{`@(8st@_0%g(}vl|#~y=% z=H~Pu!otcA8)o;L6j0xDMwI<%W%h}AP2{6Z$v$VKMNAE2KVGjt(8cFLfhyQ8-?WRo ztFiftFonEUQMfep@?Xec)3SP<7E<&Ct6hYE`yJ>7d920N@nY1VrS^sY-+ir;vKURM z6CSbbS9Ij&$36>Gqi2)3!jJKC*;*yqTI>^AMsLw^%q{&_(j6(l6zzQR6;%9_Sh<`L ze!!D(<*67jKl5mL88HB2;^Xg<`qkk0Z-XbGBs)|KXO~{GAikzf#S}AfUQCe6X{C$K zsM)!HgoNGg_x695LnYC+(+e zlViU>>ex+sExfIk7czpc)O`G%Q z+?==uC62{p?n~&!2)pmYe7DF7&ve{xkHC(gloMA(9+jxV2USm@u7`2g%||+k^WKXs z-@B>jv|=70ltae2a0Q+;*{|wVea6!z6GQ{VHP_Gcz-yo-o1&9^)vA+(7!60_1#kH<&jI!&1O3;B3@%v8&38P@)tI@ zFYlYjj>`b}dYu-{S;D@S))FP0ti@GkiEI>B2hzFHOGb6Nc7|6~@wp*jN9m3|R%Kl^ zV-t)6WQKpId$UzFBrv$e(-{`m*ApJFz~-ZAyaqMq!KB+Zs17s&FDMoo+?gLINBOr- zUPmToroUJ?o>?_bt7GrUCv;I$W3)>v`!Vs#?#fBB!IS;ev>BZ6@*fA7UJ5q<`Oe6= z&3Bs6hkQy#x;=vIT2o;v32=Q4YjW z+~nME5D=MakhofM^AQR=LfN(7qohX$-tKrtXjxg=X6hxj3={p(W;kxG#mPJWkAG|- zlX(eA(a&ID{9uR7dw;?H$p@1}{p#yEL425n%UhD%m3l0-QQ5biyA>KCzLN3L*3@>B zCIj2n#QpuRDHIeHH30j;t=O^X$U(H8M(@V$s!PnCMK#P9e`)kiE572r9=?Xcd znS!0966z`V3mi_3d7ftAu&7k5tV7%JzMN6G)zDm}!R%W6^oTOv)g_e+oHFogi6xW~ zKAK-%j;okJ*Pm3VC?F^aYmJL5sjTG9WPRpY!<#NjKr>f0_^{k;g>p76QsOZ*d4b@n zvWcT~uCI0a&E;%p6-V}tj(xc={d#`l{q&#fx-yWAAF-y++2gacv_whJ&k8W@Sm;Hz zi&V&%nDEvu!c5MrUo3#q4+hCCI6y4K5q$XJFWk2<-(*YS>(0CH)!CpTm0WRSEz+Ok znc-xk@U1TAeKZKD4-YlX z%m`E*rqv?sAu+`Wg$koi>h`m4230uU;M4-83m(3VT?KMUouWsIFCTbrEP1<4zmFCw zgKc>MVoT=q%I%Db9izmOL=1AUtXfb zmW9$@VYM}p`&635dY9{Oskrk0^Ye?lcjXMSxl1pQ8lsF)RJ@ozm|gI@dBJDe1{m{8KtdFNVD2mQ5d8bq?2;6;oepOGMy z34%%kr6{ZZ>R9kOCViyFA?xvuozTSQM7Zq_6G=YgoFUhrcFZD zx6nq2S{`c-qrj0lQs{HVJEiQ({+)$Y`rx%@|Qt1radFG-vz|P4xBNxV|2OokkwCz)iq_6 z_&P9#QE_hbz2BPHj*yrQFY4~qZU&9O>-HOjPgm#z76DV%xJorEEe;iv#s_>E(dzeq zTR%vY8H9zWUnSAB{}l4u&IG#TCA9GjDGj*2m)kR@O+B5^C$*pEh!{egZ{S!T zjCs14QAPRPFE8)jq$#()AE)-eUS3x)VcIx0cmE6T=VG3J)@ghB>=wb518G^gIJD!=2ZmP3lim?}@iviR$GKoWh-9oK5ckay( z{hF@MPL2=+b;znXg46P!>Y{;~B>Xq=RQ-Xahi8y?2>y?;1L zA>Tc|kdAKu=xk_D)CFmj@QM%P<6MQ|Lg#x5DM@!Us>RladleHb2!0CTn1j8vkr563 zLM?j2nh(RNlk;WV1U?wNnXK_@u&dK=`r={;DN1s{B@B2e#T*6|u6BFM#u{TItMsy? zOD7H@yNm0J|2zdWkNzWvHvh@*LX^KV%&^{eqqI6;JU3!H{xC9DPFSv z%s?fR((@ntC2qOeCJpEyCAija3j-rGjG}-@vFSnf8-03iDYx>Gj)9Y zmg#xBl=GY5_itcET~1V89S$V)3vFb}XI(U&)YSe|%geK&*RSpgUFjsFeB$ZlQ5~9J zKsC+Ic;9sPWyr|62O0Zlsi(;+%lfPFbhp|22|&uvM31)Z)Nt{a}&=+ep)@I1GDdOM3`wnXInGsi;b zLe7<*`DNVAl~*nIK1u%*BkhaR!9nlupAqIdrV5*5vmz>zmP)`sIk`EV)v%hrzwPSz z;NxTUl;yhFlm8m}c(-n4@4rIW&r~CrmR9zSG#Psn=|-`Lr75iNH-?;ddV@VTz`F)W z=`*JICC0A0r#+*ltFQ`OR{UI8>=`{+0v9Q1N+!>lX>UtKf-1}!B{RCT9LlH^PdbMM z9<{|+O-l8zp<}t7ull$j9vkAZCr4I+9myJ#G%Alis|{(6yd)rGb{?$ zkRk73FA^&}le~Zkvxi;Lh3g3k==`tnB;$#wocXy=u|G1nmWjBf1M1W;Bu#*XoB9x% zo){6mbT&XL%Tyw>+)IarHKS@SlhABBqs-ziT@Rd z8?3p?^*d+C^8+8ThNHDrZJ{C-h3)dTrS7_ZZ)cc*G1LcK{dlPFd*{>LUv%oSGUff+ z+o0_>mg_sdj;8$^9U_&ol14me9$F}F;@hDgn_at|3#G7)Q5sRp9fk)Yjv|BUr5KDq zyBm3DYjLJo-B=w-9~wY{gXJ?28F8fEA2RM4S=T7b;$=)M2*Xi%1WbcoE=&|7rmlxPpTJ0z5lV(?_x$HFy_L|;MBHN zF@Pr`IVT62I{I9rl<2EldCCE3Hlb+Kr|#Nxodl?DS)%O6P1|AakSIv02AWg_0u>pS9o8b)i0DWyvH=pC>NZyahBQ_dFNdm51$6)Hb zE8>Gq9NdAcAi572ezoGbz#yLI7ngEGihzJv#yI)79 zuH^dsd?eiLBgU)GJ7jqFnMq&psJky`$9IDKg)E`_wY=O*&0kU|$afik%Dgu1O0rQ` z4okBB3PM)ww|3^b5I?{9yCQbqPGL3>p<8~w@S0#_EsjP2g;Tm0(1K|W%UXl!FX3}4 zJ`{YW1Ab@S3G2t}2^!VLGF@#;4#FB_#{7w{;q-j0#WuC}`qS;RKcDw)*9WK1b&xmIM{sYn(RNa3!ysRTs4(2>QzcJgqOJ$`P^B2IHdLbIN62b+3 zlRTNv8OcwSy*ln{j|YS+5f?393EQ36buE|;srj3;Ha2kLaZ@Vx(ty`$b8RD#U#zso zo6*kIVhHp=!C(oIh;GQ z6UIZ~$7zgu|I6Vjpsg4L^W6)1h(SndhlUYqj##^>ls>OBad%aTdZ2p_iUA!Lm`mbt zZ$#7mFgb2m#Puxx){5PNQS*>1Flip*Rm!qBqipF|qtj=mmn?5m|7twiE*m3GJ~nw$ zX=5WL1!tB_X6IR8wekwFf{^T#1T;#>Zel^Sngd6hgoKik7DS36rv-yTpCgzy*oFtt zmLmrXu;GVhr2OS)<`vjg&uaKOny->3n0N+_xgB@t@#?(AS>%0E-r4AQl#)v7a1wo& zGj>;Gi&3pzx;J74RWpc(ktilm*WZp=37IHP?sM3yVEW4?H3qawcGRaHqu(!w^XVNHUD`PI%I`(>sc zjL9^LgK!9>SCq>XZPM5y@ut1-&Qqd(>dn4Z{>q6L#PDTjk1Q#!?lgh(uikG z#TVk&R4B(Vaz@o((5czt{ao=ve9a=Lo}sK~)f&Nu8xi=~gy)NF zvqN#d#sElg?T=PqGD7pXTXS`|raa^%_dq5W%Z79k(iN6@^PL^R1txcke0%pabj}kj zH~?;dc*_x%IB1;INzArR9KloTTEhMripZTRJH z;%T-ia!)d#@gPXQenm8SWWe}M%zoSRw$-^tSmWuTN;8KKTzRpI$@}*A&V&<3U5@0J zhqPqAEEubGnjF&k;ysYts^&I_qaZe&2aOj^EeG@YGkckKDksBH@?^5!kmBN`qKxCl zGRf%14BUo8J^9jQGLOJr%vPle3Te(d0VrVN2kG=xw(w|pKA4U+S`K!7E15XrTfe}Y zrk)s8K$&AXv22qfOOf^-xm%odC!~`943CZP>YZ888gl2tr?^ZrqaCNpok zHitx+c_0FhO$gKR-NMx$Cb_)%ahFBgOa49V@Jc&9&EA;Z;;>zSQU=qKt{Q5**flPz z;$vA76#CUB=-Qkg6+I?j^{DA9U)J+W!k&y87WnUz-Fp2^F*fo1wErm>Tc&x&A09e7 zt#wc(*@JGq=729Y(q0m|DF^QT`GVuI+Oz`LZ;LruZrT_`fpKprR{oLN8`96^5;wLQ zO19>cSrXV*c)Yy4zE_KOMA{sJYTRmOJLi>yIFuusU`%w{RxcbDnTwyve&^e{uc{

o@@4m@XX*Gx6~?Q1(6%O`sifeb301K{y-YA> zsiF$I#VDJJ8G(O#2Yc~cplTq-7|&Whgx8BIUBVW!I6}?ARI_>Sa`QQTF=dj+0iN*& z@;?m~>oL$SlXJG>OYjTk8KU!z6qnV>K}wDs`q9#vVhnTHF%HuD-@P4wEx!#WkIFHZ zqn)2%)&$q4&nvvZG`d8iT}dh~1Nch-$6)?1wtDR-+HxR$cuQ|tLGN~jLb#o6flXWb z_iVNl9%vUJpD4VjoNmm!bl_; zf}tZv18>mT*x32`T^w#LP@CjLDirRBm|V9VzzEQCLuiOLKS+osss@s$=B+Ebhw-AT$^+eB@v;97I_$8puqNZ;;&OoJVq=X3ohf)gO + + #include +- +-#ifdef __linux__ +-#include +-#endif +- + #include + #include + #include diff --git a/Xorg/app/xine-ui/patches/120-remove-delay.patch b/Xorg/app/xine-ui/patches/120-remove-delay.patch new file mode 100644 index 0000000000..5d3dcc6632 --- /dev/null +++ b/Xorg/app/xine-ui/patches/120-remove-delay.patch @@ -0,0 +1,13 @@ +Index: xine-ui-0.99.4/configure +=================================================================== +--- xine-ui-0.99.4.orig/configure 2010-11-04 18:11:02.449000004 +0100 ++++ xine-ui-0.99.4/configure 2010-11-04 18:11:08.594998937 +0100 +@@ -31102,8 +31102,6 @@ + echo "your compiler to "\! + echo + echo "*********************************************************************" +- echo "(sleeping one minute so you can read this...)" +- sleep 60 + + CFLAGS="-O3 $CFLAGS" + DEBUG_CFLAGS="-O $DEBUG_CFLAGS" diff --git a/Xorg/app/xinit/Makefile b/Xorg/app/xinit/Makefile new file mode 100644 index 0000000000..fc10243623 --- /dev/null +++ b/Xorg/app/xinit/Makefile @@ -0,0 +1,41 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xinit +PKG_VERSION:=1.0.5 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=9a2aad51042141a0e6ad066015397595 + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/xinit + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 + TITLE:=xinit + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xinit/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,xinit)) diff --git a/Xorg/app/xmessage/Makefile b/Xorg/app/xmessage/Makefile new file mode 100644 index 0000000000..2f96e2e4fc --- /dev/null +++ b/Xorg/app/xmessage/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xmessage +PKG_VERSION:=1.0.2 +PKG_RELEASE:=2 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=b4b561ef11fd184989a6062962e86748 + +include $(INCLUDE_DIR)/package.mk + +define Package/xmessage + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libXaw + TITLE:=xmessage + URL:=http://xorg.freedesktop.org/ +endef + +CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" + +define Build/Compile + DESTDIR=$(PKG_INSTALL_DIR) make -C $(PKG_BUILD_DIR) install +endef + +define Package/xmessage/install + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + rm -rf $(1)/usr/man/ +endef + +define Build/InstallDev + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ +endef + +$(eval $(call BuildPackage,xmessage)) diff --git a/Xorg/app/xterm/Makefile b/Xorg/app/xterm/Makefile new file mode 100644 index 0000000000..6888560182 --- /dev/null +++ b/Xorg/app/xterm/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xterm +PKG_VERSION:=242 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://mirror1.openwrt.org/ +PKG_MD5SUM:=663fa3aac8e30e4c2d4bf07c0aee4dca + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/xterm + SECTION:=xorg-extra + CATEGORY:=Xorg + SUBMENU:=terminals + TITLE:=xterm + DEPENDS:=+libX11 +libncurses +libXaw +endef + +define Build/Configure +# sed -e "s%/usr/contrib/X11R6%${STAGING_DIR}/usr/lib%g" -i $(PKG_BUILD_DIR)/configure + cd $(PKG_BUILD_DIR)/; $(TARGET_CONFIGURE_OPTS) $(CONFIGURE_VARS) \ + $(CONFIGURE_CMD) \ + $(CONFIGURE_ARGS_XTRA) \ + $(CONFIGURE_ARGS) \ + --host=$(GNU_TARGET_NAME) \ + --x-includes=$(STAGING_DIR)/usr/include/ \ + --x-libraries=$(STAGING_DIR)/usr/lib/ \ + LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" +endef + +define Package/xterm/install + $(INSTALL_DIR) $(1)/usr/ $(1)/usr/share/applications $(1)/usr/share/icons + $(CP) $(PKG_INSTALL_DIR)/usr/bin $(1)/usr/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib $(1)/usr/ + $(CP) ./files/xterm.desktop $(1)/usr/share/applications/ + $(CP) ./files/terminal.png $(1)/usr/share/icons/ +endef + +$(eval $(call BuildPackage,xterm)) diff --git a/Xorg/app/xterm/files/terminal.png b/Xorg/app/xterm/files/terminal.png new file mode 100644 index 0000000000000000000000000000000000000000..309e04651f7edb1963278762847c4bf0d878e3ba GIT binary patch literal 2624 zcmV-G3cvMRhpc06?D5XHD1d%EvBp&ELK!TS_@C*6?4?OS|1zy`e5D8Q$Py!`fs|o>u zmOBzbIFO5TabkO?bH;n@+40Qo+89DxPcqusi+ATc=R21^^e>mi*w`36eE6`htE+1)7K{CO^ypF8zkh#T09930 zz_mWFzP^6N)TvXUy}ccJdg5T)w)TdM|KY!1V=Q~6|M~nKgRd#PF5nUT_YA75Bd~e% zm%x=<`{Kombq5a~{OR!F!_30~)HtU`O9IB}vCYCoGISU^~rI~&~Qz_GkA z=$L#Rf$;v8c_x_u9cX^*J@4JJoB#@cn;$2WqwwU(Q#f?!5JaQV$-8&&M%*cn0II92 zQ2>GoPo6x6SZpFpo;(>Ghj}MQfI-@4tYCsF_&jJZLP+35Pd0IK;sZ@^OkQGGp`+Mgcf@LlOe`QC-$T5HPO> zgMg{5Diluse#qL<(NPY3P-s1!PUX(|h4YBX^AdQ6ITHAA+Sb!JtZ@9ysnA?dyCWk> z0epCP*rRO%uA_di32@*jRlVJsZQSh9{cK-#m^wBvPgu+XAK~_$5L=w93Or1U_{C^h zi@{E<76wuALCIti`uhh2<@3PHyD*9P z**}?p9)w>OXAWUHnyXpj*x0CWZWznStAD7Kso4hz@Q&62hS#<}Jyo?$=lPPAQ+-hM zR4P>#8-Fho$TPq%W)~O2RBhunYv&`J?)^NO8OvSsG3pTk3}7LgTDTDA1@6t)F<1W> zbT63!rRL?P*q`_ANuhPj-SPN%RG`dZP}skti3CA;xoX>men4oQhqa+`(t2nU$fm;K z9G|)lFkOQ--q+VBiWK9e^&-L`xRV4?EEye5YOhnBnrVHGj;^n--{ax^7AoWF1hXI< z!Gu^W3cGf-2+iHNaRcJ=(Mi`PNu07M6p5$5eAv3wuTFp2M@a7 z@4x?o)2C0v%9SfQD>lO7#fxF-(xtFy(IVKkZ5y0Fe;!VrJSiAKFIV2z1gMj5P=!$n z8;V*D($==C#P;>;*Kq1oJEwmKcaX~jBbF~;4s+(rftHpQe*6;j_V(r+A5Kc1m^?0g zSrSeFI3^*;MUt>=@bv-tOprXgdh-5Y+O%nc_Gtgj&CNV2%n*}6;McBQg9{ffh&%ybxzPlRH35_M zbz9lQu*>D~63gP*OpwY@n9ZR_pFMlF$MH>>GDUd%SFc_P;1@4m6z}1%jz`*8C!k}1 z$__v6>%i-PI=Q-L31N`vPZFI!e?Dy5^o5{#Lqmh0Io9m%-Mc63AH(0vmoJ6n5j1KZ zy*~;Kv&fk8*?x2OxOdQYY!F`$5l<@8#$0)KDn{Rrl$)CA}HS zrnM<(Z$HKDyjz4iq&@;SftNw!!_S;KBQnS^$qAMbB+b}BGc>wdi`2GI35C&$T%x*awh zU=_6KIGvMMhNdOBtZkY8#Q-iz0Q8V-6v%@oHWc$fomt32P#IvNdJtGO2hgS6ayF_J z0NOPI#g6NJq#+hDGMTgx2E}vA?&Ps44x6MduMKoUP&+Y#Iz|B9)-=XEWyz8y;yXw= zdUynYiA(lfTtCA#K7K>@=FOV|jh17q(ph$Bre$xbWAVKc7x=Y)5lU2rYW3bL(|5*#v=e+zqhuw+A<||g~?Cl`{AHvFBWU%Oje2>Hc#2B zjvYHDq>%$Wefo4-L0LgkAMc)j&oC^;NN=i6(=j~%?%g|aT()^U-rL)25l&myEWfyq z_mmn|KDADfq^71uL@NY{U$x4|(BtFE6{}MeUeN@2@9XI3NNJs5cX#*W`uh4`Ic0WF zoH()iLr^!UKv7OJL)v38*JTdt>FIfqNF;v2cQsl896x@%f7Yy7-}8&kb1Bxj@zmzs z;=i}ttu2jp`vn~_xxi_k1Yt?FHs%8NYwDrMg??8{rZo1V?2Ep2D?NY%?PN(TTo*alb-Q_5Tb0000k-e3<5A`uiya(XrcQ5VcS<-WN1%w#i;F_+%Gw{#l?a0X literal 0 HcmV?d00001 diff --git a/Xorg/driver/xf86-input-tslib/patches/100-ifdef-debug-output.patch b/Xorg/driver/xf86-input-tslib/patches/100-ifdef-debug-output.patch new file mode 100644 index 0000000000..c836359c8a --- /dev/null +++ b/Xorg/driver/xf86-input-tslib/patches/100-ifdef-debug-output.patch @@ -0,0 +1,58 @@ +commit 69fcc78ea931f8a84497f4ee9021f4493f45a778 +Author: Lars-Peter Clausen +Date: Sun Feb 1 16:44:24 2009 +0100 + + Put #ifdef DEBUG around debug output. + +Index: xf86-input-tslib-0.0.6/src/tslib.c +=================================================================== +--- xf86-input-tslib-0.0.6.orig/src/tslib.c 2009-10-19 17:07:18.000000000 +0200 ++++ xf86-input-tslib-0.0.6/src/tslib.c 2011-01-27 22:36:41.772784019 +0100 +@@ -89,21 +89,27 @@ + static void + BellProc(int percent, DeviceIntPtr pDev, pointer ctrl, int unused) + { ++#ifdef DEBUG + ErrorF("%s\n", __FUNCTION__); ++#endif + return; + } + + static void + KeyControlProc(DeviceIntPtr pDev, KeybdCtrl * ctrl) + { ++#ifdef DEBUG + ErrorF("%s\n", __FUNCTION__); ++#endif + return; + } + + static void + PointerControlProc(DeviceIntPtr dev, PtrCtrl * ctrl) + { ++#ifdef DEBUG + ErrorF("%s\n", __FUNCTION__); ++#endif + return; + } + +@@ -327,7 +333,9 @@ + int i, axiswidth, axisheight; + struct ts_priv *priv; + ++#ifdef DEBUG + ErrorF("%s\n", __FUNCTION__); ++#endif + pInfo = device->public.devicePrivate; + priv = pInfo->private; + +@@ -431,7 +439,9 @@ + xf86TslibUninit(InputDriverPtr drv, InputInfoPtr pInfo, int flags) + { + struct ts_priv *priv = (struct ts_priv *)(pInfo->private); ++#ifdef DEBUG + ErrorF("%s\n", __FUNCTION__); ++#endif + xf86TslibControlProc(pInfo->dev, DEVICE_OFF); + ts_close(priv->ts); + xfree(pInfo->private); diff --git a/Xorg/driver/xf86-video-glamo/Makefile b/Xorg/driver/xf86-video-glamo/Makefile new file mode 100644 index 0000000000..f1b1bc7e16 --- /dev/null +++ b/Xorg/driver/xf86-video-glamo/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86-video-glamo +PKG_VERSION:=20091029 +PKG_REV:=15954340b4b7aaf6ab850c149c2f75c1555d9360 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://git.openmoko.org/git/xf86-video-glamo.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) + +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_BUILD_DEPENDS:=xproto fontsproto randrproto renderproto videoproto +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/xf86-video-glamo + TITLE:=xf86-video-glamo + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + URL:=http://git.openmoko.org/?p=xf86-video-glamo.git + DEPENDS:=@DISPLAY_SUPPORT @arm||armeb @TARGET_s3c24xx +xserver-xorg +endef + +define Package/xf86-video-glamo/description + xorg video driver for the smedia glamo 3362 chip. +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR) && autoreconf --force --install) + $(call Build/Configure/Default, \ + --disable-jbt6k74-set-state \ + --enable-engine-ioctls \ + ) +endef + +define Package/xf86-video-glamo/install + $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/glamo_drv.so \ + $(1)/usr/lib/xorg/modules/drivers/ +endef + +$(eval $(call BuildPackage,xf86-video-glamo)) diff --git a/Xorg/driver/xf86-video-glamo/patches/001-include-glamo-engine.patch b/Xorg/driver/xf86-video-glamo/patches/001-include-glamo-engine.patch new file mode 100644 index 0000000000..8e5c324043 --- /dev/null +++ b/Xorg/driver/xf86-video-glamo/patches/001-include-glamo-engine.patch @@ -0,0 +1,12 @@ +diff --git a/src/glamo-engine.h b/src/glamo-engine.h +index 0664341..92a5ed5 100644 +--- a/src/glamo-engine.h ++++ b/src/glamo-engine.h +@@ -23,6 +23,7 @@ + + #ifdef HAVE_ENGINE_IOCTLS + #include ++#include + + #define GLAMOEngine glamo_engine + #define GLAMO_ENGINE_ALL __NUM_GLAMO_ENGINES diff --git a/Xorg/font/dejavu-fonts-ttf/Makefile b/Xorg/font/dejavu-fonts-ttf/Makefile new file mode 100644 index 0000000000..e971baf685 --- /dev/null +++ b/Xorg/font/dejavu-fonts-ttf/Makefile @@ -0,0 +1,91 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=dejavu-fonts-ttf +PKG_VERSION:=2.23 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=@SF/dejavu +PKG_MD5SUM:=ff871dff0b3e8a11cd5c54478f11073f + +include $(INCLUDE_DIR)/package.mk + +FILES:= \ + DejaVuSans-BoldOblique \ + DejaVuSans-Bold \ + DejaVuSansCondensed-BoldOblique \ + DejaVuSansCondensed-Bold \ + DejaVuSansCondensed-Oblique \ + DejaVuSansCondensed \ + DejaVuSans-ExtraLight \ + DejaVuSansMono-BoldOblique \ + DejaVuSansMono-Bold \ + DejaVuSansMono-Oblique \ + DejaVuSansMono \ + DejaVuSans-Oblique \ + DejaVuSans \ + DejaVuSerif-BoldItalic \ + DejaVuSerif-Bold \ + DejaVuSerifCondensed-BoldItalic \ + DejaVuSerifCondensed-Bold \ + DejaVuSerifCondensed-Italic \ + DejaVuSerifCondensed \ + DejaVuSerif-Italic \ + DejaVuSerif + +define PartGen +define Package/dejavu-fonts-ttf-$(1) + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + TITLE:=$(1) + DEPENDS:=dejavu-fonts-ttf +endef +endef + +define Package/dejavu-fonts-ttf + TITLE:=dejavu-fonts-ttf + SECTION:=xorg-font + SUBMENU:=font + CATEGORY:=Xorg + URL:=http://dejavu.sourceforge.net/ + DEPENDS:=@DISPLAY_SUPPORT +endef + +define Package/dejavu-fonts-ttf/install + true +endef + +$(foreach file,$(FILES),$(eval $(call PartGen,$(file)))) + +define Build/Compile + true +endef + +define Build/Configure + true +endef + +define PartInstall +define Package/dejavu-fonts-ttf-$(1)/install + $(INSTALL_DIR) \ + $$(1)/usr/share/fonts/ttf-dejavu + + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/ttf/$(1).ttf \ + $$(1)/usr/share/fonts/ttf-dejavu/ +endef +endef + +$(foreach file,$(FILES),$(eval $(call PartInstall,$(file)))) + +$(eval $(call BuildPackage,dejavu-fonts-ttf)) +$(foreach file,$(FILES),$(eval $(call BuildPackage,dejavu-fonts-ttf-$(file)))) + diff --git a/Xorg/font/liberation-fonts-ttf/Makefile b/Xorg/font/liberation-fonts-ttf/Makefile new file mode 100644 index 0000000000..99c0325940 --- /dev/null +++ b/Xorg/font/liberation-fonts-ttf/Makefile @@ -0,0 +1,44 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +include $(TOPDIR)/rules.mk + +PKG_NAME:=liberation-fonts +PKG_RELEASE:=1 +PKG_VERSION:=1.04 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://fedorahosted.org/releases/l/i/liberation-fonts/ +PKG_MD5SUM:=4846797ef0fc70b0cbaede2514677c58 + +include $(INCLUDE_DIR)/package.mk + +define Package/liberation-fonts-ttf + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + TITLE:=liberation-fonts-ttf + URL:=https://fedorahosted.org/liberation-fonts/ +endef + +define Build/Compile + true +endef + +define Build/Configure + true +endef + +define Package/liberation-fonts-ttf/install + $(INSTALL_DIR) $(1)/usr/share/fonts/truetype/liberation + $(INSTALL_DATA) \ + $(PKG_BUILD_DIR)/*.ttf \ + $(1)/usr/share/fonts/truetype/liberation/ +endef + +$(eval $(call BuildPackage,liberation-fonts-ttf)) + diff --git a/Xorg/generate.sh b/Xorg/generate.sh new file mode 100755 index 0000000000..87359c8084 --- /dev/null +++ b/Xorg/generate.sh @@ -0,0 +1,30 @@ +#!/bin/sh +for d in `find . -name packages | grep driver`; do + cd `dirname $d` + echo "Entering "`dirname $d` + for p in `cat packages`; do + _NAME=${p%%|*} + NAME=${_NAME%-*} + BASE_NAME=${NAME%%-*} + VER=${_NAME##*-} + DEP=`echo ${p##*|} | sed "s/+/ +/g"` + echo generating Makefile for ${NAME}-${VER} with deps : ${DEP} + rm -f ${NAME}/Makefile + if [ -e ${NAME}/patches ]; then + rm -f ${NAME}/patches/* + fi + if [ "$1" = "gen" ]; then + if [ ! -e ${NAME} ]; then + mkdir ${NAME} + fi + sed "s/@VER@/${VER}/g" template.mk | sed "s/@DEP@/${DEP}/g" | sed "s/@NAME@/${NAME}/g" | sed "s/@BASE_NAME@/${BASE_NAME}/g" > ${NAME}/Makefile + if [ -d `pwd`/patches/${NAME} ]; then + if [ ! -d ${NAME}/patches ]; then + mkdir ${NAME}/patches + fi + cp -r `pwd`/patches/${NAME}/* ${NAME}/patches/ + fi + fi + done + cd - > /dev/null +done diff --git a/Xorg/lib/atk/Makefile b/Xorg/lib/atk/Makefile new file mode 100644 index 0000000000..c6be1fd5a8 --- /dev/null +++ b/Xorg/lib/atk/Makefile @@ -0,0 +1,46 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=atk +PKG_VERSION:=1.22.0 +PKG_RELEASE:=3 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.22/ +PKG_MD5SUM:=06a2b39a22d5ca35c47435da6b9643ac + +PKG_FIXUP:=libtool + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +define Package/atk + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Accesibility library for gtk+ apps + DEPENDS:=+glib2 +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib,include} + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib* $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/ $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ +endef + +define Package/atk/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,atk)) diff --git a/Xorg/lib/atk/patches/010-do-not-use-GTK_DOC-macro.patch b/Xorg/lib/atk/patches/010-do-not-use-GTK_DOC-macro.patch new file mode 100644 index 0000000000..301bf39b6a --- /dev/null +++ b/Xorg/lib/atk/patches/010-do-not-use-GTK_DOC-macro.patch @@ -0,0 +1,11 @@ +--- atk-1.22.0.orig/configure.in 2008-03-10 08:27:08.000000000 +0100 ++++ atk-1.22.0/configure.in 2010-12-10 16:06:39.479379673 +0100 +@@ -178,7 +178,7 @@ + + AC_CHECK_FUNCS(bind_textdomain_codeset) + +-GTK_DOC_CHECK([1.0]) ++#GTK_DOC_CHECK([1.0]) + + # define a MAINT-like variable REBUILD which is set if Perl + # and awk are found, so autogenerated sources can be rebuilt diff --git a/Xorg/lib/atk/patches/020-do-not-build-examples_docs_pos_tests.patch b/Xorg/lib/atk/patches/020-do-not-build-examples_docs_pos_tests.patch new file mode 100644 index 0000000000..d5c66751e0 --- /dev/null +++ b/Xorg/lib/atk/patches/020-do-not-build-examples_docs_pos_tests.patch @@ -0,0 +1,50 @@ +--- atk-1.22.0.orig/Makefile.in 2008-03-10 08:30:11.000000000 +0100 ++++ atk-1.22.0/Makefile.in 2010-12-10 16:10:24.239380634 +0100 +@@ -243,7 +243,7 @@ + sharedstatedir = @sharedstatedir@ + sysconfdir = @sysconfdir@ + target_alias = @target_alias@ +-SUBDIRS = atk tests docs po ++SUBDIRS = atk + EXTRA_DIST = \ + MAINTAINERS \ + atk-uninstalled.pc.in \ +--- atk-1.22.0.orig/Makefile.am 2007-12-17 17:36:22.000000000 +0100 ++++ atk-1.22.0/Makefile.am 2010-12-10 16:17:15.255377279 +0100 +@@ -1,6 +1,6 @@ + # Process this file with automake to create Makefile.in. + +-SUBDIRS=atk tests docs po ++SUBDIRS=atk + + EXTRA_DIST = \ + MAINTAINERS \ +--- atk-1.22.0.orig/Makefile.in 2010-12-10 18:56:15.011379161 +0100 ++++ atk-1.22.0/Makefile.in 2010-12-10 18:57:34.439378866 +0100 +@@ -486,7 +486,7 @@ + distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) +- $(mkdir_p) $(distdir)/. $(distdir)/atk $(distdir)/docs $(distdir)/po ++ $(mkdir_p) $(distdir)/. $(distdir)/atk + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ +diff -ruN atk-1.22.0/configure.in atk-1.22.0.mod//configure.in +--- atk-1.22.0/configure.in 2010-12-10 19:11:38.335379754 +0100 ++++ atk-1.22.0.mod//configure.in 2010-12-10 19:08:56.155380379 +0100 +@@ -197,14 +197,10 @@ + + AC_CONFIG_FILES([ + Makefile +-po/Makefile.in + atk.pc + atk-uninstalled.pc + atk/Makefile + atk/atk.rc +-tests/Makefile +-docs/Makefile +-docs/version.xml + atk.spec + atk-zip.sh + ]) diff --git a/Xorg/lib/cairo/Makefile b/Xorg/lib/cairo/Makefile new file mode 100644 index 0000000000..bd695612df --- /dev/null +++ b/Xorg/lib/cairo/Makefile @@ -0,0 +1,66 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=cairo +PKG_VERSION:=1.8.8 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://cairographics.org/releases/ +PKG_MD5SUM:=d3e1a1035ae563812d4dd44a74fb0dd0 +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk + +PKG_INSTALL:=1 + +define Package/cairo + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Multi-platform 2D graphics library + DEPENDS:=+fontconfig +libpng +libexpat +pixman \ + +FEATURE_drawing-backend_DirectFB:directfb \ + +FEATURE_drawing-backend_libX11:libX11 + URL:=http://cairographics.org/ +endef + +define Package/cairo/description +Cairo is a 2D graphics library. The cairo API provides operations similar +to the drawing operators of PostScript and PDF. Operations in cairo +include stroking and filling cubic Bézier splines, transforming and +compositing translucent images, and antialiased text rendering. All +drawing operations can be transformed by any affine transformation +(scale, rotation, shear, etc.). +endef + +CONFIGURE_VARS+=FONTCONFIG_LIBS="-lfreetype -lfontconfig -lz -lexpat" + +CONFIGURE_ARGS+= \ + --enable-freetype=yes \ + --disable-win32 \ + --enable-xlib-xrender=no \ + $(if $(CONFIG_FEATURE_drawing-backend_DirectFB), --enable-directfb, --disable-directfb) \ + $(if $(CONFIG_FEATURE_drawing-backend_libX11), --enable-xlib --with-x, --disable-xlib --without-x) + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ + $(INSTALL_DIR) $(1)/usr/include/cairo/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/cairo/* $(1)/usr/include/cairo/ +endef + +define Package/cairo/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,cairo)) diff --git a/Xorg/lib/cairomm/Makefile b/Xorg/lib/cairomm/Makefile new file mode 100644 index 0000000000..ced2c9aed9 --- /dev/null +++ b/Xorg/lib/cairomm/Makefile @@ -0,0 +1,63 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=cairomm +PKG_VERSION:=1.8.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://cairographics.org/releases/ +PKG_MD5SUM:=559afbc47484ba3fad265e38a3dafe90 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/cairomm + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Multi-platform 2D graphics library + DEPENDS:=+libsigcxx +cairo + URL:=http://cairographics.org/cairomm/ +endef + +define Package/cairomm/description +c++-bindings for cairo +endef + +define Build/InstallDev + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/lib/pkgconfig \ + $(1)/usr/include + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/* \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ +endef + +define Package/cairomm/install + $(INSTALL_DIR) \ + $(1)/usr/lib/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,cairomm)) diff --git a/Xorg/lib/fltk2/Makefile b/Xorg/lib/fltk2/Makefile new file mode 100644 index 0000000000..85cbc673b2 --- /dev/null +++ b/Xorg/lib/fltk2/Makefile @@ -0,0 +1,65 @@ +# +# Copyright (C) 2006-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=fltk2 +PKG_REV:=6671 +PKG_VERSION:=r$(PKG_REV) +PKG_RELEASE:=2 + +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://svn.easysw.com/public/fltk/fltk/trunk +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_FIXUP:=libtool +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/fltk2 + SECTION:=xorg-framework + CATEGORY:=Xorg + SUBMENU:=framework + TITLE:=Fltk2 + URL:=http://fltk.org/ + DEPENDS:=+libXi +libstdcpp +libfreetype +endef + +define Package/fltk2/description + FLTK (pronounced ) is a cross-platform C++ GUI toolkit for UNIX/Linux (X11), Microsoft Windows, and MacOS X. FLTK provides modern GUI functionality without the bloat and supports 3D graphics via OpenGL and its built-in GLUT emulation. +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR); autoconf ); + $(call Build/Configure/Default, --disable-jpeg --disable-zlib --disable-png --disable-gl --disable-xinerama --enable-shared --x-libraries=$(STAGING_DIR)/usr/lib --x-includes=$(STAGING_DIR)/usr/include) +endef + +define Build/Compile + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) all +endef + +define Build/Install + DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) install +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/bin $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/fltk $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/bin/fltk2-config $(1)/usr/bin/ +endef + +define Package/fltk2/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,fltk2)) diff --git a/Xorg/lib/fltk2/patches/000-do-not-build-fltk-and-tests b/Xorg/lib/fltk2/patches/000-do-not-build-fltk-and-tests new file mode 100644 index 0000000000..1bb8a3d72d --- /dev/null +++ b/Xorg/lib/fltk2/patches/000-do-not-build-fltk-and-tests @@ -0,0 +1,11 @@ +--- fltk2/Makefile 2009-01-02 01:41:31.000000000 +0100 ++++ fltk2/Makefile 2009-01-02 01:40:36.000000000 +0100 +@@ -25,7 +25,7 @@ + + include makeinclude + +-DIRS = src $(LOCALIMAGES) images OpenGL fluid glut test ++DIRS = src $(LOCALIMAGES) images + + all: makeinclude + for dir in $(DIRS); do\ diff --git a/Xorg/lib/fltk2/patches/001-be-verbose b/Xorg/lib/fltk2/patches/001-be-verbose new file mode 100644 index 0000000000..2ca500a08f --- /dev/null +++ b/Xorg/lib/fltk2/patches/001-be-verbose @@ -0,0 +1,12 @@ +--- fltk2/makeinclude.in 2009-01-02 02:28:29.000000000 +0100 ++++ fltk2/makeinclude.in 2009-01-02 02:28:43.000000000 +0100 +@@ -114,9 +114,6 @@ + CAT1EXT = @CAT1EXT@ + CAT3EXT = @CAT3EXT@ + +-# Be quiet when building... +-.SILENT: +- + # Build commands and filename extensions... + .SUFFIXES: .0 .1 .3 .c .cxx .h .fl .man .o .z $(EXEEXT) + diff --git a/Xorg/lib/fltk2/patches/002-honor-cppflags b/Xorg/lib/fltk2/patches/002-honor-cppflags new file mode 100644 index 0000000000..618d14aa29 --- /dev/null +++ b/Xorg/lib/fltk2/patches/002-honor-cppflags @@ -0,0 +1,26 @@ +Index: fltk2-r6671/makeinclude.in +=================================================================== +--- fltk2-r6671.orig/makeinclude.in 2010-11-03 02:16:42.106000002 +0100 ++++ fltk2-r6671/makeinclude.in 2010-11-03 02:16:43.163002267 +0100 +@@ -54,6 +54,7 @@ + + # flags for C++ compiler: + OPTIM = @OPTIM@ ++CPPFLAGS = @CPPFLAGS@ + CFLAGS = $(OPTIM) @CFLAGS@ + CXXFLAGS = $(OPTIM) @CXXFLAGS@ + +@@ -124,11 +125,11 @@ + + .c.o: + echo Compiling $<... +- $(CC) -I.. -I../fltk/compat $(CFLAGS) -c $< ++ $(CC) $(CPPFLAGS) -I.. -I../fltk/compat $(CFLAGS) -c $< + + .cxx.o: + echo Compiling $<... +- $(CXX) -I.. -I../fltk/compat $(CXXFLAGS) -c $< ++ $(CXX) $(CPPFLAGS) -I.. -I../fltk/compat $(CXXFLAGS) -c $< + + .man.0 .man.1 .man.3: + echo Formatting $<... diff --git a/Xorg/lib/fltk2/patches/100-compile-fixes.patch b/Xorg/lib/fltk2/patches/100-compile-fixes.patch new file mode 100644 index 0000000000..e52df797e1 --- /dev/null +++ b/Xorg/lib/fltk2/patches/100-compile-fixes.patch @@ -0,0 +1,14 @@ +Index: fltk2-r6671/src/filename_list.cxx +=================================================================== +--- fltk2-r6671.orig/src/filename_list.cxx 2010-11-03 02:17:17.243001500 +0100 ++++ fltk2-r6671/src/filename_list.cxx 2010-11-03 02:24:13.400999350 +0100 +@@ -62,6 +62,9 @@ + // This version is when we define our own scandir (WIN32 and perhaps + // some Unix systems): + int n = scandir(d, list, 0, sort); ++#elif defined(__UCLIBC_MAJOR__) && \ ++ __UCLIBC_MAJOR__ >= 0 && __UCLIBC_MINOR__ >= 9 && __UCLIBC_SUBLEVEL__ >= 31 ++ int n = scandir(d, list, 0, (int(*)(const dirent **, const dirent **))sort); + #elif defined(__linux) || defined (__FreeBSD__) || defined (__NetBSD__) + int n = scandir(d, list, 0, (int(*)(const void*,const void*))sort); + #elif defined(__hpux) || defined(__CYGWIN__) diff --git a/Xorg/lib/gtk1/Makefile b/Xorg/lib/gtk1/Makefile new file mode 100644 index 0000000000..70e331440e --- /dev/null +++ b/Xorg/lib/gtk1/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=gtk1 +PKG_VERSION:=1.2.10 +PKG_RELEASE:=2 + +PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@GNOME/gtk+/1.2/ +PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-1.2.10 +PKG_MD5SUM:=4d5cb2fc7fb7830e4af9747a36bfce20 +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk + +PKG_INSTALL=1 + +CONFIGURE_ARGS_XTRA+=--x-includes=$(STAGING_DIR)/usr/include/ \ + --x-libraries=$(STAGING_DIR)/usr/lib \ + --with-glib-prefix=$(STAGING_DIR)/usr/ \ + --enable-static=yes \ + --enable-static=yes + +EXTRA_CFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib +TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/glib-1.2 -I$(STAGING_DIR)/usr/lib/glib/include +EXTRA_LDFLAGS+=-lglib -lgmodule + +define Package/gtk1 + SECTION:=xorg-framework + CATEGORY:=Xorg + SUBMENU:=framework + TITLE:=GTK+ 1.2.10 package + DEPENDS:=+glib1 +libX11 +libXt + URL:=http://www.gtk.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(INSTALL_DIR) $(2)/bin + mv $(1)/usr/bin/gtk-config $(2)/bin/ + $(SED) "s,libdirs=-L.*,libdirs=,g" $(2)/bin/gtk-config + $(SED) \ + 's,^\(prefix\|exec_prefix\)=.*,\1="$(STAGING_DIR)/usr",g' \ + $(2)/bin/gtk-config +endef + +$(eval $(call BuildPackage,gtk1)) diff --git a/Xorg/lib/gtk2/Makefile b/Xorg/lib/gtk2/Makefile new file mode 100644 index 0000000000..6da640e4e1 --- /dev/null +++ b/Xorg/lib/gtk2/Makefile @@ -0,0 +1,133 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=gtk2 +PKG_VERSION:=2.17.0 +PKG_RELEASE:=2 + +PKG_SOURCE:=gtk+-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/gtk+/2.17 +PKG_BUILD_DIR=$(BUILD_DIR)/gtk+-$(PKG_VERSION) +PKG_MD5SUM:=a1a1f0b66a240c31cb2733643f9170ba + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +TARGET_LDFLAGS+=\ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_gtk2 CONFIG_PACKAGE_gtk2-cups) + +# We can _either_ compile gtk2 with directfb-support _or_ against libX11 (libX11 is preferred when both libs are selected) + +define Package/gtk2 + SECTION:=xorg-framework + CATEGORY:=Xorg + SUBMENU:=framework + TITLE:=GTK+-2.0 + DEPENDS:=@DISPLAY_SUPPORT +cairo +pango +libpng +libjpeg +atk +libtiff +glib2 \ + +FEATURE_drawing-backend_DirectFB:directfb \ + +FEATURE_drawing-backend_libX11:libX11 \ + +FEATURE_drawing-backend_libX11:libXext \ + +FEATURE_drawing-backend_libX11:libXrender \ + +FEATURE_drawing-backend_libX11:libXfixes \ + +FEATURE_drawing-backend_libX11:libXrandr \ + +FEATURE_drawing-backend_libX11:libXcursor \ + +FEATURE_drawing-backend_libX11:libXdamage \ + +FEATURE_drawing-backend_libX11:libXcomposite \ + +FEATURE_drawing-backend_libX11:libXi + URL:=http://www.gtk.org/ +endef + +define Package/gtk2-cups + SECTION:=xorg-framework + CATEGORY:=Xorg + SUBMENU:=framework + TITLE:=CUPS print backend for GTK+-2.0 + DEPENDS:=gtk2 +cups +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-shm \ + --disable-xkb \ + --disable-glibtest \ + --disable-gdiplus \ + --disable-xinerama \ + --without-libjasper \ + --without-xinput \ + $(if $(CONFIG_FEATURE_drawing-backend_DirectFB),--with-gdktarget=directfb,) \ + $(if $(CONFIG_FEATURE_drawing-backend_libX11),--with-x --with-gdktarget=x11,--without-x) \ + $(if $(CONFIG_PACKAGE_gtk2-cups),--enable-cups=auto,--disable-cups), \ + gio_can_sniff=no \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include} + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/include/* $(1)/usr/include/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la} \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/gtk2/install + $(INSTALL_DIR) $(1)/etc/gtk-2.0 + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/etc/gtk-2.0/* \ + $(1)/etc/gtk-2.0/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ + + $(foreach d,engines immodules loaders, \ + $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/$(d); \ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/$(d)/*.so \ + $(1)/usr/lib/gtk-2.0/2.10.0/$(d)/;\ + ) + $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-{file,lpr}.so \ + $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/ + + $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/{gdk-pixbuf-query-loaders,gtk-query-immodules-2.0,gtk-update-icon-cache} \ + $(1)/usr/bin/ + + $(INSTALL_DIR) $(1)/usr/share/themes/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/themes/* \ + $(1)/usr/share/themes/ + + $(INSTALL_DIR) $(1)/etc/init.d/ + $(INSTALL_BIN) ./files/gdk-pixbuf-query-loaders.init $(1)/etc/init.d/gdk-pixbuf-query-loaders +endef + +define Package/gtk2-cups/install + $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/printbackends/libprintbackend-cups.so \ + $(1)/usr/lib/gtk-2.0/2.10.0/printbackends/ +endef + +$(eval $(call BuildPackage,gtk2)) +$(eval $(call BuildPackage,gtk2-cups)) diff --git a/Xorg/lib/gtk2/files/gdk-pixbuf-query-loaders.init b/Xorg/lib/gtk2/files/gdk-pixbuf-query-loaders.init new file mode 100755 index 0000000000..f4efb0ccc9 --- /dev/null +++ b/Xorg/lib/gtk2/files/gdk-pixbuf-query-loaders.init @@ -0,0 +1,12 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2007 OpenWrt.org + +START=99 +FILE=/etc/gtk-2.0/gdk-pixbuf.loaders + +start() { + if [ ! -e ${FILE} ]; then + mkdir -p $(dirname ${FILE}) + gdk-pixbuf-query-loaders > ${FILE} + fi +} diff --git a/Xorg/lib/gtk2/patches/010-do-not-use-GTK_DOC-macro.patch b/Xorg/lib/gtk2/patches/010-do-not-use-GTK_DOC-macro.patch new file mode 100644 index 0000000000..04580d07ac --- /dev/null +++ b/Xorg/lib/gtk2/patches/010-do-not-use-GTK_DOC-macro.patch @@ -0,0 +1,11 @@ +--- gtk+-2.17.0.orig/configure.in 2009-05-04 06:43:43.000000000 +0200 ++++ gtk+-2.17.0/configure.in 2010-12-10 16:28:28.359377713 +0100 +@@ -1929,7 +1929,7 @@ + # Checks for gtk-doc and docbook-tools + ################################################## + +-GTK_DOC_CHECK([1.11]) ++#GTK_DOC_CHECK([1.11]) + + AC_CHECK_PROG(DB2HTML, db2html, true, false) + AM_CONDITIONAL(HAVE_DOCBOOK, $DB2HTML) diff --git a/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch b/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch new file mode 100644 index 0000000000..3181882e20 --- /dev/null +++ b/Xorg/lib/gtk2/patches/010-dont-build-demos-and-tests.patch @@ -0,0 +1,28 @@ +diff -ruN gtk+-2.17.0.orig/Makefile.am gtk+-2.17.0/Makefile.am +--- gtk+-2.17.0.orig/Makefile.am 2009-05-03 18:39:14.000000000 +0200 ++++ gtk+-2.17.0/Makefile.am 2009-10-16 23:53:15.000000000 +0200 +@@ -1,8 +1,8 @@ + ## Makefile.am for GTK+ + include $(top_srcdir)/Makefile.decl + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib +-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib ++SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros + + # require automake 1.4 + AUTOMAKE_OPTIONS = 1.7 +diff -ruN gtk+-2.17.0.orig/Makefile.in gtk+-2.17.0/Makefile.in +--- gtk+-2.17.0.orig/Makefile.in 2009-05-04 06:45:42.000000000 +0200 ++++ gtk+-2.17.0/Makefile.in 2009-10-16 23:53:07.000000000 +0200 +@@ -523,8 +523,8 @@ + && DISPLAY=:$$XID && export DISPLAY + + +-SRC_SUBDIRS = gdk-pixbuf gdk gtk modules demos tests perf contrib +-SUBDIRS = po po-properties $(SRC_SUBDIRS) docs m4macros ++SRC_SUBDIRS = gdk-pixbuf gdk gtk modules contrib ++SUBDIRS = po po-properties $(SRC_SUBDIRS) m4macros + + # require automake 1.4 + AUTOMAKE_OPTIONS = 1.7 diff --git a/Xorg/lib/gtk2/patches/030-dont-build-demos_tests_pos_examples.patch b/Xorg/lib/gtk2/patches/030-dont-build-demos_tests_pos_examples.patch new file mode 100644 index 0000000000..7121948089 --- /dev/null +++ b/Xorg/lib/gtk2/patches/030-dont-build-demos_tests_pos_examples.patch @@ -0,0 +1,207 @@ +--- gtk+-2.17.0.orig/Makefile.in 2010-12-09 01:26:16.995377995 +0100 ++++ gtk+-2.17.0/Makefile.in 2010-12-10 16:30:00.283378413 +0100 +@@ -407,95 +407,7 @@ + config.h.win32 \ + makefile.msc \ + gtk-zip.sh.in \ +- sanitize-la.sh \ +- po/README.translators \ +- po/po2tbl.sed.in \ +- examples/aspectframe/Makefile \ +- examples/aspectframe/aspectframe.c \ +- examples/Makefile \ +- examples/README.1ST \ +- examples/extract.awk \ +- examples/extract.sh \ +- examples/arrow/Makefile \ +- examples/arrow/arrow.c \ +- examples/base/Makefile \ +- examples/base/base.c \ +- examples/buttonbox/Makefile \ +- examples/buttonbox/buttonbox.c \ +- examples/buttons/Makefile \ +- examples/buttons/buttons.c \ +- examples/buttons/info.xpm \ +- examples/calendar/Makefile \ +- examples/calendar/calendar.c \ +- examples/clist/Makefile \ +- examples/clist/clist.c \ +- examples/entry/Makefile \ +- examples/entry/entry.c \ +- examples/eventbox/Makefile \ +- examples/eventbox/eventbox.c \ +- examples/filesel/Makefile \ +- examples/filesel/filesel.c \ +- examples/gtkdial/Makefile \ +- examples/gtkdial/dial_test.c \ +- examples/gtkdial/gtkdial.c \ +- examples/gtkdial/gtkdial.h \ +- examples/helloworld/Makefile \ +- examples/helloworld/helloworld.c \ +- examples/helloworld2/Makefile \ +- examples/helloworld2/helloworld2.c \ +- examples/label/Makefile \ +- examples/label/label.c \ +- examples/list/Makefile \ +- examples/list/list.c \ +- examples/menu/Makefile \ +- examples/menu/menu.c \ +- examples/menu/itemfactory.c \ +- examples/notebook/Makefile \ +- examples/notebook/notebook.c \ +- examples/packbox/Makefile \ +- examples/packbox/packbox.c \ +- examples/paned/Makefile \ +- examples/paned/paned.c \ +- examples/pixmap/Makefile \ +- examples/pixmap/pixmap.c \ +- examples/progressbar/Makefile \ +- examples/progressbar/progressbar.c \ +- examples/radiobuttons/Makefile \ +- examples/radiobuttons/radiobuttons.c \ +- examples/rangewidgets/Makefile \ +- examples/rangewidgets/rangewidgets.c \ +- examples/rulers/Makefile \ +- examples/rulers/rulers.c \ +- examples/scribble-simple/Makefile \ +- examples/scribble-simple/scribble-simple.c \ +- examples/scribble-xinput/Makefile \ +- examples/scribble-xinput/scribble-xinput.c \ +- examples/scrolledwin/Makefile \ +- examples/scrolledwin/scrolledwin.c \ +- examples/selection/Makefile \ +- examples/selection/gettargets.c \ +- examples/selection/setselection.c \ +- examples/statusbar/Makefile \ +- examples/statusbar/statusbar.c \ +- examples/table/Makefile \ +- examples/table/table.c \ +- examples/text/Makefile \ +- examples/text/text.c \ +- examples/tictactoe/Makefile \ +- examples/tictactoe/tictactoe.c \ +- examples/tictactoe/tictactoe.h \ +- examples/tictactoe/ttt_test.c \ +- examples/tree/Makefile \ +- examples/tree/tree.c \ +- examples/wheelbarrow/Makefile \ +- examples/wheelbarrow/wheelbarrow.c \ +- examples/fixed/fixed.c \ +- examples/fixed/Makefile \ +- examples/frame/frame.c \ +- examples/frame/Makefile \ +- examples/spinbutton/spinbutton.c \ +- examples/spinbutton/Makefile \ +- examples/find-examples.sh ++ sanitize-la.sh + + TEST_PROGS = + +@@ -803,7 +715,7 @@ + distdir: $(DISTFILES) + $(am__remove_distdir) + mkdir $(distdir) +- $(mkinstalldirs) $(distdir)/. $(distdir)/contrib/gdk-pixbuf-xlib $(distdir)/demos/gtk-demo $(distdir)/docs/reference/gdk $(distdir)/docs/reference/gdk-pixbuf $(distdir)/docs/reference/gtk $(distdir)/examples $(distdir)/examples/arrow $(distdir)/examples/aspectframe $(distdir)/examples/base $(distdir)/examples/buttonbox $(distdir)/examples/buttons $(distdir)/examples/calendar $(distdir)/examples/clist $(distdir)/examples/entry $(distdir)/examples/eventbox $(distdir)/examples/filesel $(distdir)/examples/fixed $(distdir)/examples/frame $(distdir)/examples/gtkdial $(distdir)/examples/helloworld $(distdir)/examples/helloworld2 $(distdir)/examples/label $(distdir)/examples/list $(distdir)/examples/menu $(distdir)/examples/notebook $(distdir)/examples/packbox $(distdir)/examples/paned $(distdir)/examples/pixmap $(distdir)/examples/progressbar $(distdir)/examples/radiobuttons $(distdir)/examples/rangewidgets $(distdir)/examples/rulers $(distdir)/examples/scribble-simple $(distdir)/examples/scribble-xinput $(distdir)/examples/scrolledwin $(distdir)/examples/selection $(distdir)/examples/spinbutton $(distdir)/examples/statusbar $(distdir)/examples/table $(distdir)/examples/text $(distdir)/examples/tictactoe $(distdir)/examples/tree $(distdir)/examples/wheelbarrow $(distdir)/gdk-pixbuf $(distdir)/gdk/win32/rc $(distdir)/gtk $(distdir)/po $(distdir)/po-properties ++ $(mkinstalldirs) $(distdir)/. $(distdir)/contrib/gdk-pixbuf-xlib $(distdir)/gdk-pixbuf $(distdir)/gdk/win32/rc $(distdir)/gtk + @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ + list='$(DISTFILES)'; for file in $$list; do \ +--- gtk+-2.17.0.orig/Makefile.am 2010-12-09 01:26:16.995377995 +0100 ++++ gtk+-2.17.0/Makefile.am 2010-12-10 16:30:30.555380813 +0100 +@@ -29,95 +29,7 @@ + config.h.win32 \ + makefile.msc \ + gtk-zip.sh.in \ +- sanitize-la.sh \ +- po/README.translators \ +- po/po2tbl.sed.in \ +- examples/aspectframe/Makefile \ +- examples/aspectframe/aspectframe.c \ +- examples/Makefile \ +- examples/README.1ST \ +- examples/extract.awk \ +- examples/extract.sh \ +- examples/arrow/Makefile \ +- examples/arrow/arrow.c \ +- examples/base/Makefile \ +- examples/base/base.c \ +- examples/buttonbox/Makefile \ +- examples/buttonbox/buttonbox.c \ +- examples/buttons/Makefile \ +- examples/buttons/buttons.c \ +- examples/buttons/info.xpm \ +- examples/calendar/Makefile \ +- examples/calendar/calendar.c \ +- examples/clist/Makefile \ +- examples/clist/clist.c \ +- examples/entry/Makefile \ +- examples/entry/entry.c \ +- examples/eventbox/Makefile \ +- examples/eventbox/eventbox.c \ +- examples/filesel/Makefile \ +- examples/filesel/filesel.c \ +- examples/gtkdial/Makefile \ +- examples/gtkdial/dial_test.c \ +- examples/gtkdial/gtkdial.c \ +- examples/gtkdial/gtkdial.h \ +- examples/helloworld/Makefile \ +- examples/helloworld/helloworld.c \ +- examples/helloworld2/Makefile \ +- examples/helloworld2/helloworld2.c \ +- examples/label/Makefile \ +- examples/label/label.c \ +- examples/list/Makefile \ +- examples/list/list.c \ +- examples/menu/Makefile \ +- examples/menu/menu.c \ +- examples/menu/itemfactory.c \ +- examples/notebook/Makefile \ +- examples/notebook/notebook.c \ +- examples/packbox/Makefile \ +- examples/packbox/packbox.c \ +- examples/paned/Makefile \ +- examples/paned/paned.c \ +- examples/pixmap/Makefile \ +- examples/pixmap/pixmap.c \ +- examples/progressbar/Makefile \ +- examples/progressbar/progressbar.c \ +- examples/radiobuttons/Makefile \ +- examples/radiobuttons/radiobuttons.c \ +- examples/rangewidgets/Makefile \ +- examples/rangewidgets/rangewidgets.c \ +- examples/rulers/Makefile \ +- examples/rulers/rulers.c \ +- examples/scribble-simple/Makefile \ +- examples/scribble-simple/scribble-simple.c \ +- examples/scribble-xinput/Makefile \ +- examples/scribble-xinput/scribble-xinput.c \ +- examples/scrolledwin/Makefile \ +- examples/scrolledwin/scrolledwin.c \ +- examples/selection/Makefile \ +- examples/selection/gettargets.c \ +- examples/selection/setselection.c \ +- examples/statusbar/Makefile \ +- examples/statusbar/statusbar.c \ +- examples/table/Makefile \ +- examples/table/table.c \ +- examples/text/Makefile \ +- examples/text/text.c \ +- examples/tictactoe/Makefile \ +- examples/tictactoe/tictactoe.c \ +- examples/tictactoe/tictactoe.h \ +- examples/tictactoe/ttt_test.c \ +- examples/tree/Makefile \ +- examples/tree/tree.c \ +- examples/wheelbarrow/Makefile \ +- examples/wheelbarrow/wheelbarrow.c \ +- examples/fixed/fixed.c \ +- examples/fixed/Makefile \ +- examples/frame/frame.c \ +- examples/frame/Makefile \ +- examples/spinbutton/spinbutton.c \ +- examples/spinbutton/Makefile \ +- examples/find-examples.sh ++ sanitize-la.sh + + GDKTARGET=@gdktarget@ + diff --git a/Xorg/lib/gtk2/patches/100-compile_fix.patch b/Xorg/lib/gtk2/patches/100-compile_fix.patch new file mode 100644 index 0000000000..c855a9d70b --- /dev/null +++ b/Xorg/lib/gtk2/patches/100-compile_fix.patch @@ -0,0 +1,30 @@ +--- a/gtk/Makefile.am ++++ b/gtk/Makefile.am +@@ -1126,12 +1126,6 @@ + ./gtk-update-icon-cache + endif + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) +- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ +- mv gtkbuiltincache.h.tmp gtkbuiltincache.h +- + EXTRA_DIST += \ + $(STOCK_ICONS) \ + $(GENERATED_ICONS) \ +--- a/gtk/Makefile.in ++++ b/gtk/Makefile.in +@@ -2970,12 +2970,6 @@ + done \ + && touch stamp-icons + +-gtkbuiltincache.h: @REBUILD@ stamp-icons +- $(MAKE) $(AM_MAKEFLAGS) gtk-update-icon-cache$(EXEEXT) +- $(gtk_update_icon_cache_program) --force --ignore-theme-index \ +- --source builtin_icons stock-icons > gtkbuiltincache.h.tmp && \ +- mv gtkbuiltincache.h.tmp gtkbuiltincache.h +- + install-data-local: + # Tell versions [3.59,3.63) of GNU make to not export all variables. + # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/Xorg/lib/gtkmm/Makefile b/Xorg/lib/gtkmm/Makefile new file mode 100644 index 0000000000..6c3febb699 --- /dev/null +++ b/Xorg/lib/gtkmm/Makefile @@ -0,0 +1,65 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=gtkmm +PKG_VERSION:=2.16.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.16 +PKG_MD5SUM:=a82e3b5b93008421ff67df16d1e51ec2 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +TARGET_LDFLAGS+=\ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/gtkmm + SECTION:=xorg-framework + CATEGORY:=Xorg + SUBMENU:=framework + TITLE:=GTK+-2.0 + DEPENDS:=+gtk2 +cairomm +pangomm +glibmm + URL:=http://www.gtkmm.org/ +endef + +CONFIGURE_ARGS+= --disable-docs --disable-demos + +define Build/InstallDev + $(INSTALL_DIR) \ + $(1)/usr/lib/pkgconfig \ + $(1)/usr/include + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/* \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/gtkmm/install + $(INSTALL_DIR) \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,gtkmm)) diff --git a/Xorg/lib/gtkmm/patches/001-automake-compat.patch b/Xorg/lib/gtkmm/patches/001-automake-compat.patch new file mode 100644 index 0000000000..61f9ef05b1 --- /dev/null +++ b/Xorg/lib/gtkmm/patches/001-automake-compat.patch @@ -0,0 +1,29 @@ +--- a/configure.in ++++ b/configure.in +@@ -119,15 +119,15 @@ AL_PROG_GNU_MAKE(AC_MSG_ERROR([dnl + SUN make does not work for building gtkmm. + Please install GNU make.])) + +-# This macro is installed by glibmm ++# This macro is installed by mm-macros + # Doxygen needs the path to the installed perl. +-GLIBMM_CHECK_PERL([5.6.0]) ++MM_CHECK_PERL([5.6.0]) + + ######################################################################### + # Function checks + ######################################################################### + +-AC_CHECK_FUNC(mkfifo, AC_DEFINE(HAVE_MKFIFO)) ++AC_CHECK_FUNC(mkfifo, AC_DEFINE([HAVE_MKFIFO], [], [Define if mkfifo is available])) + + # functions used in demos/gtk-demo. Undefined in config.h. + AC_LANG_PUSH(C++) +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,3 +1,5 @@ ++ACLOCAL_AMFLAGS = -I scripts ++ + if GTKMM_ATKMM_ENABLED + ATK_SUBDIR=atk + else diff --git a/Xorg/lib/gtkmm/patches/100-disable-tools-tests.patch b/Xorg/lib/gtkmm/patches/100-disable-tools-tests.patch new file mode 100644 index 0000000000..0cddb4aabe --- /dev/null +++ b/Xorg/lib/gtkmm/patches/100-disable-tools-tests.patch @@ -0,0 +1,88 @@ +--- a/configure ++++ b/configure +@@ -22179,10 +22179,7 @@ fi + AUTOHEADER=':' + + +-ac_config_files="$ac_config_files Makefile gdk/Makefile gdk/gdkmm-2.4.pc gdk/src/Makefile gdk/gdkmm/Makefile gdk/gdkmm/private/Makefile gtk/Makefile gtk/gtkmm-2.4.pc gtk/src/Makefile gtk/gtkmm/Makefile gtk/gtkmm/private/Makefile tools/Makefile tools/m4/Makefile tools/extra_defs_gen/Makefile" +- +- +-ac_config_files="$ac_config_files tests/Makefile tests/child_widget/Makefile tests/child_widget2/Makefile tests/child_widget_managed/Makefile tests/refcount_dialog/Makefile tests/dialog/Makefile tests/dialog_deletethis/Makefile tests/delete_cpp_child/Makefile tests/main_with_options/Makefile tests/menu_destruction/Makefile tests/property_notification/Makefile tests/scrolledwindow/Makefile tests/wrap_existing/Makefile" ++ac_config_files="$ac_config_files Makefile gdk/Makefile gdk/gdkmm-2.4.pc gdk/src/Makefile gdk/gdkmm/Makefile gdk/gdkmm/private/Makefile gtk/Makefile gtk/gtkmm-2.4.pc gtk/src/Makefile gtk/gtkmm/Makefile gtk/gtkmm/private/Makefile" + + + ac_config_files="$ac_config_files scripts/Makefile" +@@ -22870,22 +22867,6 @@ do + "gtk/src/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/src/Makefile" ;; + "gtk/gtkmm/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/Makefile" ;; + "gtk/gtkmm/private/Makefile") CONFIG_FILES="$CONFIG_FILES gtk/gtkmm/private/Makefile" ;; +- "tools/Makefile") CONFIG_FILES="$CONFIG_FILES tools/Makefile" ;; +- "tools/m4/Makefile") CONFIG_FILES="$CONFIG_FILES tools/m4/Makefile" ;; +- "tools/extra_defs_gen/Makefile") CONFIG_FILES="$CONFIG_FILES tools/extra_defs_gen/Makefile" ;; +- "tests/Makefile") CONFIG_FILES="$CONFIG_FILES tests/Makefile" ;; +- "tests/child_widget/Makefile") CONFIG_FILES="$CONFIG_FILES tests/child_widget/Makefile" ;; +- "tests/child_widget2/Makefile") CONFIG_FILES="$CONFIG_FILES tests/child_widget2/Makefile" ;; +- "tests/child_widget_managed/Makefile") CONFIG_FILES="$CONFIG_FILES tests/child_widget_managed/Makefile" ;; +- "tests/refcount_dialog/Makefile") CONFIG_FILES="$CONFIG_FILES tests/refcount_dialog/Makefile" ;; +- "tests/dialog/Makefile") CONFIG_FILES="$CONFIG_FILES tests/dialog/Makefile" ;; +- "tests/dialog_deletethis/Makefile") CONFIG_FILES="$CONFIG_FILES tests/dialog_deletethis/Makefile" ;; +- "tests/delete_cpp_child/Makefile") CONFIG_FILES="$CONFIG_FILES tests/delete_cpp_child/Makefile" ;; +- "tests/main_with_options/Makefile") CONFIG_FILES="$CONFIG_FILES tests/main_with_options/Makefile" ;; +- "tests/menu_destruction/Makefile") CONFIG_FILES="$CONFIG_FILES tests/menu_destruction/Makefile" ;; +- "tests/property_notification/Makefile") CONFIG_FILES="$CONFIG_FILES tests/property_notification/Makefile" ;; +- "tests/scrolledwindow/Makefile") CONFIG_FILES="$CONFIG_FILES tests/scrolledwindow/Makefile" ;; +- "tests/wrap_existing/Makefile") CONFIG_FILES="$CONFIG_FILES tests/wrap_existing/Makefile" ;; + "scripts/Makefile") CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; + "MSVC_Net2005/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2005/Makefile" ;; + "MSVC_Net2005/gendef/Makefile") CONFIG_FILES="$CONFIG_FILES MSVC_Net2005/gendef/Makefile" ;; +--- a/configure.in ++++ b/configure.in +@@ -405,26 +405,6 @@ AC_CONFIG_FILES([ + gtk/src/Makefile + gtk/gtkmm/Makefile + gtk/gtkmm/private/Makefile +- +- tools/Makefile +- tools/m4/Makefile +- tools/extra_defs_gen/Makefile +-]) +- +-AC_CONFIG_FILES([ +- tests/Makefile +- tests/child_widget/Makefile +- tests/child_widget2/Makefile +- tests/child_widget_managed/Makefile +- tests/refcount_dialog/Makefile +- tests/dialog/Makefile +- tests/dialog_deletethis/Makefile +- tests/delete_cpp_child/Makefile +- tests/main_with_options/Makefile +- tests/menu_destruction/Makefile +- tests/property_notification/Makefile +- tests/scrolledwindow/Makefile +- tests/wrap_existing/Makefile + ]) + + AC_CONFIG_FILES([ +--- a/Makefile.am ++++ b/Makefile.am +@@ -6,7 +6,7 @@ else + ATK_SUBDIR= + endif + +-SUBDIRS = tools $(ATK_SUBDIR) gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ tests MSVC_Net2005 MSVC_Net2008 win32_installer ++SUBDIRS = $(ATK_SUBDIR) gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ MSVC_Net2005 MSVC_Net2008 win32_installer + DIST_SUBDIRS = $(SUBDIRS) scripts + + EXTRA_DIST = build_shared/Makefile_build.am_fragment \ +--- a/Makefile.in ++++ b/Makefile.in +@@ -213,7 +213,7 @@ top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ + @GTKMM_ATKMM_ENABLED_FALSE@ATK_SUBDIR = + @GTKMM_ATKMM_ENABLED_TRUE@ATK_SUBDIR = atk +-SUBDIRS = tools $(ATK_SUBDIR) gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ tests MSVC_Net2005 MSVC_Net2008 win32_installer ++SUBDIRS = $(ATK_SUBDIR) gdk gtk @DEMO_SUBDIR@ @DOCS_SUBDIR@ MSVC_Net2005 MSVC_Net2008 win32_installer + DIST_SUBDIRS = $(SUBDIRS) scripts + EXTRA_DIST = build_shared/Makefile_build.am_fragment \ + build_shared/Makefile_build_gensrc.am_fragment \ diff --git a/Xorg/lib/hippo-canvas/Makefile b/Xorg/lib/hippo-canvas/Makefile new file mode 100644 index 0000000000..696cfeee1d --- /dev/null +++ b/Xorg/lib/hippo-canvas/Makefile @@ -0,0 +1,98 @@ +# +# Copyright (C) 2008-2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=hippo-canvas +PKG_VERSION:=0.3.0 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/0.3/ +PKG_MD5SUM:=9a0f64eb0258a3e8ba710eff9798a7d0 +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +-include $(if $(DUMP),,$(STAGING_DIR)/mk/python-package.mk) + +PKG_INSTALL:=1 + +EXTRA_CFLAGS += \ + -I$(INTL_PREFIX)/include \ + -I$(STAGING_DIR)/usr/include/libcroco-0.6 \ + +STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_hippo-canvas CONFIG_PACKAGE_python-hippo-canvas) + +define Package/hippo-canvas/Default + URL:=http://developer.mugshot.org/wiki/Hippo_Canvas + DEPENDS:=@FEATURE_drawing-backend_libX11 +endef + +define Package/hippo-canvas +$(call Package/hippo-canvas/Default) + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Hippo Canvas + DEPENDS+=+librsvg +gtk2 +cairo +libcroco +pango +endef + +define Package/hippo-canvas/description +The Hippo Canvas is a Cairo/GObject/GTK+ based canvas, written in C with +support for flexible layout, CSS styling, and initial work on animations. +endef + +define Package/python-hippo-canvas +$(call Package/hippo-canvas/Default) + SECTION:=lang-python + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Python bindings for hippo canvas + DEPENDS+=+python-mini +PACKAGE_python-hippo-canvas:python-gtk +PACKAGE_python-hippo-canvas:pycairo +hippo-canvas +endef + +define Build/Configure + $(call Build/Configure/Default, \ + $(if $(CONFIG_PACKAGE_python-hippo-canvas), \ + --enable-python, \ + --disable-python \ + ) \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DIR) $(1)/usr/include/hippo-canvas-1/hippo/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/hippo-canvas-1/hippo/* \ + $(1)/usr/include/hippo-canvas-1/hippo/ +endef + +define Package/hippo-canvas/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ +endef + +define Package/python-hippo-canvas/install + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) + $(CP) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/*.so* \ + $(1)$(PYTHON_PKG_DIR) +endef + +$(eval $(call BuildPackage,hippo-canvas)) +$(eval $(call BuildPackage,python-hippo-canvas)) diff --git a/Xorg/lib/hippo-canvas/patches/010-use-python-config b/Xorg/lib/hippo-canvas/patches/010-use-python-config new file mode 100644 index 0000000000..26ad36f267 --- /dev/null +++ b/Xorg/lib/hippo-canvas/patches/010-use-python-config @@ -0,0 +1,17 @@ +--- hippo-canvas-0.3.0.orig/configure 2008-09-30 22:18:23.000000000 +0200 ++++ hippo-canvas-0.3.0/configure 2008-09-30 22:41:16.000000000 +0200 +@@ -20486,10 +20486,14 @@ + echo $ECHO_N "checking for headers required to compile python extensions... $ECHO_C" >&6; } + py_prefix=`$PYTHON -c "import sys; print sys.prefix"` + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` ++if test -x "$PYTHON-config"; then ++PYTHON_INCLUDES=`$PYTHON-config --includes 2>/dev/null` ++else + PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}" + if test "$py_prefix" != "$py_exec_prefix"; then + PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}" + fi ++fi + + save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $PYTHON_INCLUDES" diff --git a/Xorg/lib/imlib2/Makefile b/Xorg/lib/imlib2/Makefile new file mode 100644 index 0000000000..569567f37d --- /dev/null +++ b/Xorg/lib/imlib2/Makefile @@ -0,0 +1,82 @@ +# +# Copyright (C) 2006-2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=imlib2 +PKG_VERSION:=1.4.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/enlightenment +PKG_MD5SUM:=20d59c7cda06742015baade6f5975415 + +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk + +PKG_INSTALL=1 + +define Package/imlib2 + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Image library + DEPENDS:=+libX11 +giflib +libtiff +libjpeg +gtk1 +libfreetype +libXext + URL:=http://docs.enlightenment.org/api/imlib2/html/ +endef + +TARGET_CFLAGS += "-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" + +define Build/Configure + $(call Build/Configure/Default, \ + --x-includes="$(STAGING_DIR)/usr/include/X11" \ + --x-libraries="$(STAGING_DIR)/usr/lib/" \ + --disable-gtktest \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{include,lib/pkgconfig} + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{la,so*,a} \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DIR) $(2)/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/imlib2-config \ + $(2)/bin/ + $(SED) \ + 's,^\(prefix\|exec_prefix\)=.*,\1=$(STAGING_DIR)/usr,g' \ + $(2)/bin/imlib2-config +endef + +define Package/imlib2/install + $(INSTALL_DIR) $(1)/usr/lib/imlib2/{loaders,filters} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/imlib2/filters/*.so* \ + $(1)/usr/lib/imlib2/filters + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/imlib2/loaders/*.so* \ + $(1)/usr/lib/imlib2/loaders +endef + +$(eval $(call BuildPackage,imlib2)) diff --git a/Xorg/lib/libast/Makefile b/Xorg/lib/libast/Makefile new file mode 100644 index 0000000000..08b64a68fa --- /dev/null +++ b/Xorg/lib/libast/Makefile @@ -0,0 +1,70 @@ +# +# Copyright (C) 2006-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libast +PKG_VERSION:=0.7 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.eterm.org/download/ +PKG_MD5SUM:=a9ec3b2da317f35869316e6d9571d296 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/libast + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=libast + DEPENDS:=+libpcre \ + +FEATURE_drawing-backend_libX11:libX11 \ + +FEATURE_drawing-backend_libX11:libXt +endef + +CONFIGURE_ARGS+= \ + --with-regexp="pcre" \ + --without-imlib \ + +ifneq ($(CONFIG_FEATURE_drawing-backend_libX11),) + CONFIGURE_ARGS+= \ + --with-x \ + --x-includes="$(STAGING_DIR)/usr/include" \ + --x-libraries="$(STAGING_DIR)/usr/lib" +else + CONFIGURE_ARGS+= \ + --without-x +endif + +CONFIGURE_VARS+= \ + dps_cv_snprintf_bug=0 \ + dps_cv_vsnprintf_bug=0 \ + dps_cv_symlink_open_bug=0 \ + +EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib $(1)/usr/include $(2)/bin + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libast.{la,so*} $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(2)/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(SED) "s,-I/usr/include,,g" $(2)/bin/libast-config + $(SED) "s,-L/usr/lib,,g" $(2)/bin/libast-config + $(SED) "s,-L/usr/X11R6/lib,,g" $(2)/bin/libast-config +endef + +define Package/libast/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libast.so.* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libast)) diff --git a/Xorg/lib/libast/patches/010-dont-add-host-paths.patch b/Xorg/lib/libast/patches/010-dont-add-host-paths.patch new file mode 100644 index 0000000000..1d602a828a --- /dev/null +++ b/Xorg/lib/libast/patches/010-dont-add-host-paths.patch @@ -0,0 +1,30 @@ +--- a/configure ++++ b/configure +@@ -27152,10 +27152,10 @@ fi; + + + +- CPPFLAGS=`eval eval eval eval eval echo "-I$includedir -I$prefix/include $CPPFLAGS"` ++ CPPFLAGS=`eval eval eval eval eval echo "$CPPFLAGS"` + CPPFLAGS=`echo $CPPFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` + CFLAGS=${CFLAGS--O} +- LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"` ++ LDFLAGS=`eval eval eval eval eval echo "${LDFLAGS--O}"` + LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` + LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" + +--- a/libast.m4 ++++ b/libast.m4 +@@ -398,10 +398,10 @@ dnl# + dnl# LibAST macro for flag post-processing + dnl# + AC_DEFUN([AST_FLAGS], [ +- CPPFLAGS=`eval eval eval eval eval echo "-I$includedir -I$prefix/include $CPPFLAGS"` ++ CPPFLAGS=`eval eval eval eval eval echo "$CPPFLAGS"` + CPPFLAGS=`echo $CPPFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` + CFLAGS=${CFLAGS--O} +- LDFLAGS=`eval eval eval eval eval echo "-L$libdir -L$prefix/lib ${LDFLAGS--O}"` ++ LDFLAGS=`eval eval eval eval eval echo "${LDFLAGS--O}"` + LDFLAGS=`echo $LDFLAGS | tr ' ' '\n' | uniq | grep -v NONE | tr '\n' ' '` + LIBS="$GRLIBS $X_PRE_LIBS $LIBS $X_EXTRA_LIBS" + ]) diff --git a/Xorg/lib/libast/patches/100-configure.patch b/Xorg/lib/libast/patches/100-configure.patch new file mode 100644 index 0000000000..6ca1be64c6 --- /dev/null +++ b/Xorg/lib/libast/patches/100-configure.patch @@ -0,0 +1,22 @@ +--- a/configure ++++ b/configure +@@ -23906,7 +23906,7 @@ else + + mkdir conftest.d + if test "$cross_compiling" = yes; then +- dps_cv_symlink_open_buf=3 ++ dps_cv_symlink_open_bug=3 + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +--- a/libast.m4 ++++ b/libast.m4 +@@ -573,7 +573,7 @@ int main(void) + dps_cv_symlink_open_bug=1 + fi + ], +- dps_cv_symlink_open_buf=3) ++ dps_cv_symlink_open_bug=3) + rm -rf conftest.d + ]) + case "$dps_cv_symlink_open_bug" in diff --git a/Xorg/lib/libdrm/Makefile b/Xorg/lib/libdrm/Makefile new file mode 100644 index 0000000000..87dd985e1e --- /dev/null +++ b/Xorg/lib/libdrm/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libdrm +PKG_VERSION:=2.3.1 +PKG_RELEASE:=3 + +PKG_SOURCE_URL:=http://dri.freedesktop.org/libdrm +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=620fe7dd02c3236c3e9881a3a238173d + +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk + +define Package/libdrm + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:= + TITLE:=libdrm + URL:=http://dri.freedesktop.org/ +endef + +CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb + +define Build/Compile + $(call $(PKG_NAME)/Compile) + make -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf +endef + +define Package/libdrm/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Build/InstallDev + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ +endef + +$(eval $(call BuildPackage,libdrm)) diff --git a/Xorg/lib/libfakekey/Makefile b/Xorg/lib/libfakekey/Makefile new file mode 100644 index 0000000000..f41e333a2b --- /dev/null +++ b/Xorg/lib/libfakekey/Makefile @@ -0,0 +1,59 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libfakekey +PKG_REV:=2111 +PKG_VERSION:=svn$(PKG_REV) +PKG_RELEASE:=1 + +PKG_SOURCE:=libfakekey-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://svn.o-hand.com/repos/matchbox/trunk/libfakekey +PKG_SOURCE_PROTO:=svn +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk + +define Package/libfakekey + SECTION:=xorg-lib + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=libfakekey + MAINTAINER:=Michael Buesch + URL:=http://matchbox-project.org/?p=1 + DEPENDS:=+libX11 +libXtst +endef + +define Package/libfakekey/description + X11 keyboard faking library +endef + +EXTRA_LDFLAGS:=\ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/fakekey $(1)/usr/lib/pkgconfig + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/fakekey/fakekey.h \ + $(1)/usr/include/fakekey/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*{.so,.a}* $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libfakekey.pc \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/libfakekey/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libfakekey)) diff --git a/Xorg/lib/libmatchbox/Makefile b/Xorg/lib/libmatchbox/Makefile new file mode 100644 index 0000000000..1c7d7062c9 --- /dev/null +++ b/Xorg/lib/libmatchbox/Makefile @@ -0,0 +1,65 @@ +# +# Copyright (C) 2007-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libmatchbox +PKG_RELEASE:=2 +PKG_VERSION:=1.9 +PKG_SOURCE_URL:=http://matchbox-project.org/sources/libmatchbox/$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=9f73e7515cc4679171a5db180dc1343b +PKG_FIXUP:=libtool + +EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib/ + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +PKG_INSTALL:=1 + +define Package/libmatchbox + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXft +libpng +libjpeg +libXext +pango +check + TITLE:=libmatchbox + URL:=http://matchbox-project.org +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-pango \ + --enable-jpeg \ + --enable-png \ + --enable-Xft \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/libmb + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/libmb/*.h \ + $(1)/usr/include/libmb/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libmb.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/libmatchbox/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libmb.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libmatchbox)) diff --git a/Xorg/lib/librsvg/Makefile b/Xorg/lib/librsvg/Makefile new file mode 100644 index 0000000000..be0291d900 --- /dev/null +++ b/Xorg/lib/librsvg/Makefile @@ -0,0 +1,86 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=librsvg +PKG_VERSION:=2.22.3 +PKG_RELEASE:=3 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22 +PKG_MD5SUM:=c4ec4fdb2b1842e221ca39127e85682d +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +PKG_INSTALL=1 + +EXTRA_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -L$(ICONV_PREFIX)/lib/ \ + -L$(INTL_PREFIX)/lib/ + +STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_librsvg CONFIG_PACKAGE_librsvg-pixbuf-loader) + +define Package/librsvg + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=SVG rendering library + URL:=http://librsvg.sourceforge.net/ + DEPENDS:=+cairo +libxml2 +glib2 +libcroco +pango +gtk2 +endef + +define Package/librsvg-pixbuf-loader + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=SVG rendering library + URL:=http://librsvg.sourceforge.net/ + DEPENDS:=librsvg +endef + +define Package/librsvg/description +librsvg is a high performance SVG rendering library associated with the Gnome Project. +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --disable-gtk-theme \ + --disable-mozilla-plugin \ + --with-croco \ + $(if $(CONFIG_PACKAGE_librsvg-pixbuf-loader), \ + --enable-pixbuf-loader,\ + --disable-pixbuf-loader \ + ) \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ + $(INSTALL_DIR) $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ +endef + +define Package/librsvg/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ +endef + +define Package/librsvg-pixbuf-loader/install + $(INSTALL_DIR) $(1)/usr/lib/gtk-2.0/2.10.0/loaders + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/gtk-2.0/2.10.0/loaders/*.so* \ + $(1)/usr/lib/gtk-2.0/2.10.0/loaders +endef + +$(eval $(call BuildPackage,librsvg)) +$(eval $(call BuildPackage,librsvg-pixbuf-loader)) diff --git a/Xorg/lib/libxcb/Makefile b/Xorg/lib/libxcb/Makefile new file mode 100644 index 0000000000..6698b7af40 --- /dev/null +++ b/Xorg/lib/libxcb/Makefile @@ -0,0 +1,102 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libxcb +PKG_VERSION:=1.1 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://xcb.freedesktop.org/dist/ +PKG_MD5SUM:=9310b02433273d75d42f10da3c7455aa +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xcbproto libpthread-stubs + +include $(INCLUDE_DIR)/package.mk + +PROTOS:=composite damage dpms glx randr record render res screensaver shape \ + shm sync xevie xf86dri xfixes xinerama xprint xtest xvmc xv + +define Package/libxcb + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=libxcb + DEPENDS:=+libXau +libXdmcp + URL:=http://xcb.freedesktop.org/ +endef + +define Package/libxcb/description +libxcb provides an interface to the X Window System protocol, which +replaces the current Xlib interface. +endef + +define Package/libxcb-xlib + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=libxcb-xlib + DEPENDS:=+libxcb +endef + +define Package/libxcb-proto/Default +define Package/libxcb-$(1) + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=libxcb-$(1) + DEPENDS:=+libxcb +endef +endef + +$(foreach proto,$(PROTOS),$(eval $(call Package/libxcb-proto/Default,$(proto)))) + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/xcb} + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/xcb/* \ + $(1)/usr/include/xcb/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/libxcb/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libxcb.so* \ + $(1)/usr/lib/ +endef + +define Package/libxcb-xlib/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libxcb-xlib.so* \ + $(1)/usr/lib/ +endef + +define Package/libxcb-proto/install/Default +define Package/libxcb-$(1)/install + $(INSTALL_DIR) $$(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libxcb-$(1).so* \ + $$(1)/usr/lib/ +endef +endef + +$(foreach proto,$(PROTOS),$(eval $(call Package/libxcb-proto/install/Default,$(proto)))) + +$(eval $(call BuildPackage,libxcb)) +$(eval $(call BuildPackage,libxcb-xlib)) +$(foreach proto,$(PROTOS),$(eval $(call BuildPackage,libxcb-$(proto)))) diff --git a/Xorg/lib/mesa/Makefile b/Xorg/lib/mesa/Makefile new file mode 100644 index 0000000000..57db41d58f --- /dev/null +++ b/Xorg/lib/mesa/Makefile @@ -0,0 +1,112 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=Mesa +PKG_RELEASE:=2 +PKG_VERSION:=7.2 + +PKG_SOURCE_URL:=@SF/mesa3d +PKG_SOURCE:=$(PKG_NAME)Lib-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=04d379292e023df0b0266825cb0dbde5 +PKG_FIXUP:=libtool +PKG_BUILD_DEPENDS:=glproto + +include $(INCLUDE_DIR)/package.mk + +PKG_INSTALL:=1 + +define Package/libgl-mesa + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXext +libXfixes +libXdamage +libXxf86vm +libdrm +libexpat + TITLE:=Mesa OpenGL library + URL:=http://mesa3d.org +endef + +define Package/libglu-mesa + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libgl-mesa + TITLE:=Mesa OpenGL utility library + URL:=http://mesa3d.org +endef + +define Package/libgl-mesa-dri/Default +define Package/libgl-mesa-dri-$(1) + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=libgl-mesa @DISPLAY_SUPPORT $(if $(findstring swrast,$(1)),,@TARGET_x86) + TITLE:=mesa dri $(1) + URL:=http://mesa3d.org +endef +endef + +DRIDRIVERS:=i810 i915 i965 mach64 mga r128 r200 r300 radeon s3v \ + savage sis tdfx trident unichrome ffb swrast + +$(foreach dri,$(DRIDRIVERS),$(eval $(call Package/libgl-mesa-dri/Default,$(dri)))) + +STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_libgl-mesa \ + CONFIG_PACKAGE_libglu-mesa \ + $(foreach dri,$(DRIDRIVERS),CONFIG_PACKAGE_libgl-mesa-dri-$(dri))) + +define Build/Configure + $(call Build/Configure/Default, \ + --disable-glw \ + --with-driver=dri \ + --with-dri-drivers="$(foreach dri,$(DRIDRIVERS),$(if $(CONFIG_PACKAGE_libgl-mesa-dri-$(dri)),$(dri)))" \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{include/GL,lib/pkgconfig} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/GL/* \ + $(1)/usr/include/GL + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig +endef + +define Package/libgl-mesa/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libGL.so* \ + $(1)/usr/lib/ +endef + +define Package/libglu-mesa/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libGLU.so* \ + $(1)/usr/lib/ +endef + +define Package/libgl-mesa-dri/install/Default +define Package/libgl-mesa-dri-$(1)/install + $(INSTALL_DIR) $$(1)/usr/lib/dri/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/dri/$(1)_dri.so* \ + $$(1)/usr/lib/dri +endef +endef + +$(foreach dri,$(DRIDRIVERS),$(eval $(call Package/libgl-mesa-dri/install/Default,$(dri)))) + +$(eval $(call BuildPackage,libgl-mesa)) +$(eval $(call BuildPackage,libglu-mesa)) +$(foreach dri,$(DRIDRIVERS),$(eval $(call BuildPackage,libgl-mesa-dri-$(dri)))) diff --git a/Xorg/lib/mesa/patches/010-fix-pkgconfig-files.patch b/Xorg/lib/mesa/patches/010-fix-pkgconfig-files.patch new file mode 100644 index 0000000000..9fe4116f40 --- /dev/null +++ b/Xorg/lib/mesa/patches/010-fix-pkgconfig-files.patch @@ -0,0 +1,90 @@ +Index: Mesa-7.2/src/glu/glu.pc.in +=================================================================== +--- Mesa-7.2.orig/src/glu/glu.pc.in 2008-08-25 16:46:42.000000000 +0200 ++++ Mesa-7.2/src/glu/glu.pc.in 2011-01-27 19:29:13.220654415 +0100 +@@ -1,7 +1,7 @@ +-prefix=@INSTALL_DIR@ +-exec_prefix=${prefix} +-libdir=@INSTALL_LIB_DIR@ +-includedir=@INSTALL_INC_DIR@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + + Name: glu + Description: Mesa OpenGL Utility library +Index: Mesa-7.2/src/glw/glw.pc.in +=================================================================== +--- Mesa-7.2.orig/src/glw/glw.pc.in 2008-08-25 16:46:42.000000000 +0200 ++++ Mesa-7.2/src/glw/glw.pc.in 2011-01-27 19:29:28.723225782 +0100 +@@ -1,7 +1,7 @@ +-prefix=@INSTALL_DIR@ +-exec_prefix=${prefix} +-libdir=@INSTALL_LIB_DIR@ +-includedir=@INSTALL_INC_DIR@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + + Name: glw + Description: Mesa OpenGL widget library +Index: Mesa-7.2/src/mesa/drivers/dri/dri.pc.in +=================================================================== +--- Mesa-7.2.orig/src/mesa/drivers/dri/dri.pc.in 2008-08-25 16:46:43.000000000 +0200 ++++ Mesa-7.2/src/mesa/drivers/dri/dri.pc.in 2011-01-27 19:29:49.747288575 +0100 +@@ -1,8 +1,8 @@ +-prefix=@INSTALL_DIR@ +-exec_prefix=${prefix} +-libdir=@INSTALL_LIB_DIR@ +-includedir=@INSTALL_INC_DIR@ +-dridriverdir=@DRI_DRIVER_DIR@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++dridriverdir=@DRI_DRIVER_INSTALL_DIR@ + + Name: dri + Description: Direct Rendering Infrastructure +Index: Mesa-7.2/src/mesa/gl.pc.in +=================================================================== +--- Mesa-7.2.orig/src/mesa/gl.pc.in 2008-08-25 16:46:44.000000000 +0200 ++++ Mesa-7.2/src/mesa/gl.pc.in 2011-01-27 19:30:13.700079977 +0100 +@@ -1,7 +1,7 @@ +-prefix=@INSTALL_DIR@ +-exec_prefix=${prefix} +-libdir=@INSTALL_LIB_DIR@ +-includedir=@INSTALL_INC_DIR@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ + + Name: gl + Description: Mesa OpenGL library +Index: Mesa-7.2/configure +=================================================================== +--- Mesa-7.2.orig/configure 2008-09-13 22:45:59.000000000 +0200 ++++ Mesa-7.2/configure 2011-01-27 19:27:08.622125839 +0100 +@@ -8858,7 +8858,7 @@ + LDFLAGS="$_SAVE_LDFLAGS" + CPPFLAGS="$_SAVE_CPPFLAGS" + +-ac_config_files="$ac_config_files configs/autoconf" ++ac_config_files="$ac_config_files configs/autoconf src/glu/glu.pc src/glw/glw.pc src/mesa/drivers/dri/dri.pc src/mesa/gl.pc" + + + ac_config_commands="$ac_config_commands configs" +@@ -9435,6 +9435,10 @@ + for ac_config_target in $ac_config_targets + do + case $ac_config_target in ++ "src/glu/glu.pc") CONFIG_FILES="$CONFIG_FILES src/glu/glu.pc" ;; ++ "src/glw/glw.pc") CONFIG_FILES="$CONFIG_FILES src/glw/glw.pc" ;; ++ "src/mesa/drivers/dri/dri.pc") CONFIG_FILES="$CONFIG_FILES src/mesa/drivers/dri/dri.pc" ;; ++ "src/mesa/gl.pc") CONFIG_FILES="$CONFIG_FILES src/mesa/gl.pc" ;; + "configs/autoconf") CONFIG_FILES="$CONFIG_FILES configs/autoconf" ;; + "configs") CONFIG_COMMANDS="$CONFIG_COMMANDS configs" ;; + diff --git a/Xorg/lib/packages b/Xorg/lib/packages new file mode 100644 index 0000000000..031006832a --- /dev/null +++ b/Xorg/lib/packages @@ -0,0 +1,23 @@ +libfontenc-1.0.4|+xproto+zlib +libICE-1.0.4|+xproto+xtrans +libSM-1.0.3|+xproto+xtrans+libICE +_libX11-1.1.5|+bigreqsproto+xproto+xextproto+xtrans+xcmiscproto+libXdmcp+xf86bigfontproto+kbproto+inputproto+libXau +libXau-1.0.4|+xproto +libXaw-1.0.4|+xproto+libX11+libXext+xextproto+libXt+libXmu+libXpm+printproto+libXau +libXcursor-1.1.9|+libXrender+libXfixes +libXdmcp-1.0.2|+xproto +libXext-1.0.4|+xproto+xextproto+libX11+libXau +libXfixes-4.0.3|+xproto+fixesproto+xextproto+libX11 +libXfont-1.3.3|+zlib+xproto+xtrans+libfontenc+fontcacheproto+fontsproto+libfreetype +libxkbfile-1.0.5|+libX11+kbproto +libXmu-1.0.4|+libXt+libXext+xextproto +libXpm-3.5.7|+xproto+libX11 +libXrandr-1.2.3|+libXext+libXrender+randrproto+renderproto+xextproto+libX11 +libXrender-0.9.4|+libX11+renderproto +libXt-1.0.5|+libSM+libX11+xproto+kbproto +libXtst-1.0.3|+libX11+libXext+recordproto+xextproto+inputproto +libXv-1.0.4|+libXext+videoproto +libXvMC-1.0.4|+libXext+videoproto+libXv +libXxf86misc-1.0.1|+xproto+libX11+xextproto+libXext+xf86miscproto +libXxf86vm-1.0.2|+xproto+libX11+xextproto+libXext+xf86vidmodeproto +xtrans-1.2.1| diff --git a/Xorg/lib/pango/Makefile b/Xorg/lib/pango/Makefile new file mode 100644 index 0000000000..693b47ecb6 --- /dev/null +++ b/Xorg/lib/pango/Makefile @@ -0,0 +1,100 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=pango +PKG_VERSION:=1.28.4 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/1.28/ +PKG_MD5SUM:=3f3989700f04e9117d30544a9078b3a0 + +PKG_FIXUP:=autoreconf +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=0 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/pango + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Text layout and rendering library + DEPENDS:=+cairo +glib2 +fontconfig +libfreetype \ + +FEATURE_drawing-backend_libX11:libX11 \ + +FEATURE_drawing-backend_libX11:libXft + URL:=http://www.pango.org/ +endef + +define Package/pango/description +Pango is a library for layout and rendering of text, with an emphasis +on internationalization. Pango can be used anywhere that text layout +is needed; however, most of the work on Pango so far has been done using +the GTK+ widget toolkit as a test platform. Pango forms the core of text +and font handling for GTK+-2.x. +endef + +CONFIGURE_ARGS += \ + $(if $(CONFIG_PACKAGE_libX11), --with-x, --without-x) + +CONFIGURE_VARS += \ + CXX="$(TARGET_CC)" + +define Build/InstallDev + $(INSTALL_DIR) \ + $(1)/usr/lib/pkgconfig \ + $(1)/usr/lib/pango/1.6.0/modules \ + $(1)/usr/include + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.so* \ + $(1)/usr/lib/pango/1.6.0/modules/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ + $(1)/usr/lib/pkgconfig + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ +endef + +define Package/pango/install + $(INSTALL_DIR) \ + $(1)/usr/lib/pango/1.6.0/modules \ + $(1)/usr/bin \ + $(1)/etc/init.d + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/pango/1.6.0/modules/*.so* \ + $(1)/usr/lib/pango/1.6.0/modules/ + + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/pango-querymodules \ + $(1)/usr/bin/ + + $(INSTALL_BIN) \ + ./files/pango-querymodules.init \ + $(1)/etc/init.d/pango-querymodules +endef + +$(eval $(call BuildPackage,pango)) diff --git a/Xorg/lib/pango/files/pango-querymodules.init b/Xorg/lib/pango/files/pango-querymodules.init new file mode 100755 index 0000000000..f7f56e5ca4 --- /dev/null +++ b/Xorg/lib/pango/files/pango-querymodules.init @@ -0,0 +1,12 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2007 OpenWrt.org + +START=99 +FILE=/etc/pango/pango.modules + +start() { + if [ ! -e ${FILE} ]; then + mkdir -p $(dirname ${FILE}) + pango-querymodules > ${FILE} + fi +} diff --git a/Xorg/lib/pangomm/Makefile b/Xorg/lib/pangomm/Makefile new file mode 100644 index 0000000000..40ed5d6c68 --- /dev/null +++ b/Xorg/lib/pangomm/Makefile @@ -0,0 +1,70 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=pangomm +PKG_VERSION:=2.26.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.26/ +PKG_MD5SUM:=37f54dc8e6cb73ed923b22f313352156 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +TARGET_LDFLAGS+=\ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/pangomm + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Text layout and rendering library + DEPENDS:=+glibmm +cairomm +pango + URL:=http://www.pango.org/ +endef + +CONFIGURE_ARGS+= --disable-documentation + +define Package/pangomm/description +c++-bindings for pango +endef + +define Build/InstallDev + $(INSTALL_DIR) \ + $(1)/usr/lib/pkgconfig \ + $(1)/usr/lib/pangomm/1.6.0/modules \ + $(1)/usr/include + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/* \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ +endef + +define Package/pangomm/install + $(INSTALL_DIR) \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,pangomm)) diff --git a/Xorg/lib/pixman/Makefile b/Xorg/lib/pixman/Makefile new file mode 100644 index 0000000000..c34e4e2cf1 --- /dev/null +++ b/Xorg/lib/pixman/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=pixman +PKG_RELEASE:=1 +PKG_VERSION:=0.16.2 + +PKG_SOURCE_URL:=http://cairographics.org/releases/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_MD5SUM:=02bd3669f53c404c19980d5efb6f86fb + +PKG_FIXUP:=libtool + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/pixman + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=pixman + URL:=http://cairographics.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --disable-gtk \ + --disable-arm-simd \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1) +endef + +define Package/pixman/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,pixman)) diff --git a/Xorg/lib/qt4/Config.in b/Xorg/lib/qt4/Config.in new file mode 100644 index 0000000000..d33e5d936d --- /dev/null +++ b/Xorg/lib/qt4/Config.in @@ -0,0 +1,21 @@ +if PACKAGE_qt4-gui + +choice + prompt "qt4 window system" + default QT4_WS_QWS + +config QT4_WS_QWS + bool "QWS window system" + depends on FEATURE_drawing-backend_DirectFB + help + Use QT4's internal QWS window system. + +config QT4_WS_X11 + bool "X11 window system" + depends on FEATURE_drawing-backend_libX11 + help + Use X11 + +endchoice + +endif diff --git a/Xorg/lib/qt4/Makefile b/Xorg/lib/qt4/Makefile new file mode 100644 index 0000000000..cf9ca14cd2 --- /dev/null +++ b/Xorg/lib/qt4/Makefile @@ -0,0 +1,785 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +# TODO: +# - test/add xcb support +# - handle plugins in a granular way (find out which packages should provide which plugins) + +include $(TOPDIR)/rules.mk + +PKG_NAME:=qt4 +PKG_VERSION:=4.7.0 +PKG_RELEASE:=1 +PKG_MD5SUM:=3a2f25b9b115037277f4fb759194a7a5 + +PKG_SOURCE:=qt-everywhere-opensource-src-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=ftp://ftp.qt.nokia.com/qt/source +PKG_BUILD_DIR=$(BUILD_DIR)/qt-everywhere-opensource-src-$(PKG_VERSION) +PKG_BUILD_PARALLEL:=1 + +PKG_CONFIG_DEPENDS:= \ + CONFIG_QT4_WS_QWS \ + CONFIG_QT4_WS_X11 \ + CONFIG_PACKAGE_directfb \ + CONFIG_PACKAGE_qt4-demos \ + CONFIG_PACKAGE_qt4-examples \ + CONFIG_PACKAGE_qt4-svg \ + CONFIG_PACKAGE_qt4-qt3support \ + CONFIG_PACKAGE_qt4-dbus \ + CONFIG_PACKAGE_qt4-phonon \ + CONFIG_PACKAGE_qt4-sqlite \ + CONFIG_PACKAGE_qt4-mysql \ + CONFIG_PACKAGE_qt4-webkit \ + CONFIG_PACKAGE_qt4-script \ + CONFIG_PACKAGE_qt4-scriptools \ + CONFIG_PACKAGE_qt4-openssl + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +-include $(if $(DUMP),,./files/qmake.mk) + +# this should be moved to a more generic place later, as other packages are configured different as well depending on available nptl support +ifeq ($(CONFIG_USE_GLIBC),y) + NPTL:=y +endif +ifeq ($(CONFIG_USE_EGLIBC),y) + NPTL:=y +endif +ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y) + NPTL:=y +endif + +define Package/qt4/config + source "$(SOURCE)/Config.in" +endef + +define Package/qt4/Default + SECTION:=xorg-framework + CATEGORY:=Xorg + SUBMENU:=framework + TITLE:=qt4 + DEPENDS:=qt4 + DEFAULT:=m if PACKAGE_qt4-gui && ALL + URL:=http://qt.nokia.com/ +endef + +define Package/qt4 + $(call Package/qt4/Default) + DEPENDS:=+zlib +libstdcpp @!LINUX_2_4 +endef + +define Package/qt4-gui + $(call Package/qt4/Default) + DEFAULT:= + DEPENDS+=+libpng +libtiff +libjpeg +libfreetype +qt4-network \ + +FEATURE_drawing-backend_libX11:libX11 \ + +FEATURE_drawing-backend_libX11:libXext @DISPLAY_SUPPORT + TITLE+=(gui) +endef + +define Package/qt4-demos + $(call Package/qt4/Default) + TITLE+=(demos) + DEPENDS+=+qt4-gui +endef + +define Package/qt4-examples + $(call Package/qt4/Default) + TITLE+=(examples) + DEPENDS+=+qt4-gui +qt4-svg +endef + +define Package/qt4-network + $(call Package/qt4/Default) + TITLE+=(network) +endef + +define Package/qt4-sqlite + $(call Package/qt4/Default) + TITLE+=(sqlite) + DEPENDS+=+libsqlite3 +endef + +define Package/qt4-mysql + $(call Package/qt4/Default) + TITLE+=(mysql) + DEPENDS+=+libmysqlclient +endef + +define Package/qt4-openssl + $(call Package/qt4/Default) + TITLE+=(openssl) + DEPENDS+=+libopenssl +endef + +#define Package/qt4-multimedia +# $(call Package/qt4/Default) +# TITLE+=(multimedia) +#endef + +#define Package/qt4-audio-backend +# $(call Package/qt4/Default) +# TITLE+=(audio-backend) +#endef + +define Package/qt4-phonon + $(call Package/qt4/Default) + TITLE+=(phonon) + DEPENDS+=+qt4-gui +qt4-xml +qt4-dbus +qt4-network +endef + +#define Package/qt4-phonon-backend +# $(call Package/qt4/Default) +# TITLE+=(phonon-backend) +#endef + +define Package/qt4-svg + $(call Package/qt4/Default) + TITLE+=(svg) + DEPENDS+=+qt4-gui +qt4-network +endef + +define Package/qt4-webkit + $(call Package/qt4/Default) + TITLE+=(webkit) + DEPENDS+=@USE_GLIBC||@USE_EGLIBC||@UCLIBC_VERSION_0_9_32 +libsqlite3 +qt4-phonon +qt4-dbus +qt4-xml +qt4-gui +qt4-network # versions of uclibc prior 0.9.32 do not have nptl support +endef + +define Package/qt4-script + $(call Package/qt4/Default) + TITLE+=(script) + DEPENDS+=@USE_GLIBC||@USE_EGLIBC||@UCLIBC_VERSION_0_9_32 # versions of uclibc prior 0.9.32 do not have nptl support +endef + +define Package/qt4-scripttools + $(call Package/qt4/Default) + TITLE+=(scripttools) + DEPENDS+=+qt4-script +qt4-gui +qt4-network +endef + +#define Package/qt4-accessibility +# $(call Package/qt4/Default) +# TITLE+=(accessibility) +#endef + +#define Package/qt4-javascript-jit +# $(call Package/qt4/Default) +# TITLE+=(javascript-jit) +#endef + +#define Package/qt4-cups +# $(call Package/qt4/Default) +# TITLE+=(cups) +#endef + +define Package/qt4-dbus + $(call Package/qt4/Default) + TITLE+=(dbus) + DEPENDS+=+libdbus +qt4-xml +endef + +#define Package/qt4-gtkstyle +# $(call Package/qt4/Default) +# TITLE+=(gtkstyle) +#endef + +#define Package/qt4-glib +# $(call Package/qt4/Default) +# TITLE+=(glib) +#endef + +define Package/qt4-qt3support + $(call Package/qt4/Default) + TITLE+=(qt3support) + DEPENDS+=+qt4-gui +qt4-xml +endef + +define Package/qt4-declarative + $(call Package/qt4/Default) + TITLE+=(declarative) + DEPENDS+=+qt4-script +qt4-xml +qt4-gui +qt4-network +endef + +define Package/qt4-xml + $(call Package/qt4/Default) + TITLE+=(xml) +endef + +### +define Package/qt4-drivers-mouse/Default + $(call Package/qt4/Default) + TITLE+=mousedrivers + DEPENDS+=@QT4_WS_QWS +endef + +define Package/qt4-drivers-mouse-tpmousedriver + $(call Package/qt4-drivers-mouse/Default) + TITLE+=tpmousedriver +endef + +define Package/qt4-drivers-mouse-pcmousedriver + $(call Package/qt4-drivers-mouse/Default) + TITLE+=pcmousedriver +endef + +define Package/qt4-drivers-mouse-tslibmousedriver + $(call Package/qt4-drivers-mouse/Default) + TITLE+=tslibmousedriver + DEPENDS+=+tslib +endef + +### +define Package/qt4-drivers-gfx/Default + $(call Package/qt4/Default) + TITLE+=gfxdrivers + DEPENDS+=@QT4_WS_QWS +endef + +define Package/qt4-drivers-gfx-directfb + $(call Package/qt4-drivers-gfx/Default) + TITLE+=directfb + DEPENDS+=@FEATURE_drawing-backend_DirectFB +FEATURE_drawing-backend_DirectFB:directfb +endef + +define Package/qt4-drivers-gfx-linuxfb + $(call Package/qt4-drivers-gfx/Default) + TITLE+=linuxfb +endef + +define Package/qt4-drivers-gfx-vnc + $(call Package/qt4-drivers-gfx/Default) + TITLE+=VNC +endef + +### +define Package/qt4-drivers-kbd/Default + $(call Package/qt4/Default) + TITLE+=kbddrivers + DEPENDS+=@QT4_WS_QWS +endef + + +TARGET_INCDIRS+=$(STAGING_DIR)/include $(STAGING_DIR)/usr/include $(TOOLCHAIN_DIR)/include $(TOOLCHAIN_DIR)/usr/include +TARGET_LIBDIRS+=$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib $(TOOLCHAIN_DIR)/lib $(TOOLCHAIN_DIR)/usr/lib +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib,-rpath-link=$(PKG_BUILD_DIR)/lib +TARGET_CFLAGS+=-I$(STAGING_DIR)/usr/include/freetype2 -I$(PKG_BUILD_DIR)/include + +ifeq ($(CONFIG_QT4_WS_QWS),y) + FILEPFX:=qws- +endif +ifeq ($(CONFIG_QT4_WS_X11),y) + FILEPFX:=x11- +endif +ifeq ($(CONFIG_PACKAGE_qt4-gui),) + # If GUI is disabled, we use the X11 prefix. That's good enough, for now. + # The X11 files also work for non-GUI. + FILEPFX:=x11- +endif + +define Build/Configure + # NOTES: + # demos/examples: which demos are going to be built depends on which features are going to to be compiled into qt + # linuxfb/directfb: since directfb is not much overhead compared to plain framebuffer, force using directfb + # do not use fontconfig as it doesn't work anyway for qte + # bindir: bindir is where the host tools (qmake, moc, rcc, uic) will get installed into - they are just used on the host and not goig to be packaged + mkdir -p $(PKG_BUILD_DIR)/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ + $(CP) ./files/$(FILEPFX)qmake.conf $(PKG_BUILD_DIR)/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++/qmake.conf + $(CP) ./files/$(FILEPFX)qplatformdefs.h $(PKG_BUILD_DIR)/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++/qplatformdefs.h + ( cd $(PKG_BUILD_DIR) ; \ + TARGET_CC="$(TARGET_CROSS)gcc" \ + TARGET_CXX="$(TARGET_CROSS)g++" \ + TARGET_AR="$(TARGET_CROSS)ar cqs" \ + TARGET_OBJCOPY="$(TARGET_CROSS)objcopy" \ + TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ + TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ + TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ + TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ + TARGET_INCDIRS="$(TARGET_INCDIRS)" \ + TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \ + STAGING_DIR="$(STAGING_DIR)" \ + STAGING_DIR_HOST="$(STAGING_DIR)/../host" \ + ./configure \ + -arch $(ARCH) \ + -prefix $(CONFIGURE_PREFIX) \ + -bindir $(CONFIGURE_PREFIX)/bin \ + -libdir $(CONFIGURE_PREFIX)/lib \ + -datadir $(CONFIGURE_PREFIX)/share/Qt \ + -plugindir $(CONFIGURE_PREFIX)/lib/Qt/plugins \ + -demosdir $(CONFIGURE_PREFIX)/share/Qt/demos \ + -examplesdir $(CONFIGURE_PREFIX)/share/Qt/examples \ + -sysconfdir /etc/Qt \ + -no-rpath \ + -force-pkg-config \ + -nomake tools \ + $(if $(CONFIG_PACKAGE_qt4-demos),-make,-nomake) demos \ + $(if $(CONFIG_PACKAGE_qt4-examples),-make,-nomake) examples \ + -nomake docs \ + -nomake translations \ + -xplatform $(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ \ + -platform linux-g++ \ + $(if $(CONFIG_QT4_WS_X11),-x11,-embedded) \ + -release \ + -confirm-license \ + -opensource \ + -no-mmx \ + -no-3dnow \ + -no-sse \ + -no-sse2 \ + -system-zlib \ + -system-libtiff \ + -system-libpng \ + -system-libjpeg \ + -system-freetype \ + -system-sqlite \ + $(if $(CONFIG_PACKAGE_qt4-sqlite),-plugin-sql-sqlite) \ + $(if $(CONFIG_PACKAGE_qt4-mysql),-plugin-sql-mysql) \ + -no-decoration-styled \ + -no-decoration-windows \ + -no-decoration-default \ + -verbose \ + -no-multimedia \ + -no-audio-backend \ + $(if $(CONFIG_PACKAGE_qt4-phonon),-phonon,-no-phonon) \ + -no-phonon-backend \ + $(if $(CONFIG_PACKAGE_qt4-svg),-svg,-no-svg) \ + $(if $(CONFIG_PACKAGE_qt4-webkit),-webkit,-no-webkit) \ + -no-javascript-jit \ + $(if $(CONFIG_PACKAGE_qt4-script),-script,-no-script) \ + $(if $(CONFIG_PACKAGE_qt4-scripttools),-scripttools,-no-scripttools) \ + -no-accessibility \ + $(if $(CONFIG_PACKAGE_qt4-declarative),-declarative,-no-declarative) \ + $(if $(CONFIG_PACKAGE_qt4-openssl),-openssl -I $(STAGING_DIR)/usr/include,-no-openssl) \ + -no-nis \ + -no-cups \ + -iconv \ + $(if $(CONFIG_PACKAGE_qt4-dbus),-dbus,-no-dbus) \ + -no-gtkstyle \ + -no-nas-sound \ + -no-opengl \ + -no-openvg \ + -no-sm \ + -no-xshape \ + $(if $(CONFIG_QT4_WS_X11),-no-xsync,-xsync) \ + -no-xinerama \ + $(if $(CONFIG_QT4_WS_X11),-no-xcursor,-xcursor) \ + -no-xfixes \ + -no-xrandr \ + -no-xrender \ + -no-mitshm \ + $(if $(CONFIG_QT4_WS_X11),-no-fontconfig,-fontconfig) \ + $(if $(CONFIG_QT4_WS_X11),-no-xinput,-xinput) \ + $(if $(CONFIG_QT4_WS_X11),-no-xkb,-xkb) \ + -no-glib \ + $(if $(CONFIG_PACKAGE_qt4-qt3support),-qt3support,-no-qt3support) \ + -no-gfx-transformed \ + -no-gfx-qvfb \ + $(if $(CONFIG_PACKAGE_qt4-drivers-gfx-vnc),-plugin-gfx-vnc,-no-gfx-vnc) \ + -no-gfx-multiscreen \ + -no-gfx-qnx \ + $(if $(CONFIG_PACKAGE_directfb),-plugin-gfx-directfb) \ + -plugin-gfx-linuxfb \ + -no-mouse-qvfb \ + -no-mouse-qnx \ + -qt-mouse-linuxinput \ + -plugin-mouse-linuxtp \ + -plugin-mouse-pc \ + -plugin-mouse-tslib \ + -no-kbd-qvfb \ + -no-kbd-qnx \ + -qt-kbd-tty \ + -qt-kbd-linuxinput \ + ) +endef + +define Build/Compile + # just passing results in not building 3rdparty/webkit/JavaScriptCore + # unfortunately in this particular case, makes further calls, therewith + # uses the qmake.conf which needs get the cross-compiling vars passed once again + TARGET_CC="$(TARGET_CROSS)gcc" \ + TARGET_CXX="$(TARGET_CROSS)g++" \ + TARGET_AR="$(TARGET_CROSS)ar cqs" \ + TARGET_OBJCOPY="$(TARGET_CROSS)objcopy" \ + TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ + TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ + TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ + TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ + TARGET_INCDIRS="$(TARGET_INCDIRS)" \ + TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \ + STAGING_DIR="$(STAGING_DIR)" \ + STAGING_DIR_HOST="$(STAGING_DIR)/../host" \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) + INSTALL_ROOT=$(PKG_INSTALL_DIR) \ + $(MAKE) -C $(PKG_BUILD_DIR) install +endef + +define Build/InstallDev + $(INSTALL_DIR) \ + $(STAGING_DIR_HOST)/bin + + # host tools (qmake, moc, rcc, uic) + $(CP) \ + $(PKG_INSTALL_DIR)/usr/bin/{qmake,moc,rcc,uic} \ + $(STAGING_DIR_HOST)/bin/ + + $(INSTALL_DIR) \ + $(1)/mk \ + $(1)/usr/share/mkspecs \ + $(1)/usr/lib/pkgconfig \ + $(1)/usr/lib \ + $(1)/usr/include \ + $(1)/usr/lib/Qt/plugins + + $(CP) \ + ./files/qmake.mk \ + $(1)/mk/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/Qt/mkspecs/* \ + $(1)/usr/share/mkspecs/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/* \ + # $(1)/usr/lib/Qt/plugins/ +endef + +define Package/qt4/install + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/lib/Qt/plugins + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtCore.so* \ + $(1)/usr/lib/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/codecs/*.so \ + # $(1)/usr/lib/Qt/plugins/codecs/ +endef + +define Package/qt4-gui/install + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/lib/Qt/plugins + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtGui.so* \ + $(1)/usr/lib/ + + #HACK: Qt4 requires having truetype fonts stored in /usr/lib/fonts - no subdirectories allowed, so use the dejavue set by default + ln -s \ + /usr/share/fonts/ttf-dejavu \ + $(1)/usr/lib/fonts + + # we use the dejavue font package instead + #$(INSTALL_DATA) \ + # $(PKG_INSTALL_DIR)/usr/lib/fonts/*.ttf \ + # $(1)/usr/lib/fonts/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/accessible \ + # $(1)/usr/lib/Qt/plugins/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/imageformats \ + # $(1)/usr/lib/Qt/plugins/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/inputmethods \ + # $(1)/usr/lib/Qt/plugins/ +endef + +define Package/qt4-demos/install + $(INSTALL_DIR) \ + $(1)/usr/share/Qt + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/Qt/demos \ + $(1)/usr/share/Qt/ + + $(FIND) \ + $(1) \ + -name "*.cpp" -o \ + -name "*.h" -o \ + -name "*.pro" \ + | $(XARGS) rm +endef + +define Package/qt4-examples/install + $(INSTALL_DIR) \ + $(1)/usr/share/Qt + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/Qt/examples \ + $(1)/usr/share/Qt/ + + $(FIND) \ + $(1) \ + -name "*.cpp" -o \ + -name "*.h" -o \ + -name "*.pro" \ + | $(XARGS) rm +endef + +define Package/qt4-network/install + $(INSTALL_DIR) \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtNetwork.so* \ + $(1)/usr/lib/ +endef + +define Package/qt4-sqlite/install + $(INSTALL_DIR) \ + $(1)/usr/lib/Qt/plugins/sqldrivers + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtSql.so* \ + $(1)/usr/lib/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/sqldrivers/libqsqlite.so \ + $(1)/usr/lib/Qt/plugins/sqldrivers/ +endef + +define Package/qt4-mysql/install + $(INSTALL_DIR) \ + $(1)/usr/lib/Qt/plugins/sqldrivers + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtSql.so* \ + $(1)/usr/lib/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/sqldrivers/libqsqlmysql.so \ + $(1)/usr/lib/Qt/plugins/sqldrivers/ +endef + +#define Package/qt4-multimedia/install +# $(INSTALL_DIR) \ +# $(1)/usr/bin +# +# $(CP) \ +# $(PKG_INSTALL_DIR)/usr/bin/examples/* \ +# $(1)/usr/bin/ +#endef + +define Package/qt4-phonon/install + $(INSTALL_DIR) \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libphonon.so* \ + $(1)/usr/lib/ +endef + +define Package/qt4-svg/install + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/lib/Qt/plugins + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtSvg.so* \ + $(1)/usr/lib/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/iconengines \ + # $(1)/usr/lib/Qt/plugins/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/imageformats \ + # $(1)/usr/lib/Qt/plugins/ +endef + +define Package/qt4-webkit/install + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/lib/Qt/plugins + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtWebKit.so* \ + $(1)/usr/lib/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/designer \ + # $(1)/usr/lib/Qt/plugins/ +endef + +define Package/qt4-script/install + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/lib/Qt/plugins + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtScript.so* \ + $(1)/usr/lib/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/script \ + # $(1)/usr/lib/Qt/plugins/ +endef + +define Package/qt4-scripttools/install + $(INSTALL_DIR) \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtScriptTools.so* \ + $(1)/usr/lib/ +endef + +define Package/qt4-dbus/install + $(INSTALL_DIR) \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtDBus.so* \ + $(1)/usr/lib/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/bin/qdbus \ + # $(1)/usr/bin/ +endef + +define Package/qt4-qt3-support/install + $(INSTALL_DIR) \ + $(1)/usr/lib \ + $(1)/usr/lib/Qt/plugins + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQt3Support.so* \ + $(1)/usr/lib/ + + #$(CP) \ + # $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/accessible \ + # $(1)/usr/lib/Qt/plugins/ +endef + +define Package/qt4-declarative/install + $(INSTALL_DIR) \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtDeclarative.so* \ + $(1)/usr/lib/ +endef + +define Package/qt4-xml/install + $(INSTALL_DIR) \ + $(1)/usr/lib + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libQtXml.so* \ + $(1)/usr/lib/ +endef + +# plugins +# mouse drivers +define Package/qt4-drivers-mouse-tpmousedriver/install + $(INSTALL_DIR) \ + $(1)/usr/lib/Qt/plugins/mousedrivers + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/mousedrivers/libqlinuxtpmousedriver.so \ + $(1)/usr/lib/Qt/plugins/mousedrivers/ +endef + +define Package/qt4-drivers-mouse-pcmousedriver/install + $(INSTALL_DIR) \ + $(1)/usr/lib/Qt/plugins/mousedrivers + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/mousedrivers/libqpcmousedriver.so \ + $(1)/usr/lib/Qt/plugins/mousedrivers/ +endef + +define Package/qt4-drivers-mouse-tslibmousedriver/install + $(INSTALL_DIR) \ + $(1)/usr/lib/Qt/plugins/mousedrivers + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/mousedrivers/libqtslibmousedriver.so \ + $(1)/usr/lib/Qt/plugins/mousedrivers/ +endef + +# graphics drivers +define Package/qt4-drivers-gfx-directfb/install + $(INSTALL_DIR) \ + $(1)/usr/lib/Qt/plugins/gfxdrivers + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/gfxdrivers/libqdirectfbscreen.so \ + $(1)/usr/lib/Qt/plugins/gfxdrivers/ +endef + +define Package/qt4-drivers-gfx-linuxfb/install + $(INSTALL_DIR) \ + $(1)/usr/lib/Qt/plugins/gfxdrivers + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/gfxdrivers/libqscreenlinuxfb.so \ + $(1)/usr/lib/Qt/plugins/gfxdrivers/ +endef + +define Package/qt4-drivers-gfx-vnc/install + $(INSTALL_DIR) \ + $(1)/usr/lib/Qt/plugins/gfxdrivers + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/Qt/plugins/gfxdrivers/libqgfxvnc.so \ + $(1)/usr/lib/Qt/plugins/gfxdrivers/ +endef + +# keyboard drivers + + + +$(eval $(call BuildPackage,qt4)) +$(eval $(call BuildPackage,qt4-gui)) +$(eval $(call BuildPackage,qt4-demos)) +$(eval $(call BuildPackage,qt4-examples)) +$(eval $(call BuildPackage,qt4-network)) +$(eval $(call BuildPackage,qt4-sqlite)) +$(eval $(call BuildPackage,qt4-mysql)) +$(eval $(call BuildPackage,qt4-openssl)) +#$(eval $(call BuildPackage,qt4-multimedia)) +#$(eval $(call BuildPackage,qt4-audio-backend)) +$(eval $(call BuildPackage,qt4-phonon)) +#$(eval $(call BuildPackage,qt4-phonon-backend)) +$(eval $(call BuildPackage,qt4-svg)) +$(eval $(call BuildPackage,qt4-webkit)) +$(eval $(call BuildPackage,qt4-script)) +$(eval $(call BuildPackage,qt4-scripttools)) +#$(eval $(call BuildPackage,qt4-accessibility)) +#$(eval $(call BuildPackage,qt4-javascript-jit)) +#$(eval $(call BuildPackage,qt4-cups)) +$(eval $(call BuildPackage,qt4-dbus)) +#$(eval $(call BuildPackage,qt4-gtkstyle)) +#$(eval $(call BuildPackage,qt4-glib)) +$(eval $(call BuildPackage,qt4-qt3support)) +$(eval $(call BuildPackage,qt4-declarative)) +$(eval $(call BuildPackage,qt4-xml)) + +$(eval $(call BuildPackage,qt4-drivers-mouse-tpmousedriver)) +$(eval $(call BuildPackage,qt4-drivers-mouse-pcmousedriver)) +$(eval $(call BuildPackage,qt4-drivers-mouse-tslibmousedriver)) + +$(eval $(call BuildPackage,qt4-drivers-gfx-directfb)) +$(eval $(call BuildPackage,qt4-drivers-gfx-linuxfb)) +$(eval $(call BuildPackage,qt4-drivers-gfx-vnc)) diff --git a/Xorg/lib/qt4/files/qmake.mk b/Xorg/lib/qt4/files/qmake.mk new file mode 100644 index 0000000000..341500869f --- /dev/null +++ b/Xorg/lib/qt4/files/qmake.mk @@ -0,0 +1,60 @@ +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +QMAKE_PLATFORM_PREFIX:=$(if $(CONFIG_QT4_WS_QWS),qws/) +QMAKE_SPECFILE:=$(STAGING_DIR)/usr/share/mkspecs/$(QMAKE_PLATFORM_PREFIX)linux-openwrt-g++ + +TARGET_INCDIRS +=\ + $(TOOLCHAIN_DIR)/include \ + $(STAGING_DIR)/include \ + $(TOOLCHAIN_DIR)/usr/include \ + $(STAGING_DIR)/usr/include + +TARGET_LIBDIRS += \ + $(TOOLCHAIN_DIR)/lib \ + $(STAGING_DIR)/lib \ + $(TOOLCHAIN_DIR)/usr/lib \ + $(STAGING_DIR)/usr/lib + +define Build/Configure/Qmake + TARGET_CC="$(TARGET_CROSS)gcc" \ + TARGET_CXX="$(TARGET_CROSS)g++" \ + TARGET_AR="$(TARGET_CROSS)ar cqs" \ + TARGET_OBJCOPY="$(TARGET_CROSS)objcopy" \ + TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ + TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ + TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ + TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ + TARGET_INCDIRS="$(TARGET_INCDIRS)" \ + TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \ + TARGET_LIBS="$(TARGET_LIBS)" \ + STAGING_DIR_HOST="$(STAGING_DIR)/../host" \ + STAGING_DIR="$(STAGING_DIR)" \ + qmake \ + -spec $(QMAKE_SPECFILE) \ + -o $(PKG_BUILD_DIR)/$(2)/Makefile \ + $(PKG_BUILD_DIR)/$(2)/$(1).pro +endef + +# we need to pass everything to $(MAKE) as well, as Makefiles may invoke qmake once again for creating further Makefiles +define Build/Compile/Default + TARGET_CC="$(TARGET_CROSS)gcc" \ + TARGET_CXX="$(TARGET_CROSS)g++" \ + TARGET_AR="$(TARGET_CROSS)ar cqs" \ + TARGET_OBJCOPY="$(TARGET_CROSS)objcopy" \ + TARGET_RANLIB="$(TARGET_CROSS)ranlib" \ + TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ + TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)" \ + TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)" \ + TARGET_INCDIRS="$(TARGET_INCDIRS)" \ + TARGET_LIBDIRS="$(TARGET_LIBDIRS)" \ + TARGET_LIBS="$(TARGET_LIBS)" \ + STAGING_DIR_HOST="$(STAGING_DIR)/../host" \ + STAGING_DIR="$(STAGING_DIR)" \ + $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR)/$(MAKE_PATH) \ + $(1); +endef diff --git a/Xorg/lib/qt4/files/qws-qmake.conf b/Xorg/lib/qt4/files/qws-qmake.conf new file mode 100644 index 0000000000..5e317dcd70 --- /dev/null +++ b/Xorg/lib/qt4/files/qws-qmake.conf @@ -0,0 +1,45 @@ +include(../../common/g++.conf) +include(../../common/linux.conf) +include(../../common/qws.conf) + +# QMAKE_{INC,LIB}DIR_QT needs to be overridden, +# as they're set to $$[QT_INSTALL_{HEADERS,LIBS}] by default +# which are compiled into the qmake binary statically +QMAKE_INCDIR_QT = $$(TARGET_INCDIRS) +QMAKE_LIBDIR_QT = $$(TARGET_LIBDIRS) +QMAKE_INCDIR = $$(TARGET_INCDIRS) +QMAKE_LIBDIR = $$(TARGET_LIBDIRS) +QMAKE_MOC = $$(STAGING_DIR_HOST)/bin/moc +QMAKE_UIC = $$(STAGING_DIR_HOST)/bin/uic +QMAKE_RCC = $$(STAGING_DIR_HOST)/bin/rcc +QMAKE_CC = $$(TARGET_CC) +QMAKE_CXX = $$(TARGET_CXX) +QMAKE_AR = $$(TARGET_AR) +QMAKE_OBJCOPY = $$(TARGET_OBJCOPY) +QMAKE_RANLIB = $$(TARGET_RANLIB) +QMAKE_CFLAGS = $$(TARGET_CFLAGS) +QMAKE_CXXFLAGS = $$(TARGET_CFLAGS) +QMAKE_LINK = $$(TARGET_CXX) +QMAKE_LINK_C = $$(TARGET_CC) +QMAKE_LIBS = $$(TARGET_LIBS) +QMAKE_LFLAGS = $$(TARGET_LDFLAGS) # this will end up in redundant "-L"-strings, as they're already in $QMAKE_LIBDIR_QT, however TARGET_LDFLAGS may contain not only directories but special linker options + +#unset vars which would intefere with vars/flags passed over by OpenWrt +QMAKE_STRIP = # do not strip +QMAKE_STRIPFLAGS_LIB = # do not strip +QMAKE_CFLAGS_WARN_ON = +QMAKE_CFLAGS_WARN_OFF = +QMAKE_CFLAGS_RELEASE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CFLAGS_PRECOMPILE = +QMAKE_CFLAGS_USE_PRECOMPILE = +QMAKE_CXXFLAGS_WARN_ON = +QMAKE_CXXFLAGS_WARN_OFF = +QMAKE_CXXFLAGS_RELEASE = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CXXFLAGS_PRECOMPILE = +QMAKE_CXXFLAGS_USE_PRECOMPILE = +QMAKE_LFLAGS_RELEASE = +QMAKE_LFLAGS_NOUNDEF = + +load(qt_config) diff --git a/Xorg/lib/qt4/files/qws-qplatformdefs.h b/Xorg/lib/qt4/files/qws-qplatformdefs.h new file mode 100644 index 0000000000..99e9a27923 --- /dev/null +++ b/Xorg/lib/qt4/files/qws-qplatformdefs.h @@ -0,0 +1 @@ +#include "../../linux-g++/qplatformdefs.h" diff --git a/Xorg/lib/qt4/files/x11-qmake.conf b/Xorg/lib/qt4/files/x11-qmake.conf new file mode 100644 index 0000000000..b5a49c5f8b --- /dev/null +++ b/Xorg/lib/qt4/files/x11-qmake.conf @@ -0,0 +1,50 @@ +MAKEFILE_GENERATOR = UNIX +TARGET_PLATFORM = unix +CONFIG += qt warn_on release incremental link_prl +QT += core gui +QMAKE_INCREMENTAL_STYLE = sublib + +include(../common/g++.conf) +include(../common/linux.conf) + +# QMAKE_{INC,LIB}DIR_QT needs to be overridden, +# as they're set to $$[QT_INSTALL_{HEADERS,LIBS}] by default +# which are compiled into the qmake binary statically +QMAKE_INCDIR_QT = $$(TARGET_INCDIRS) +QMAKE_LIBDIR_QT = $$(TARGET_LIBDIRS) +QMAKE_INCDIR = $$(TARGET_INCDIRS) +QMAKE_LIBDIR = $$(TARGET_LIBDIRS) +QMAKE_MOC = $$(STAGING_DIR_HOST)/bin/moc +QMAKE_UIC = $$(STAGING_DIR_HOST)/bin/uic +QMAKE_RCC = $$(STAGING_DIR_HOST)/bin/rcc +QMAKE_CC = $$(TARGET_CC) +QMAKE_CXX = $$(TARGET_CXX) +QMAKE_AR = $$(TARGET_AR) +QMAKE_OBJCOPY = $$(TARGET_OBJCOPY) +QMAKE_RANLIB = $$(TARGET_RANLIB) +QMAKE_CFLAGS = $$(TARGET_CFLAGS) +QMAKE_CXXFLAGS = $$(TARGET_CFLAGS) +QMAKE_LINK = $$(TARGET_CXX) +QMAKE_LINK_C = $$(TARGET_CC) +QMAKE_LIBS = $$(TARGET_LIBS) +QMAKE_LFLAGS = $$(TARGET_LDFLAGS) # this will end up in redundant "-L"-strings, as they're already in $QMAKE_LIBDIR_QT, however TARGET_LDFLAGS may contain not only directories but special linker options + +#unset vars which would intefere with vars/flags passed over by OpenWrt +QMAKE_STRIP = # do not strip +QMAKE_STRIPFLAGS_LIB = # do not strip +QMAKE_CFLAGS_WARN_ON = +QMAKE_CFLAGS_WARN_OFF = +QMAKE_CFLAGS_RELEASE = +QMAKE_CFLAGS_DEBUG = +QMAKE_CFLAGS_PRECOMPILE = +QMAKE_CFLAGS_USE_PRECOMPILE = +QMAKE_CXXFLAGS_WARN_ON = +QMAKE_CXXFLAGS_WARN_OFF = +QMAKE_CXXFLAGS_RELEASE = +QMAKE_CXXFLAGS_DEBUG = +QMAKE_CXXFLAGS_PRECOMPILE = +QMAKE_CXXFLAGS_USE_PRECOMPILE = +QMAKE_LFLAGS_RELEASE = +QMAKE_LFLAGS_NOUNDEF = + +load(qt_config) diff --git a/Xorg/lib/qt4/files/x11-qplatformdefs.h b/Xorg/lib/qt4/files/x11-qplatformdefs.h new file mode 100644 index 0000000000..5d22fb4101 --- /dev/null +++ b/Xorg/lib/qt4/files/x11-qplatformdefs.h @@ -0,0 +1 @@ +#include "../linux-g++/qplatformdefs.h" diff --git a/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch b/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch new file mode 100644 index 0000000000..0b2d0ef3b6 --- /dev/null +++ b/Xorg/lib/qt4/patches/100-do_not_use_res.defdname.patch @@ -0,0 +1,35 @@ +--- qt-everywhere-opensource-src-4.7.0-beta1/src/network/kernel/qhostinfo_unix.cpp 2010-05-04 02:43:25.000000000 +0200 ++++ qt-everywhere-opensource-src-4.7.0-beta1/src/network/kernel/qhostinfo_unix.cpp.new 2010-06-20 14:43:48.565315801 +0200 +@@ -326,7 +326,7 @@ + + QString QHostInfo::localDomainName() + { +-#if !defined(Q_OS_VXWORKS) ++#if 0 + resolveLibrary(); + if (local_res_ninit) { + // using thread-safe version +--- qt-everywhere-opensource-src-4.7.0-beta1/src/qt3support/network/q3dns.cpp 2010-05-04 02:43:25.000000000 +0200 ++++ qt-everywhere-opensource-src-4.7.0-beta1/src/qt3support/network/q3dns.cpp.new 2010-06-20 14:43:48.565315801 +0200 +@@ -2499,8 +2499,8 @@ + break; + } + # endif +- if ( *res.defdname ) +- theDomains->append( QString::fromLatin1( res.defdname ).lower().local8Bit() ); ++// if ( *res.defdname ) ++// theDomains->append( QString::fromLatin1( res.defdname ).lower().local8Bit() ); + #else + res_init(); + int i; +@@ -2515,8 +2515,8 @@ + break; + } + # endif +- if ( *_res.defdname ) +- theDomains->append( QString::fromLatin1( _res.defdname ).lower().local8Bit() ); ++// if ( *_res.defdname ) ++// theDomains->append( QString::fromLatin1( _res.defdname ).lower().local8Bit() ); + #endif + + // the code above adds "0.0.0.0" as a name server at the slightest diff --git a/Xorg/lib/qt4/patches/200-depend-on-decoration.patch b/Xorg/lib/qt4/patches/200-depend-on-decoration.patch new file mode 100644 index 0000000000..8e37ca8362 --- /dev/null +++ b/Xorg/lib/qt4/patches/200-depend-on-decoration.patch @@ -0,0 +1,15 @@ +--- qt/examples/qws/qws.pro 2010-02-11 16:55:17.000000000 +0100 ++++ qt/examples/qws/qws.pro.mod 2010-03-22 10:56:10.372868670 +0100 +@@ -1,7 +1,11 @@ + TEMPLATE = subdirs + # no /dev/fbX + !qnx:!vxworks:SUBDIRS = framebuffer +-SUBDIRS += mousecalibration simpledecoration ++SUBDIRS += mousecalibration ++ ++!isEmpty( decorations ) { ++ SUBDIRS += simpledecoration ++} + + # install + sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS README *.pro diff --git a/Xorg/lib/qt4/patches/300-compile-fixes.patch b/Xorg/lib/qt4/patches/300-compile-fixes.patch new file mode 100644 index 0000000000..4282709ac7 --- /dev/null +++ b/Xorg/lib/qt4/patches/300-compile-fixes.patch @@ -0,0 +1,14 @@ +--- + src/corelib/animation/qvariantanimation.h | 1 + + 1 file changed, 1 insertion(+) + +--- qt-everywhere-opensource-src-4.7.0-beta2.orig/src/corelib/animation/qvariantanimation.h ++++ qt-everywhere-opensource-src-4.7.0-beta2/src/corelib/animation/qvariantanimation.h +@@ -117,6 +117,7 @@ private: + }; + + template ++static inline __attribute__((__always_inline__)) + void qRegisterAnimationInterpolator(QVariant (*func)(const T &from, const T &to, qreal progress)) { + QVariantAnimation::registerInterpolator(reinterpret_cast(func), qMetaTypeId()); + } diff --git a/Xorg/lib/qt4/patches/400-do-not-pack-structs.patch b/Xorg/lib/qt4/patches/400-do-not-pack-structs.patch new file mode 100644 index 0000000000..c94cd351de --- /dev/null +++ b/Xorg/lib/qt4/patches/400-do-not-pack-structs.patch @@ -0,0 +1,263 @@ +commit 57ad39ec62175eeea023ca802448ebb1605dca23 +Author: Andreas Kling +Date: Fri Nov 12 16:08:35 2010 +0100 + + Don't pack Harfbuzz structs, this causes unaligned access crashes. + + The memory-greediest structs have been reordered anyway, so the gain + from forcibly packing them is mostly negligible. + + Task-number: QTBUG-13395 + Reviewed-by: Thiago Macieira + +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-buffer.h b/src/3rdparty/harfbuzz/src/harfbuzz-buffer.h +index 0d7c2c2..0d631b2 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-buffer.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-buffer.h +@@ -32,10 +32,6 @@ + + HB_BEGIN_HEADER + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(push, 1) +-#endif +- + typedef struct HB_GlyphItemRec_ { + HB_UInt gindex; + HB_UInt properties; +@@ -93,10 +89,6 @@ hb_buffer_add_glyph( HB_Buffer buffer, + HB_UInt properties, + HB_UInt cluster ); + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(pop) +-#endif +- + HB_END_HEADER + + #endif /* HARFBUZZ_BUFFER_H */ +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gdef-private.h b/src/3rdparty/harfbuzz/src/harfbuzz-gdef-private.h +index 2a6d958..94e9b43 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-gdef-private.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-gdef-private.h +@@ -33,11 +33,6 @@ + + HB_BEGIN_HEADER + +- +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(push, 1) +-#endif +- + /* Attachment related structures */ + + struct HB_AttachPoint_ +@@ -126,10 +121,6 @@ _HB_GDEF_LoadMarkAttachClassDef_From_LookupFlags( HB_GDEFHeader* gdef, + HB_Lookup* lo, + HB_UShort num_lookups ); + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(pop) +-#endif +- + HB_END_HEADER + + #endif /* HARFBUZZ_GDEF_PRIVATE_H */ +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h +index f9a03dd..ccb6bf9 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-gdef.h +@@ -31,10 +31,6 @@ + + HB_BEGIN_HEADER + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(push, 1) +-#endif +- + /* GDEF glyph properties. Note that HB_GDEF_COMPONENT has no corresponding + * flag in the LookupFlag field. */ + #define HB_GDEF_BASE_GLYPH 0x0002 +@@ -131,10 +127,6 @@ HB_Error HB_GDEF_Build_ClassDefinition( HB_GDEFHeader* gdef, + HB_UShort* glyph_array, + HB_UShort* class_array ); + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(pop) +-#endif +- + HB_END_HEADER + + #endif /* HARFBUZZ_GDEF_H */ +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-global.h b/src/3rdparty/harfbuzz/src/harfbuzz-global.h +index bccd6a2..d4e6b46 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-global.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-global.h +@@ -39,10 +39,6 @@ + #define HB_END_HEADER /* nothing */ + #endif + +-#if defined(__GNUC__) || defined(_MSC_VER) +-#define HB_USE_PACKED_STRUCTS +-#endif +- + HB_BEGIN_HEADER + + #ifndef FALSE +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gpos-private.h b/src/3rdparty/harfbuzz/src/harfbuzz-gpos-private.h +index 39f3159..63ba907 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-gpos-private.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-gpos-private.h +@@ -32,10 +32,6 @@ + + HB_BEGIN_HEADER + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(push, 1) +-#endif +- + /* shared tables */ + + #define VR_X_PLACEMENT_DEVICE 0 +@@ -720,10 +716,6 @@ HB_INTERNAL void + _HB_GPOS_Free_SubTable( HB_GPOS_SubTable* st, + HB_UShort lookup_type ); + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(pop) +-#endif +- + HB_END_HEADER + + #endif /* HARFBUZZ_GPOS_PRIVATE_H */ +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gsub-private.h b/src/3rdparty/harfbuzz/src/harfbuzz-gsub-private.h +index 7eb329e..df0c3f6 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-gsub-private.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-gsub-private.h +@@ -32,10 +32,6 @@ + + HB_BEGIN_HEADER + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(push, 1) +-#endif +- + typedef union HB_GSUB_SubTable_ HB_GSUB_SubTable; + + /* LookupType 1 */ +@@ -474,10 +470,6 @@ HB_INTERNAL void + _HB_GSUB_Free_SubTable( HB_GSUB_SubTable* st, + HB_UShort lookup_type ); + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(pop) +-#endif +- + HB_END_HEADER + + #endif /* HARFBUZZ_GSUB_PRIVATE_H */ +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-gsub.h b/src/3rdparty/harfbuzz/src/harfbuzz-gsub.h +index b00df44..6e452bd 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-gsub.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-gsub.h +@@ -31,11 +31,6 @@ + + HB_BEGIN_HEADER + +- +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(push, 1) +-#endif +- + /* Lookup types for glyph substitution */ + + #define HB_GSUB_LOOKUP_SINGLE 1 +@@ -139,10 +134,6 @@ HB_Error HB_GSUB_Register_Alternate_Function( HB_GSUBHeader* gsub, + HB_Error HB_GSUB_Apply_String( HB_GSUBHeader* gsub, + HB_Buffer buffer ); + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(pop) +-#endif +- + HB_END_HEADER + + #endif /* HARFBUZZ_GSUB_H */ +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-open.h b/src/3rdparty/harfbuzz/src/harfbuzz-open.h +index 4ba6cf5..9ad7c98 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-open.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-open.h +@@ -30,10 +30,6 @@ + + HB_BEGIN_HEADER + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(push, 1) +-#endif +- + /* Use this if a feature applies to all glyphs */ + #define HB_ALL_GLYPHS 0xFFFF + +@@ -279,10 +275,6 @@ enum HB_Type_ + + typedef enum HB_Type_ HB_Type; + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(pop) +-#endif +- + HB_END_HEADER + + #endif /* HARFBUZZ_OPEN_H */ +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h +index ab5c07a..470e27b 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h +@@ -34,10 +34,6 @@ + + HB_BEGIN_HEADER + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(push, 1) +-#endif +- + /* + using anything else than signed or unsigned for bitfields in C is non standard, + but accepted by almost all compilers. And it gives a significant reduction in +@@ -258,10 +254,6 @@ typedef struct HB_Font_ { + void *userData; + } HB_FontRec; + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(pop) +-#endif +- + typedef struct HB_ShaperItem_ HB_ShaperItem; + + struct HB_ShaperItem_ { +diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-stream.h b/src/3rdparty/harfbuzz/src/harfbuzz-stream.h +index a155cc2..cfbfb1c 100644 +--- a/src/3rdparty/harfbuzz/src/harfbuzz-stream.h ++++ b/src/3rdparty/harfbuzz/src/harfbuzz-stream.h +@@ -30,10 +30,6 @@ + + HB_BEGIN_HEADER + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(push, 1) +-#endif +- + typedef struct HB_StreamRec_ + { + HB_Byte* base; +@@ -42,10 +38,6 @@ typedef struct HB_StreamRec_ + HB_UInt pos; + } HB_StreamRec; + +-#ifdef HB_USE_PACKED_STRUCTS +-#pragma pack(pop) +-#endif +- + HB_END_HEADER + + #endif diff --git a/Xorg/lib/qt4/patches/500-allow-device-grabbing.patch b/Xorg/lib/qt4/patches/500-allow-device-grabbing.patch new file mode 100644 index 0000000000..50d7aa085b --- /dev/null +++ b/Xorg/lib/qt4/patches/500-allow-device-grabbing.patch @@ -0,0 +1,58 @@ +--- qt-everywhere-opensource-src-4.7.0/src/gui/embedded/qkbdlinuxinput_qws.cpp 2010-09-10 11:05:24.000000000 +0200 ++++ qt-everywhere-opensource-src-4.7.0/src/gui/embedded/qkbdlinuxinput_qws.cpp.mod 2011-04-28 21:57:04.208449828 +0200 +@@ -103,6 +103,7 @@ + QString dev = QLatin1String("/dev/input/event1"); + int repeat_delay = -1; + int repeat_rate = -1; ++ int grab = 0; + + QStringList args = device.split(QLatin1Char(':')); + foreach (const QString &arg, args) { +@@ -110,12 +111,15 @@ + repeat_delay = arg.mid(13).toInt(); + else if (arg.startsWith(QLatin1String("repeat-rate="))) + repeat_rate = arg.mid(12).toInt(); ++ else if (arg.startsWith(QLatin1String("grab="))) ++ grab = arg.mid(5).toInt(); + else if (arg.startsWith(QLatin1String("/dev/"))) + dev = arg; + } + + m_fd = QT_OPEN(dev.toLocal8Bit().constData(), O_RDWR, 0); + if (m_fd >= 0) { ++ ::ioctl(m_fd, EVIOCGRAB, grab); + if (repeat_delay > 0 && repeat_rate > 0) { + int kbdrep[2] = { repeat_delay, repeat_rate }; + ::ioctl(m_fd, EVIOCSREP, kbdrep); +--- qt-everywhere-opensource-src-4.7.0/src/gui/embedded/qmouselinuxinput_qws.cpp 2010-09-10 11:05:24.000000000 +0200 ++++ qt-everywhere-opensource-src-4.7.0/src/gui/embedded/qmouselinuxinput_qws.cpp.mod 2011-04-28 21:57:13.358562410 +0200 +@@ -43,6 +43,7 @@ + + #include + #include ++#include + + #include + #include // overrides QT_OPEN +@@ -101,11 +102,19 @@ + setObjectName(QLatin1String("LinuxInputSubsystem Mouse Handler")); + + QString dev = QLatin1String("/dev/input/event0"); +- if (device.startsWith(QLatin1String("/dev/"))) +- dev = device; ++ int grab = 0; ++ ++ QStringList args = device.split(QLatin1Char(':')); ++ foreach (const QString &arg, args) { ++ if (arg.startsWith(QLatin1String("grab="))) ++ grab = arg.mid(5).toInt(); ++ else if (arg.startsWith(QLatin1String("/dev/"))) ++ dev = arg; ++ } + + m_fd = QT_OPEN(dev.toLocal8Bit().constData(), O_RDONLY | O_NDELAY, 0); + if (m_fd >= 0) { ++ ::ioctl(m_fd, EVIOCGRAB, grab); + m_notify = new QSocketNotifier(m_fd, QSocketNotifier::Read, this); + connect(m_notify, SIGNAL(activated(int)), this, SLOT(readMouseData())); + } else { diff --git a/Xorg/lib/template.mk b/Xorg/lib/template.mk new file mode 100644 index 0000000000..e74a7e6dd7 --- /dev/null +++ b/Xorg/lib/template.mk @@ -0,0 +1,47 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=@BASE_NAME@ +PKG_NAME:=@NAME@ +PKG_RELEASE:=2 +PKG_VERSION:=@VER@ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ + +include $(INCLUDE_DIR)/package.mk + +define Package/@NAME@ + SECTION:=xorg-lib + CATEGORY:=Xorg + SUBMENU:=lib + DEPENDS:=@DEP@ @DISPLAY_SUPPORT + TITLE:=@NAME@ + URL:=http://xorg.freedesktop.org/ +endef + +CONFIGURE_ARGS += --enable-malloc0returnsnull --without-xcb + +define Build/Compile + $(call $(PKG_NAME)/Compile) + make -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf +endef + +define Package/@NAME@/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Build/InstallDev + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ +endef + +$(eval $(call BuildPackage,@NAME@)) diff --git a/Xorg/lib/tslib/Makefile b/Xorg/lib/tslib/Makefile new file mode 100644 index 0000000000..69231829b0 --- /dev/null +++ b/Xorg/lib/tslib/Makefile @@ -0,0 +1,62 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=tslib +PKG_VERSION:=1.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://download.berlios.de/tslib/ +PKG_MD5SUM:=92b2eb55b1e4ef7e2c0347069389390e + +PKG_INSTALL:=1 +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk + +define Package/tslib + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Tslib is an abstraction layer for touchscreen panel events. + DEPENDS:=@!LINUX_2_4 + URL:=http://tslib.berlios.de/ +endef + +define Package/tslib/description + Tslib is an abstraction layer for touchscreen panel events, + as well as a filter stack for the manipulation of those events. + It was created by Russell King, of arm.linux.org.uk. + Examples of implemented filters include jitter smoothing and the calibration transform. +endef + +ifeq ($(CONFIG_TARGET_om_gta02),y) + TS_CALIBRATION:=pointercal_om_gta02 +endif + +define Build/Configure + (cd $(PKG_BUILD_DIR); ./autogen.sh ); + $(call Build/Configure/Default, --enable-malloc0returnsnull) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/tslib/install + $(INSTALL_DIR) $(1)/usr/lib/ts $(1)/usr/bin $(1)/etc + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/ts/*.so* $(1)/usr/lib/ts/ + $(INSTALL_DATA) ./files/ts.conf $(1)/etc/ + $(if $(TS_CALIBRATION),$(CP) ./files/$(TS_CALIBRATION) $(1)/etc/pointercal ) +endef + +$(eval $(call BuildPackage,tslib)) diff --git a/Xorg/lib/tslib/files/pointercal_om_gta02 b/Xorg/lib/tslib/files/pointercal_om_gta02 new file mode 100644 index 0000000000000000000000000000000000000000..841ec7fab2e8e37afeb8c3afa1626a62d8fd1543 GIT binary patch literal 46 ucmV~$u>k-e3<5A`uiya(XrcQ5VcS<-WN1%w#i;F_+%Gw{#l?a0X literal 0 HcmV?d00001 diff --git a/Xorg/lib/tslib/files/ts.conf b/Xorg/lib/tslib/files/ts.conf new file mode 100644 index 0000000000..82f712ef41 --- /dev/null +++ b/Xorg/lib/tslib/files/ts.conf @@ -0,0 +1,25 @@ +# Uncomment if you wish to use the linux input layer event interface +module_raw input grab_events=1 + +# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d +# module_raw collie + +# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 +# module_raw corgi + +# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface +# module_raw ucb1x00 + +# Uncomment if you're using an HP iPaq h3600 or similar +# module_raw h3600 + +# Uncomment if you're using a Hitachi Webpad +# module_raw mk712 + +# Uncomment if you're using an IBM Arctic II +# module_raw arctic2 + +module pthres pmin=1 +module variance delta=30 +module dejitter delta=100 +module linear diff --git a/Xorg/lib/tslib/patches/devfs.patch b/Xorg/lib/tslib/patches/devfs.patch new file mode 100644 index 0000000000..d7ef0a9589 --- /dev/null +++ b/Xorg/lib/tslib/patches/devfs.patch @@ -0,0 +1,18 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- tslib/tests/fbutils.c~devfs.patch ++++ tslib/tests/fbutils.c +@@ -44,8 +44,8 @@ + static unsigned colormap [256]; + int xres, yres; + +-static char *defaultfbdevice = "/dev/fb0"; +-static char *defaultconsoledevice = "/dev/tty"; ++static char *defaultfbdevice = "/dev/fb/0"; ++static char *defaultconsoledevice = "/dev/vc/"; + static char *fbdevice = NULL; + static char *consoledevice = NULL; + diff --git a/Xorg/lib/tslib/patches/event1.patch b/Xorg/lib/tslib/patches/event1.patch new file mode 100644 index 0000000000..88cc3f3a2a --- /dev/null +++ b/Xorg/lib/tslib/patches/event1.patch @@ -0,0 +1,80 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- tslib/tests/ts_calibrate.c~event1 ++++ tslib/tests/ts_calibrate.c +@@ -179,11 +179,7 @@ + if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) { + ts = ts_open(tsdevice,0); + } else { +-#ifdef USE_INPUT_API +- ts = ts_open("/dev/input/event0", 0); +-#else +- ts = ts_open("/dev/touchscreen/ucb1x00", 0); +-#endif /* USE_INPUT_API */ ++ ts = ts_open("/dev/input/event1", 0); + } + + if (!ts) { +--- tslib/tests/ts_print.c~event1 ++++ tslib/tests/ts_print.c +@@ -28,11 +28,7 @@ + if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) { + ts = ts_open(tsdevice,0); + } else { +-#ifdef USE_INPUT_API +- ts = ts_open("/dev/input/event0", 0); +-#else +- ts = ts_open("/dev/touchscreen/ucb1x00", 0); +-#endif /* USE_INPUT_API */ ++ ts = ts_open("/dev/input/event1", 0); + } + + if (!ts) { +--- tslib/tests/ts_test.c~event1 ++++ tslib/tests/ts_test.c +@@ -120,11 +120,7 @@ + signal(SIGTERM, sig); + + if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) { +-#ifdef USE_INPUT_API +- tsdevice = strdup ("/dev/input/event0"); +-#else +- tsdevice = strdup ("/dev/touchscreen/ucb1x00"); +-#endif /* USE_INPUT_API */ ++ tsdevice = strdup ("/dev/input/event1"); + } + + ts = ts_open (tsdevice, 0); +--- tslib/tests/ts_print_raw.c~event1 ++++ tslib/tests/ts_print_raw.c +@@ -28,11 +28,7 @@ + if( (tsdevice = getenv("TSLIB_TSDEVICE")) != NULL ) { + ts = ts_open(tsdevice,0); + } else { +-#ifdef USE_INPUT_API +- ts = ts_open("/dev/input/event0", 0); +-#else +- ts = ts_open("/dev/touchscreen/ucb1x00", 0); +-#endif /* USE_INPUT_API */ ++ ts = ts_open("/dev/input/event1", 0); + } + + if (!ts) { +--- tslib/tests/ts_harvest.c~event1 ++++ tslib/tests/ts_harvest.c +@@ -75,11 +75,7 @@ + signal(SIGTERM, sig); + + if ((tsdevice = getenv("TSLIB_TSDEVICE")) == NULL) { +-#ifdef USE_INPUT_API +- tsdevice = strdup ("/dev/input/event0"); +-#else +- tsdevice = strdup ("/dev/touchscreen/ucb1x00"); +-#endif /* USE_INPUT_API */ ++ tsdevice = strdup ("/dev/input/event1"); + } + + ts = ts_open (tsdevice, 0); diff --git a/Xorg/lib/tslib/patches/fix_version.patch b/Xorg/lib/tslib/patches/fix_version.patch new file mode 100644 index 0000000000..d6a0ebd0f3 --- /dev/null +++ b/Xorg/lib/tslib/patches/fix_version.patch @@ -0,0 +1,32 @@ +--- + configure.ac | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +Index: tslib-1.0/configure.ac +=================================================================== +--- tslib-1.0.orig/configure.ac 2006-08-24 22:02:55.000000000 +0100 ++++ tslib-1.0/configure.ac 2007-07-09 21:04:38.000000000 +0100 +@@ -2,7 +2,7 @@ + # Process this file with autoconf to produce a configure script. + + AC_PREREQ(2.57) +-AC_INIT(tslib, 0.0.2, kergoth@handhelds.org) ++AC_INIT(tslib, 1.0.0, kergoth@handhelds.org) + # AC_CONFIG_AUX_DIR(config) + AM_INIT_AUTOMAKE(dist-bzip2) + AC_CONFIG_SRCDIR([src/ts_close.c]) +@@ -193,10 +193,10 @@ TS_CONF='${sysconfdir}/ts.conf' + AC_SUBST(TS_CONF) + + # Library versioning +-LT_RELEASE=0.0 +-LT_CURRENT=1 +-LT_REVISION=1 +-LT_AGE=1 ++LT_RELEASE=1.0 ++LT_CURRENT=0 ++LT_REVISION=0 ++LT_AGE=0 + AC_SUBST(LT_RELEASE) + AC_SUBST(LT_CURRENT) + AC_SUBST(LT_REVISION) diff --git a/Xorg/lib/tslib/patches/tslib-input_raw-grab_events.patch b/Xorg/lib/tslib/patches/tslib-input_raw-grab_events.patch new file mode 100644 index 0000000000..4bd0a05531 --- /dev/null +++ b/Xorg/lib/tslib/patches/tslib-input_raw-grab_events.patch @@ -0,0 +1,120 @@ +This patch adds support for "EVIOCGRAB" on the input device, which +tells the kernel _not_ to deliver events of the touchscreen to +/dev/input/mice. + +This is probably what most people want, since unprocessed raw touchscreen +events should not be converted to emulated PS/2 mouse movements. + +Signed-off-by: Harald Welte + +Index: a/plugins/input-raw.c +=================================================================== +--- a/plugins/input-raw.c (revision 49) ++++ b/plugins/input-raw.c (working copy) +@@ -18,6 +18,7 @@ + + #include + #include ++#include + + #include + #ifdef HAVE_UNISTD_H +@@ -33,6 +34,9 @@ + + #include "tslib-private.h" + ++#define GRAB_EVENTS_WANTED 1 ++#define GRAB_EVENTS_ACTIVE 2 ++ + struct tslib_input { + struct tslib_module_info module; + +@@ -42,6 +46,7 @@ + + int sane_fd; + int using_syn; ++ int grab_events; + }; + + static int check_fd(struct tslib_input *i) +@@ -64,6 +69,14 @@ + + if (bit & (1 << EV_SYN)) + i->using_syn = 1; ++ ++ if (i->grab_events == GRAB_EVENTS_WANTED) { ++ if (ioctl(ts->fd, EVIOCGRAB, (void *)1)) { ++ fprintf(stderr, "Unable to grab selected input device\n"); ++ return -1; ++ } ++ i->grab_events = GRAB_EVENTS_ACTIVE; ++ } + + return 0; + } +@@ -222,6 +235,15 @@ + + static int ts_input_fini(struct tslib_module_info *inf) + { ++ struct tslib_input *i = (struct tslib_input *)inf; ++ struct tsdev *ts = inf->dev; ++ ++ if (i->grab_events == GRAB_EVENTS_ACTIVE) { ++ if (ioctl(ts->fd, EVIOCGRAB, (void *)0)) { ++ fprintf(stderr, "Unable to un-grab selected input device\n"); ++ } ++ } ++ + free(inf); + return 0; + } +@@ -231,6 +253,36 @@ + .fini = ts_input_fini, + }; + ++static int parse_raw_grab(struct tslib_module_info *inf, char *str, void *data) ++{ ++ struct tslib_input *i = (struct tslib_input *)inf; ++ unsigned long v; ++ int err = errno; ++ ++ v = strtoul(str, NULL, 0); ++ ++ if (v == ULONG_MAX && errno == ERANGE) ++ return -1; ++ ++ errno = err; ++ switch ((int)data) { ++ case 1: ++ if (v) ++ i->grab_events = GRAB_EVENTS_WANTED; ++ break; ++ default: ++ return -1; ++ } ++ return 0; ++} ++ ++static const struct tslib_vars raw_vars[] = ++{ ++ { "grab_events", (void *)1, parse_raw_grab }, ++}; ++ ++#define NR_VARS (sizeof(raw_vars) / sizeof(raw_vars[0])) ++ + TSAPI struct tslib_module_info *mod_init(struct tsdev *dev, const char *params) + { + struct tslib_input *i; +@@ -245,5 +297,12 @@ + i->current_p = 0; + i->sane_fd = 0; + i->using_syn = 0; ++ i->grab_events = 0; ++ ++ if (tslib_parse_vars(&i->module, raw_vars, NR_VARS, params)) { ++ free(i); ++ return NULL; ++ } ++ + return &(i->module); + } diff --git a/Xorg/lib/vte/Makefile b/Xorg/lib/vte/Makefile new file mode 100644 index 0000000000..dac070356f --- /dev/null +++ b/Xorg/lib/vte/Makefile @@ -0,0 +1,111 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=vte +PKG_VERSION:=0.17.4 +PKG_RELEASE:=3 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/0.17 +PKG_MD5SUM:=ec6cb2668db7146eae7cfc48af98f3ed +PKG_FIXUP:=libtool + +PKG_BUILD_DEPENDS:=intltool/host + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +$(call include_mk, python-package.mk) + +PKG_INSTALL=1 + +EXTRA_CFLAGS+=-I$(INTL_PREFIX)/include + +EXTRA_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -L$(ICONV_PREFIX)/lib \ + -L$(INTL_PREFIX)/lib + +STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_vte CONFIG_PACKAGE_python-vte) + +define Package/vte + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Virtual Terminal Widget + URL:=http://developer.gnome.org/arch/gnome/widgets/vte.html + DEPENDS:=+gtk2 +libncurses +libX11 +endef + +define Package/python-vte + SECTION:=lang-python + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Python bindings for vte + URL:=http://developer.gnome.org/arch/gnome/widgets/vte.html + DEPENDS:=+python-mini +PACKAGE_python-vte:python-gtk +vte +endef + +define Package/vte/description + VTE is a library (libvte) implementing a terminal emulator widget for GTK+, + and a minimal sample application (vte) using that. Vte is mainly used in + gnome-terminal, but can also be used to embed a console/terminal in games, + editors, IDEs, etc. +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --without-xft2 \ + $(if $(CONFIG_PACKAGE_python-vte),--enable-python,--disable-python) \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/vte + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/vte/*.h \ + $(1)/usr/include/vte/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la,a} \ + $(1)/usr/lib + + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig +endef + +define Package/vte/install + $(INSTALL_DIR) $(1)/usr/share/vte/termcap + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/vte/termcap/* \ + $(1)/usr/share/vte/termcap + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib + + $(INSTALL_DIR) $(1)/usr/lib/vte + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/lib/vte/* \ + $(1)/usr/lib/vte +endef + +define Package/python-vte/install + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0 + $(CP) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.so* \ + $(1)$(PYTHON_PKG_DIR)/gtk-2.0 +endef + +$(eval $(call BuildPackage,vte)) +$(eval $(call BuildPackage,python-vte)) + diff --git a/Xorg/lib/vte/patches/100-compile-fixes.patch b/Xorg/lib/vte/patches/100-compile-fixes.patch new file mode 100644 index 0000000000..273aca0a35 --- /dev/null +++ b/Xorg/lib/vte/patches/100-compile-fixes.patch @@ -0,0 +1,13 @@ +Index: vte-0.17.4/termcaps/Makefile.am +=================================================================== +--- vte-0.17.4.orig/termcaps/Makefile.am 2011-01-27 18:14:40.165998453 +0100 ++++ vte-0.17.4/termcaps/Makefile.am 2011-01-27 18:14:51.964899492 +0100 +@@ -1,6 +1,6 @@ + EXTRA_DIST = xterm xterm.baseline + termcapdir = $(pkgdatadir)/termcap +-termcap_DATA = xterm $(VTE_DEFAULT_EMULATION) +-$(VTE_DEFAULT_EMULATION): xterm ++termcap_DATA = $(VTE_DEFAULT_EMULATION) ++$(VTE_DEFAULT_EMULATION): + sed -e s,^xterm:,$(VTE_DEFAULT_EMULATION):,g \ + -e s,^xterm\|,$(VTE_DEFAULT_EMULATION)\|,g $< > $@ diff --git a/Xorg/lib/wnck/Makefile b/Xorg/lib/wnck/Makefile new file mode 100644 index 0000000000..975d0ad8da --- /dev/null +++ b/Xorg/lib/wnck/Makefile @@ -0,0 +1,57 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libwnck +PKG_VERSION:=2.26.1 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.26/ +PKG_MD5SUM:=015b5d2e65d15448fa143513fce03541 +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +PKG_BUILD_DEPENDS:=intltool/host + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +TARGET_CFLAGS+=$(FPIC) +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -Wl,-rpath=/usr/lib + +define Package/libwnck + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=Window Navigator Construction Kit + URL:=http://ftp.gnome.org/ + DEPENDS:=+libX11 +gtk2 +glib2 +libXext $(INTL_DEPENDS) +endef + +define Package/libwnck/description +Window Navigator Construction Kit +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/libwnck-1.0/libwnck/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/libwnck-1.0/libwnck/* $(1)/usr/include/libwnck-1.0/libwnck/ + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ +endef + +define Package/libwnck/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libwnck)) diff --git a/Xorg/lib/wnck/patches/100-optional_gdk_pixbuf_csource.patch b/Xorg/lib/wnck/patches/100-optional_gdk_pixbuf_csource.patch new file mode 100644 index 0000000000..9c19596c05 --- /dev/null +++ b/Xorg/lib/wnck/patches/100-optional_gdk_pixbuf_csource.patch @@ -0,0 +1,65 @@ +--- a/configure ++++ b/configure +@@ -26634,7 +26634,7 @@ + done + IFS=$as_save_IFS + +- test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="no" ++ test -z "$ac_cv_path_GDK_PIXBUF_CSOURCE" && ac_cv_path_GDK_PIXBUF_CSOURCE="" + ;; + esac + fi +@@ -26649,14 +26649,6 @@ + + + +-if test x"$GDK_PIXBUF_CSOURCE" = xno; then +- { { $as_echo "$as_me:$LINENO: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&5 +-$as_echo "$as_me: error: gdk-pixbuf-csource executable not found in your path - should be installed with GTK" >&2;} +- { (exit 1); exit 1; }; } +-fi +- +- +- + ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + + ################################################## +--- a/configure.in ++++ b/configure.in +@@ -128,11 +128,7 @@ + GLIB_GENMARSHAL=`$PKG_CONFIG --variable=glib_genmarshal glib-2.0` + AC_SUBST(GLIB_GENMARSHAL) + +-AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource, no) +- +-if test x"$GDK_PIXBUF_CSOURCE" = xno; then +- AC_MSG_ERROR([gdk-pixbuf-csource executable not found in your path - should be installed with GTK]) +-fi ++AC_PATH_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource) + + AC_SUBST(GDK_PIXBUF_CSOURCE) + +--- a/libwnck/Makefile.am ++++ b/libwnck/Makefile.am +@@ -163,7 +163,8 @@ + $(wnck_built_cfiles) + + inlinepixbufs.h: $(IMAGES) +- $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h ++ $(if $(GDK_PIXBUF_CSOURCE),$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h) ++ touch $@ + + $(OBJECTS): inlinepixbufs.h + +--- a/libwnck/Makefile.in ++++ b/libwnck/Makefile.in +@@ -826,7 +826,8 @@ + && rm -f new-wnck-enum-types.c + + inlinepixbufs.h: $(IMAGES) +- $(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h ++ $(if $(GDK_PIXBUF_CSOURCE),$(GDK_PIXBUF_CSOURCE) --raw --build-list $(VARIABLES) >$(srcdir)/inlinepixbufs.h) ++ touch $@ + + $(OBJECTS): inlinepixbufs.h + # Tell versions [3.59,3.63) of GNU make to not export all variables. diff --git a/Xorg/lib/xcbproto/Makefile b/Xorg/lib/xcbproto/Makefile new file mode 100644 index 0000000000..724e5b65ea --- /dev/null +++ b/Xorg/lib/xcbproto/Makefile @@ -0,0 +1,59 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xcb-proto +PKG_VERSION:=1.3 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://xcb.freedesktop.org/dist/ +PKG_MD5SUM:=d9275a714e83ab9c1f9b260c6eff1609 +PKG_INSTALL:=1 + +#PKG_BUILD_DEPENDS:=python-mini/host + +include $(INCLUDE_DIR)/package.mk +#$(call include_mk, python-package.mk) + +#STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,PACKAGE_python PACKAGE_python-mini) + +define Package/xcbproto + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + BUILDONLY:=1 + TITLE:=xcbproto + URL:=http://xcb.freedesktop.org/ +endef + +#define InstallPy +# $(INSTALL_DIR) $(1)/host/lib/$(PYTHON)/site-packages/xcbgen +# $(INSTALL_DATA) \ +# $(PKG_INSTALL_DIR)/usr/lib/$(PYTHON)/site-packages/xcbgen/*.py \ +# $(1)/host/lib/$(PYTHON)/site-packages/xcbgen/ +#endef + +define Build/InstallDev +# $(call InstallPy,$(1),$(2)) + $(INSTALL_DIR) \ + $(1)/usr/lib/pkgconfig \ + $(1)/host/share/xcb + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/xcb/* \ + $(1)/host/share/xcb/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(SED) 's,datadir=/usr,datadir=$(STAGING_DIR)/host,g' $(1)/usr/lib/pkgconfig/xcb-proto.pc +endef + +$(eval $(call BuildPackage,xcbproto)) diff --git a/Xorg/lib/xine-lib/Makefile b/Xorg/lib/xine-lib/Makefile new file mode 100644 index 0000000000..89e3714800 --- /dev/null +++ b/Xorg/lib/xine-lib/Makefile @@ -0,0 +1,66 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xine-lib +PKG_VERSION:=1.1.1 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/xine +PKG_MD5SUM:=b1f42602c776bb93e3cbf127e220cbfd + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +CONFIGURE_ARGS+=\ + --enable-static \ + --disable-vcd \ + --disable-imagemagick \ + --disable-flac + +XINE_LIB_FLAGS:=\ + LIBFLAC_CFLAGS="" \ + LIBFLAC_LIBS="" \ + X_CFLAGS="" \ + X_LIBS="" \ + XINE_ACFLAGS="" \ + CXXFLAGS="$(TARGET_CFLAGS)" + +CONFIGURE_VARS+=$(XINE_LIB_FLAGS) + +define Package/xine-lib + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=xine libraries + DEPENDS:=+libX11 +libXext +alsa-lib +zlib +libfreetype + URL:=http://www.xine-project.org/ +endef + +MAKE_FLAGS+=$(XINE_LIB_FLAGS) + +define Build/InstallDev + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(SED) 's,-I$$$${prefix}/include,-I$(STAGING_DIR)/usr/include/,g' $(1)/usr/bin/xine-config + $(SED) 's,-L$$$${exec_prefix}/lib,-L$(STAGING_DIR)/usr/lib/,g' $(1)/usr/bin/xine-config + $(INSTALL_DIR) $(2)/bin + mv $(1)/usr/bin/xine-config $(2)/bin +endef + +define Package/xine-lib/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib*so* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,xine-lib)) diff --git a/Xorg/lib/xine-lib/patches/100-compile_fix.patch b/Xorg/lib/xine-lib/patches/100-compile_fix.patch new file mode 100644 index 0000000000..bbb6f0c68b --- /dev/null +++ b/Xorg/lib/xine-lib/patches/100-compile_fix.patch @@ -0,0 +1,13 @@ +Index: xine-lib-1.1.1/src/libw32dll/wine/Makefile.in +=================================================================== +--- xine-lib-1.1.1.orig/src/libw32dll/wine/Makefile.in 2008-01-14 21:28:08.000000000 +0100 ++++ xine-lib-1.1.1/src/libw32dll/wine/Makefile.in 2008-01-14 21:28:20.000000000 +0100 +@@ -74,7 +74,7 @@ + DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles +-LTCCASCOMPILE = $(LIBTOOL) --mode=compile $(CCAS) $(AM_CCASFLAGS) \ ++LTCCASCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CCAS) $(AM_CCASFLAGS) \ + $(CCASFLAGS) + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ + $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) diff --git a/Xorg/wm/fluxbox/Makefile b/Xorg/wm/fluxbox/Makefile new file mode 100644 index 0000000000..0adc97d1da --- /dev/null +++ b/Xorg/wm/fluxbox/Makefile @@ -0,0 +1,102 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=fluxbox +PKG_VERSION:=1.0.0 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@SF/fluxbox +PKG_MD5SUM:=990e276ead0d04421dce4080f485caca + +EXTRA_LDFLAGS:="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" + +include $(INCLUDE_DIR)/package.mk + +CONFIGURE_VARS+=LIBS="-nodefaultlibs -luClibc++ -Wl,-Bstatic,-lstdc++,-Bdynamic -lm $(LIBGCC_S)" \ + CXXLD="$(TARGET_CC)" + +CONFIGURE_ARGS+=--disable-xmb + +define Package/fluxbox/Default + SECTION:=xorg-wm + CATEGORY:=Xorg + SUBMENU:=window manager + URL:=http://fluxbox.org/ +endef + +define Package/fluxbox +$(call Package/fluxbox/Default) + DEPENDS:=+uclibcxx +libXt +libXpm + TITLE:=fluxbox window manager + MENU:=1 +endef + +define Package/fbrun +$(call Package/fluxbox/Default) + DEPENDS:=fluxbox + TITLE:=fluxbox tool to run applications +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ + if [ -x $(CONFIGURE_CMD) ]; then \ + $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ + $(CONFIGURE_VARS) \ + $(CONFIGURE_CMD) \ + $(CONFIGURE_ARGS_XTRA) \ + $(CONFIGURE_ARGS) ;\ + fi \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR=$(PKG_INSTALL_DIR) install +endef + +define Package/fluxbox/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/usr/share/fluxbox/styles/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fluxbox $(1)/usr/bin/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/keys $(1)/usr/share/fluxbox/ + $(CP) $(PKG_INSTALL_DIR)/usr/share/fluxbox/styles/* $(1)/usr/share/fluxbox/styles/ + $(CP) files/init $(1)/usr/share/fluxbox/ + $(CP) files/menu $(1)/usr/share/fluxbox/ + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_DATA) \ + ./files/uci-defaults/x11 \ + $(1)/etc/uci-defaults/ +endef + +define Package/fbsetbg/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetbg $(1)/usr/bin/ +endef + +define Package/fbsetroot/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbsetroot $(1)/usr/bin/ +endef + +define Package/fbrun/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/fbrun $(1)/usr/bin/ +endef + +define Package/fluxbox/postinst + #!/bin/sh + [ -n "$${IPKG_INSTROOT}" ] && exit + . /etc/functions.sh + uci_apply_defaults +endef + +$(eval $(call BuildPackage,fbrun)) +$(eval $(call BuildPackage,fluxbox)) diff --git a/Xorg/wm/fluxbox/files/init b/Xorg/wm/fluxbox/files/init new file mode 100644 index 0000000000..74926d53a1 --- /dev/null +++ b/Xorg/wm/fluxbox/files/init @@ -0,0 +1,99 @@ +session.screen0.titlebar.left: Stick +session.screen0.titlebar.right: Minimize Maximize Close +session.screen0.tab.width: 64 +session.screen0.tab.alignment: Left +session.screen0.tab.rotatevertical: True +session.screen0.tab.placement: TopLeft +session.screen0.tab.height: 16 +session.screen0.menu.alpha: 158 +session.screen0.tabs.intitlebar: false +session.screen0.toolbar.onTop: False +session.screen0.toolbar.visible: true +session.screen0.toolbar.layer: Desktop +session.screen0.toolbar.height: 0 +session.screen0.toolbar.autoHide: false +session.screen0.toolbar.tools: workspacename, prevworkspace, nextworkspace, iconbar, systemtray, prevwindow, nextwindow, clock +session.screen0.toolbar.maxOver: false +session.screen0.toolbar.placement: TopCenter +session.screen0.toolbar.alpha: 255 +session.screen0.toolbar.widthPercent: 100 +session.screen0.toolbar.onhead: 0 +session.screen0.window.focus.alpha: 255 +session.screen0.window.unfocus.alpha: 34 +session.screen0.iconbar.iconTextPadding: 10l +session.screen0.iconbar.wheelMode: Screen +session.screen0.iconbar.alignment: Relative +session.screen0.iconbar.usePixmap: true +session.screen0.iconbar.deiconifyMode: Follow +session.screen0.iconbar.mode: Workspace +session.screen0.iconbar.iconWidth: 70 +session.screen0.slit.direction: Vertical +session.screen0.slit.autoHide: false +session.screen0.slit.onTop: False +session.screen0.slit.layer: Dock +session.screen0.slit.alpha: 255 +session.screen0.slit.maxOver: false +session.screen0.slit.placement: BottomRight +session.screen0.slit.onhead: 0 +session.screen0.overlay.lineWidth: 1 +session.screen0.overlay.lineStyle: LineSolid +session.screen0.overlay.joinStyle: JoinMiter +session.screen0.overlay.capStyle: CapNotLast +session.screen0.edgeSnapThreshold: 0 +session.screen0.workspaceNames: one,two,three, +session.screen0.windowPlacement: RowSmartPlacement +session.screen0.windowScrollAction: +session.screen0.focusModel: ClickFocus +session.screen0.focusLastWindow: true +session.screen0.clickRaises: true +session.screen0.menuMode: Delay +session.screen0.desktopwheeling: true +session.screen0.imageDither: false +session.screen0.colPlacementDirection: TopToBottom +session.screen0.rowPlacementDirection: LeftToRight +session.screen0.resizeMode: Bottom +session.screen0.windowMenu: +session.screen0.followModel: Ignore +session.screen0.decorateTransient: false +session.screen0.strftimeFormat: %a %d %H:%M +session.screen0.workspacewarping: true +session.screen0.menuDelay: 0 +session.screen0.windowScrollReverse: false +session.screen0.workspaces: 3 +session.screen0.autoRaise: false +session.screen0.sloppywindowgrouping: true +session.screen0.reversewheeling: false +session.screen0.rootCommand: ~/.xsession +session.screen0.menuDelayClose: 0 +session.screen0.fullMaximization: false +session.screen0.tabFocusModel: ClickToTabFocus +session.screen0.focusNewWindows: true +session.screen0.antialias: true +session.screen0.showwindowposition: true +session.screen0.opaqueMove: false +session.titlebar.left: Stick +session.titlebar.right: Minimize Maximize Close +session.cacheLife: 5l +session.ignoreBorder: false +session.tabs: true +session.doubleClickInterval: 250 +session.tabsAttachArea: Window +session.iconbar: true +session.imageDither: True +session.focusTabMinWidth: 0 +session.modKey: Mod1 +session.forcePseudoTransparency: false +session.autoRaiseDelay: 250 +session.styleFile: /usr/share/fluxbox/styles/BlueNight +session.cacheMax: 200l +session.useMod1: true +session.keyFile: ~/.fluxbox/keys +session.menuFile: ~/.fluxbox/menu +session.tabPadding: 0 +session.groupFile: ~/.fluxbox/groups +session.colorsPerChannel: 4 +session.appsFile: ~/.fluxbox/apps +session.slitlistFile: ~/.fluxbox/slitlist +session.numLayers: 13 +session.opaqueMove: False +session.styleOverlay: ~/.fluxbox/overlay diff --git a/Xorg/wm/fluxbox/files/menu b/Xorg/wm/fluxbox/files/menu new file mode 100644 index 0000000000..3357552d3c --- /dev/null +++ b/Xorg/wm/fluxbox/files/menu @@ -0,0 +1,31 @@ +[begin] (Fluxbox-OpenWrt) + [exec] (xterm) {xterm} + [exec] (vi) {xterm -e vi} + [exec] (xmms) {xmms} + [exec] (alsamixer) {xterm -e alsamixer} + [exec] (vlc) {vlc} + [exec] (xclock) {xclock} + [exec] (xmag) {xmag} + [exec] (xclock) {xclock} + [exec] (xcalc) {xcalc} + [exec] (xpdf) {xpdf} + [exec] (top) {xterm -e top} +[submenu] (fluxbox menu) + [config] (Configure) +[submenu] (System Styles) {Choose a style...} + [stylesdir] (/usr/share/fluxbox/styles) +[end] + [workspaces] (Workspace List) +[submenu] (Tools) + [exec] (fluxconf) {fluxconf} + [exec] (fluxkeys) {fluxkeys} + [exec] (fluxmenu) {fluxmenu} +[end] + [commanddialog] (Fluxbox Command) + [reconfig] (Reload config) + [restart] (Restart) + [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) 2> /dev/null | xmessage -file - -center} + [separator] + [exit] (Exit) +[end] +[end] diff --git a/Xorg/wm/fluxbox/files/uci-defaults/x11 b/Xorg/wm/fluxbox/files/uci-defaults/x11 new file mode 100644 index 0000000000..3d029c0e0c --- /dev/null +++ b/Xorg/wm/fluxbox/files/uci-defaults/x11 @@ -0,0 +1 @@ +uci set x11.@desktop[0].autostart=enlightenment_start \ No newline at end of file diff --git a/Xorg/wm/fluxbox/patches/010-fix-includes.patch b/Xorg/wm/fluxbox/patches/010-fix-includes.patch new file mode 100644 index 0000000000..d07d47cafa --- /dev/null +++ b/Xorg/wm/fluxbox/patches/010-fix-includes.patch @@ -0,0 +1,37 @@ +diff --git a/src/ClientPattern.cc b/src/ClientPattern.cc +index 21224cb..b641185 100644 +--- a/src/ClientPattern.cc ++++ b/src/ClientPattern.cc +@@ -45,6 +45,7 @@ + #endif + + // needed as well for index on some systems (e.g. solaris) ++#include + #include + + using std::string; +diff --git a/src/FbTk/Text.cc b/src/FbTk/Text.cc +index 8c836cc..9f4b3eb 100644 +--- a/src/FbTk/Text.cc ++++ b/src/FbTk/Text.cc +@@ -26,6 +26,7 @@ + #include "Font.hh" + #include "Theme.hh" + ++#include + #include + + namespace FbTk { +diff --git a/src/main.cc b/src/main.cc +index afbf43e..3c3d17c 100644 +--- a/src/main.cc ++++ b/src/main.cc +@@ -45,6 +45,8 @@ + #include + #endif + ++#include ++ + #include + #include + #include diff --git a/Xorg/wm/fluxbox/patches/100-fbrun-compile.patch b/Xorg/wm/fluxbox/patches/100-fbrun-compile.patch new file mode 100644 index 0000000000..73b0e23737 --- /dev/null +++ b/Xorg/wm/fluxbox/patches/100-fbrun-compile.patch @@ -0,0 +1,10 @@ +--- fluxbox-1.0rc3/util/fbrun/Makefile.in.orig 2007-09-17 19:52:52.000000000 +0200 ++++ fluxbox-1.0rc3/util/fbrun/Makefile.in 2007-09-17 19:53:09.000000000 +0200 +@@ -236,7 +236,7 @@ + fbrun$(EXEEXT): $(fbrun_OBJECTS) $(fbrun_DEPENDENCIES) + @rm -f fbrun$(EXEEXT) +- $(CXXLINK) $(fbrun_OBJECTS) $(fbrun_LDADD) $(LIBS) ++ $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbrun_OBJECTS) $(fbrun_LDADD) $(LDFLAGS) $(LIBS) + + mostlyclean-compile: + -rm -f *.$(OBJEXT) diff --git a/Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch b/Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch new file mode 100644 index 0000000000..0c291bed4e --- /dev/null +++ b/Xorg/wm/fluxbox/patches/120-fbsetroot-compile.patch @@ -0,0 +1,8 @@ +diff -urN fluxbox-1.0rc3.orig/util/Makefile.in fluxbox-1.0rc3/util/Makefile.in +--- fluxbox-1.0rc3.orig/util/Makefile.in 2007-09-17 19:56:45.000000000 +0200 ++++ fluxbox-1.0rc3/util/Makefile.in 2007-09-17 19:58:11.000000000 +0200 +@@ -277,4 +277,4 @@ + fbsetroot$(EXEEXT): $(fbsetroot_OBJECTS) $(fbsetroot_DEPENDENCIES) + @rm -f fbsetroot$(EXEEXT) +- $(CXXLINK) $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LIBS) ++ $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) -o $@ $(fbsetroot_OBJECTS) $(fbsetroot_LDADD) $(LDFLAGS) $(LIBS) diff --git a/Xorg/wm/matchbox-window-manager/Makefile b/Xorg/wm/matchbox-window-manager/Makefile new file mode 100644 index 0000000000..df23f97ee1 --- /dev/null +++ b/Xorg/wm/matchbox-window-manager/Makefile @@ -0,0 +1,77 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=matchbox-window-manager +PKG_VERSION:=1.2 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://matchbox-project.org/sources/$(PKG_NAME)/$(PKG_VERSION) +PKG_MD5SUM:=3e158dcf57823b55c926d95b245500fb + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + +define Package/matchbox-window-manager + TITLE:=matchbox window manager + SECTION:=xorg-wm + CATEGORY:=Xorg + SUBMENU:=window manager + DEPENDS:=+libX11 +zlib +libfreetype +fontconfig +libmatchbox + URL:=http://matchbox-project.org/ +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR=$(PKG_INSTALL_DIR) \ + LIBMB_LIBS="$(TARGET_LDFLAGS) -lfontconfig -lXrender \ + -lz -lexpat -lfreetype -lXft -lmb -lX11 -lXext -lXau -lXdmcp \ + -lpng12" \ + all +endef + +define Package/matchbox-window-manager/install + $(INSTALL_DIR) $(1)/etc/matchbox + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/etc/matchbox/kbdconfig \ + $(1)/etc/matchbox/ + + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ + + $(INSTALL_DIR) $(1)/usr/share/{matchbox,themes} + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/matchbox/* \ + $(1)/usr/share/matchbox/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/themes/* \ + $(1)/usr/share/themes/ + $(INSTALL_DIR) $(1)/etc/uci-defaults + $(INSTALL_DATA) \ + ./files/uci-defaults/x11 \ + $(1)/etc/uci-defaults/ +endef + +define Package/matchbox-window-manager/postinst + #!/bin/sh + [ -n "$${IPKG_INSTROOT}" ] && exit + . /etc/functions.sh + uci_apply_defaults +endef + +$(eval $(call BuildPackage,matchbox-window-manager)) diff --git a/Xorg/wm/matchbox-window-manager/files/uci-defaults/x11 b/Xorg/wm/matchbox-window-manager/files/uci-defaults/x11 new file mode 100644 index 0000000000..3d029c0e0c --- /dev/null +++ b/Xorg/wm/matchbox-window-manager/files/uci-defaults/x11 @@ -0,0 +1 @@ +uci set x11.@desktop[0].autostart=enlightenment_start \ No newline at end of file diff --git a/Xorg/xorg/app/font-util/Makefile b/Xorg/xorg/app/font-util/Makefile new file mode 100644 index 0000000000..07e8dbb17b --- /dev/null +++ b/Xorg/xorg/app/font-util/Makefile @@ -0,0 +1,45 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=font-util +PKG_VERSION:=1.0.1 +PKG_RELEASE:=3 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=b81535f78fe05732931f02841e5ca37b + +include $(INCLUDE_DIR)/package.mk + +define Package/font-util + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=app + TITLE:=misc tool to generate x fonts + DEPENDS:=+xserver + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + cd $(PKG_BUILD_DIR)/; ./configure +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) + $(MAKE) -C $(PKG_BUILD_DIR) install DESTDIR="$(PKG_INSTALL_DIR)" +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig $(1)/usr/lib/X11 $(2)/bin + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/local/lib/pkgconfig/fontutil.pc $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/local/lib/X11/* $(1)/usr/lib/X11/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/* $(2)/bin/ +endef + +$(eval $(call BuildPackage,font-util)) diff --git a/Xorg/xorg/app/fontconfig/Makefile b/Xorg/xorg/app/fontconfig/Makefile new file mode 100644 index 0000000000..5a5b3697ad --- /dev/null +++ b/Xorg/xorg/app/fontconfig/Makefile @@ -0,0 +1,69 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=fontconfig +PKG_VERSION:=2.6.0 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://fontconfig.org/release/ +PKG_MD5SUM:=ab54ec1d4ddd836313fdbc0cd5299d6d +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/fontconfig + SECTION:=xorg-util + CATEGORY:=Xorg + SUBMENU:=font-utils + TITLE:=fontconfig + DEPENDS:=+libexpat +libfreetype + URL:=http://fontconfig.org/ +endef + +CONFIGURE_ARGS+= \ + --disable-docs \ + --with-cache-dir=/usr/share/fontconfig/cache \ + --with-arch=$(ARCH) \ + +CONFIGURE_VARS+= \ + ac_cv_prog_HASDOCBOOK=no \ + +TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Build/Compile + $(foreach dir,fc-arch fc-case fc-lang fc-glyphname, \ + $(MAKE) -C $(PKG_BUILD_DIR)/$(dir) CFLAGS="$(HOST_CFLAGS)" \ + CPPFLAGS="" LDFLAGS="$(HOST_LDFLAGS)" || exit 1;) + $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" DOCSRC="" install +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(CP) $(PKG_INSTALL_DIR)/usr/include/fontconfig $(1)/usr/include/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfontconfig.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/fontconfig.pc $(1)/usr/lib/pkgconfig/ +endef + +define Package/fontconfig/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfontconfig.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/etc/fonts/conf.avail + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/fonts/conf.avail/*.conf $(1)/etc/fonts/conf.avail/ + $(INSTALL_DIR) $(1)/etc/fonts/conf.d + $(CP) $(PKG_INSTALL_DIR)/etc/fonts/conf.d/*.conf $(1)/etc/fonts/conf.d/ + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/etc/fonts/fonts.{conf,dtd} $(1)/etc/fonts/ +endef + +$(eval $(call BuildPackage,fontconfig)) diff --git a/Xorg/xorg/app/iceauth/Makefile b/Xorg/xorg/app/iceauth/Makefile new file mode 100644 index 0000000000..9ee07dd1d8 --- /dev/null +++ b/Xorg/xorg/app/iceauth/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2007-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=iceauth +PKG_RELEASE:=1 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=975ade3f238c1eb10705da0a91e6e8e7 +PKG_BUILD_DEPENDS:=xproto + +include $(INCLUDE_DIR)/package.mk + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +PKG_INSTALL=1 + +define Package/iceauth + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libICE + TITLE:=iceauth + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +define Package/iceauth/install + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1) + rm -rf $(1)/usr/man/ +endef + +$(eval $(call BuildPackage,iceauth)) diff --git a/Xorg/xorg/app/smproxy/Makefile b/Xorg/xorg/app/smproxy/Makefile new file mode 100644 index 0000000000..c20c58b0bb --- /dev/null +++ b/Xorg/xorg/app/smproxy/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=smproxy +PKG_RELEASE:=1 +PKG_VERSION:=1.0.3 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=ba7dbde81be24fc1bd4156b360e5f8cf +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/smproxy + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libXt +libXmu + TITLE:=smproxy + URL:=http://xorg.freedesktop.org/ +endef + +define Package/smproxy/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,smproxy)) diff --git a/Xorg/xorg/app/x11perf/Makefile b/Xorg/xorg/app/x11perf/Makefile new file mode 100644 index 0000000000..a1fa62e46c --- /dev/null +++ b/Xorg/xorg/app/x11perf/Makefile @@ -0,0 +1,43 @@ +# +# Copyright (C) 2008-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=x11perf +PKG_RELEASE:=1 +PKG_VERSION:=1.5.1 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=66e4aa4645f83809071eb69553ed0222 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/x11perf + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 +libXmuu +libXrender +libXft +libXext + TITLE:=x11perf + URL:=http://xorg.freedesktop.org/ +endef + +CONFIGURE_ARGS+=LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" + +define Package/x11perf/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib/X11/x11perfcomp + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/lib/X11/x11perfcomp/* \ + $(1)/usr/lib/X11/x11perfcomp/ +endef + +$(eval $(call BuildPackage,x11perf)) diff --git a/Xorg/xorg/app/xauth/Makefile b/Xorg/xorg/app/xauth/Makefile new file mode 100644 index 0000000000..7b3910e1aa --- /dev/null +++ b/Xorg/xorg/app/xauth/Makefile @@ -0,0 +1,41 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xauth +PKG_RELEASE:=1 +PKG_VERSION:=1.0.4 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=fa00078c414c4a57cab7a6d89a0c8734 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/xauth + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 +libXau +libXext +libXmuu + TITLE:=xauth + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xauth/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,xauth)) diff --git a/Xorg/xorg/app/xkbcomp/Makefile b/Xorg/xorg/app/xkbcomp/Makefile new file mode 100644 index 0000000000..b7c0a2da26 --- /dev/null +++ b/Xorg/xorg/app/xkbcomp/Makefile @@ -0,0 +1,45 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xkbcomp +PKG_RELEASE:=2 +PKG_VERSION:=1.1.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=38c387bacdc01038c8ac280588792bcf + +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +include $(INCLUDE_DIR)/package.mk + +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -Wl,-rpath=/usr/lib + +define Package/xkbcomp + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 +libxkbfile + TITLE:=xkbcomp + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xkbcomp/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin + $(INSTALL_DIR) $(PKG_INSTALL_DIR)/usr/share/xkbdata/compiled +endef + +$(eval $(call BuildPackage,xkbcomp)) diff --git a/Xorg/xorg/app/xprop/Makefile b/Xorg/xorg/app/xprop/Makefile new file mode 100644 index 0000000000..33dc46c615 --- /dev/null +++ b/Xorg/xorg/app/xprop/Makefile @@ -0,0 +1,43 @@ +# +# Copyright (C) 2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xprop +PKG_RELEASE:=1 +PKG_VERSION:=1.2.0 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app/ +PKG_MD5SUM:=e6d0673a1e1e469f0a6220a6868fb94b + +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_BUILD_DEPENDS:=xproto +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/xprop + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 + TITLE:=xprop + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xprop/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/xprop \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,xprop)) diff --git a/Xorg/xorg/app/xrandr/Makefile b/Xorg/xorg/app/xrandr/Makefile new file mode 100644 index 0000000000..503175031f --- /dev/null +++ b/Xorg/xorg/app/xrandr/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xrandr +PKG_RELEASE:=1 +PKG_VERSION:=1.3.2 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/app/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=2cb19bb1c19ccf77c40032b03dbe06f0 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/xrandr + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 +libXrandr +libXrender +libX11 + TITLE:=xrandr + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xrandr/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,xrandr)) diff --git a/Xorg/xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch b/Xorg/xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch new file mode 100644 index 0000000000..6a14192c8a --- /dev/null +++ b/Xorg/xorg/app/xrandr/patches/001-xrandr-1.2.2-clone-nameclash.patch @@ -0,0 +1,35 @@ +--- xrandr-1.2.3/xrandr.c.orig 2007-10-25 17:18:55.001346494 +0200 ++++ xrandr-1.2.3/xrandr.c 2007-10-25 17:21:07.222276308 +0200 +@@ -189,7 +189,7 @@ + + #if HAS_RANDR_1_2 + typedef enum _policy { +- clone, extend ++ p_clone, p_extend + } policy_t; + + typedef enum _relation { +@@ -1602,7 +1602,7 @@ + int ret = 0; + #if HAS_RANDR_1_2 + output_t *output = NULL; +- policy_t policy = clone; ++ policy_t policy = p_clone; + Bool setit_1_2 = False; + Bool query_1_2 = False; + Bool modeit = False; +@@ -1863,12 +1863,12 @@ + continue; + } + if (!strcmp ("--clone", argv[i])) { +- policy = clone; ++ policy = p_clone; + setit_1_2 = True; + continue; + } + if (!strcmp ("--extend", argv[i])) { +- policy = extend; ++ policy = p_extend; + setit_1_2 = True; + continue; + } diff --git a/Xorg/xorg/app/xrdb/Makefile b/Xorg/xorg/app/xrdb/Makefile new file mode 100644 index 0000000000..20d53b482f --- /dev/null +++ b/Xorg/xorg/app/xrdb/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xrdb +PKG_RELEASE:=1 +PKG_VERSION:=1.0.5 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.4/src/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=9c30b8e1709d5367beb7706146640c07 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/xrdb + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 +libXmuu + TITLE:=xrdb + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xrdb/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/xrdb \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,xrdb)) diff --git a/Xorg/xorg/app/xset/Makefile b/Xorg/xorg/app/xset/Makefile new file mode 100644 index 0000000000..e6cca3357b --- /dev/null +++ b/Xorg/xorg/app/xset/Makefile @@ -0,0 +1,45 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xset +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=eeb0d02f69c76bd40470dede99b4bd49 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + + +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -Wl,-rpath=/usr/lib + +define Package/xset + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libXmuu +libX11 +libXext + TITLE:=xset + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xset/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin +endef + +$(eval $(call BuildPackage,xset)) diff --git a/Xorg/xorg/app/xsetroot/Makefile b/Xorg/xorg/app/xsetroot/Makefile new file mode 100644 index 0000000000..af27a189d1 --- /dev/null +++ b/Xorg/xorg/app/xsetroot/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2007-2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xsetroot +PKG_RELEASE:=1 +PKG_VERSION:=1.0.3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=cbda9b9b8da5af4614110883d5a276b8 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/xsetroot + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+xbitmaps +libXmuu +libX11 + TITLE:=xsetroot + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xsetroot/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin +endef + +$(eval $(call BuildPackage,xsetroot)) diff --git a/Xorg/xorg/app/xwd/Makefile b/Xorg/xorg/app/xwd/Makefile new file mode 100644 index 0000000000..b88b010f24 --- /dev/null +++ b/Xorg/xorg/app/xwd/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xwd +PKG_RELEASE:=1 +PKG_VERSION:=1.0.3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/app +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=007cea1f389abde5c93162dcd5541351 +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/xwd + SECTION:=xorg-app + CATEGORY:=Xorg + SUBMENU:=app + DEPENDS:=+libX11 + TITLE:=xwd + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xwd/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin +endef + +$(eval $(call BuildPackage,xwd)) diff --git a/Xorg/xorg/data/xbitmaps/Makefile b/Xorg/xorg/data/xbitmaps/Makefile new file mode 100644 index 0000000000..8ab212c13d --- /dev/null +++ b/Xorg/xorg/data/xbitmaps/Makefile @@ -0,0 +1,48 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xbitmaps +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.5/src/data/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=f9ddd4e70a5375508b3acaf17be0d0ab +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/xbitmaps + SECTION:=xorg-data + CATEGORY:=Xorg + SUBMENU:=data + TITLE:=xbitmaps + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/bitmaps} + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* \ + $(1)/usr/include/X11/bitmaps/ +endef + +define Package/xbitmaps/install + $(INSTALL_DIR) $(1)/usr/include/X11/bitmaps + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/bitmaps/* \ + $(1)/usr/include/X11/bitmaps +endef + +$(eval $(call BuildPackage,xbitmaps)) diff --git a/Xorg/xorg/data/xkbdata/Makefile b/Xorg/xorg/data/xkbdata/Makefile new file mode 100644 index 0000000000..4157539d18 --- /dev/null +++ b/Xorg/xorg/data/xkbdata/Makefile @@ -0,0 +1,64 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xkbdata +PKG_RELEASE:=2 +PKG_VERSION:=1.0.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/data/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=9bf179be9a195953dc5f4c15e23ab7f0 + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/xkbdata + SECTION:=xorg-data + CATEGORY:=Xorg + SUBMENU:=data + TITLE:=xkbdata + DEPENDS:=+xkbcomp + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xkbdata/install + $(INSTALL_DIR) $(1)/usr/share/X11/xkb/{rules,types,keycodes,geometry,compat,symbols} + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/X11/xkb/rules/xorg \ + $(1)/usr/share/X11/xkb/rules/base + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/X11/xkb/rules/xorg.lst \ + $(1)/usr/share/X11/xkb/rules/base.lst + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/X11/xkb/types/* \ + $(1)/usr/share/X11/xkb/types/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/X11/xkb/keycodes/{aliases,xfree86} \ + $(1)/usr/share/X11/xkb/keycodes/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/X11/xkb/geometry/pc \ + $(1)/usr/share/X11/xkb/geometry/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/X11/xkb/compat/* \ + $(1)/usr/share/X11/xkb/compat/ + + $(if $(filter y,$(CONFIG_TARGET_omap24xx_n810-gui)), \ + $(INSTALL_DIR) $(1)/usr/share/X11/xkb/symbols/nokia_vndr; \ + $(INSTALL_DATA) ./files/nokia_n810/rx-44 $(1)/usr/share/X11/xkb/symbols/nokia_vndr/; \ + $(INSTALL_DATA) ./files/nokia_n810/su-8w $(1)/usr/share/X11/xkb/symbols/nokia_vndr/; \ + ) +endef + +$(eval $(call BuildPackage,xkbdata)) diff --git a/Xorg/xorg/data/xkbdata/files/nokia_n810/rx-44 b/Xorg/xorg/data/xkbdata/files/nokia_n810/rx-44 new file mode 100644 index 0000000000..3ee1118f3c --- /dev/null +++ b/Xorg/xorg/data/xkbdata/files/nokia_n810/rx-44 @@ -0,0 +1,310 @@ +partial alphanumeric_keys +xkb_symbols "us" { + name[Group1] = "U.S. English"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, backslash, backslash ] }; + key { [ h, H, slash, slash ] }; + key { [ j, J, parenleft, parenleft ] }; + key { [ k, K, parenright, parenright ] }; + key { [ l, L, asterisk, asterisk ] }; + key { [ apostrophe, question, question, question ] }; + + key { [ z, Z, yen, yen ] }; + key { [ x, X, asciicircum, asciicircum ] }; + key { [ c, C, asciitilde, asciitilde ] }; + key { [ v, V, percent, percent ] }; + key { [ b, B, ampersand, ampersand ] }; + key { [ n, N, dollar, dollar ] }; + key { [ m, M, EuroSign, EuroSign ] }; + key { [ semicolon, colon, sterling, sterling ] }; + key { [ minus, underscore, underscore, underscore ] }; + key { [ plus, equal, equal, equal ] }; + + key { [ comma, less, comma, less ] }; + key { [ period, greater, period, greater ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "fisenoda" { + name[Group1] = "Finnish/Swedish/Norwegian/Danish"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, asterisk, asterisk ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ aring, Aring, question, question ] }; + + key { [ z, Z, EuroSign, EuroSign ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, percent, percent ] }; + key { [ v, V, ampersand, ampersand ] }; + key { [ b, B, plus, plus ] }; + key { [ n, N, less, less ] }; + key { [ m, M, greater, greater ] }; + key { type="EIGHT_LEVEL", [ oslash, Oslash, equal, equal, odiaeresis, Odiaeresis, equal, equal ] }; + key { type="EIGHT_LEVEL", [ ae, AE, apostrophe, apostrophe, adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; + key { [ minus, underscore, underscore, underscore ] }; + + key { [ comma, semicolon, comma, semicolon ] }; + key { [ period, colon, period, colon ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "ptes" { + name[Group1] = "Portuguese/Spanish"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, asterisk, asterisk ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ dead_acute, dead_grave, dead_diaeresis, dead_diaeresis ] }; + + key { [ z, Z, EuroSign, EuroSign ] }; + key { [ x, X, percent, percent ] }; + key { [ c, C, ampersand, ampersand ] }; + key { [ v, V, exclamdown, exclamdown ] }; + key { [ b, B, apostrophe, apostrophe ] }; + key { [ n, N, plus, plus ] }; + key { [ m, M, equal, equal ] }; + key { [ ccedilla, Ccedilla, questiondown, questiondown ] }; + key { [ ntilde, Ntilde, question, question ] }; + key { [ dead_tilde, dead_circumflex, dead_circumflex, dead_circumflex ] }; + + key { [ comma, semicolon, minus, minus ] }; + key { [ period, colon, underscore, underscore ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "fr" { + name[Group1] = "French"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, 1, 1 ] }; + key { [ z, Z, 2, 2 ] }; + + key { [ q, Q, at, at ] }; + key { [ s, S, percent, percent ] }; + key { [ d, D, ecircumflex, Ecircumflex ] }; + key { [ f, F, eacute, Eacute ] }; + key { [ g, G, egrave, Egrave ] }; + key { [ h, H, oe, OE ] }; + key { [ j, J, parenleft, parenleft ] }; + key { [ k, K, parenright, parenright ] }; + key { [ l, L, agrave, Agrave ] }; + key { [ m, M, ugrave, Ugrave ] }; + + key { [ w, w, EuroSign, EuroSign ] }; + key { [ x, X, numbersign, numbersign ] }; + key { [ c, C, ccedilla, Ccedilla ] }; + key { [ v, V, plus, plus ] }; + key { [ b, B, equal, equal ] }; + key { [ n, N, quotedbl, quotedbl ] }; + key { [ comma, question, backslash, backslash ] }; + key { [ semicolon, period, minus, minus ] }; + key { [ colon, slash, underscore, underscore ] }; + key { [ apostrophe, apostrophe, mu, mu ] }; + + key { [ less, greater, less, greater ] }; + key { [ exclam, section, asterisk, asterisk ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "de" { + name[Group1] = "German"; + + include "nokia_vndr/rx-44(base)" + + key { [ z, Z, 6, 6 ] }; + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, percent, percent ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ udiaeresis, Udiaeresis, question, question ] }; + + key { [ y, Y, EuroSign, EuroSign ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, asterisk, asterisk ] }; + key { [ v, V, ampersand, ampersand ] }; + key { [ b, B, plus, plus ] }; + key { [ n, N, less, less ] }; + key { [ m, M, greater, greater ] }; + key { [ odiaeresis, Odiaeresis, equal, equal ] }; + key { [ adiaeresis, Adiaeresis, apostrophe, apostrophe ] }; + key { [ minus, underscore, ssharp, ssharp ] }; + + key { [ comma, semicolon, comma, semicolon ] }; + key { [ period, colon, period, colon ] }; +}; + + +// Levels 5-8 are Russian, levels 1-4 US English, for shortcut reasons. +partial alphanumeric_keys +xkb_symbols "ru" { + name[Group1] = "Russian"; + + include "nokia_vndr/rx-44(base)" + + key { type="EIGHT_LEVEL", [ q, Q, 1, 1, Cyrillic_shorti, Cyrillic_SHORTI, 1, 1 ] }; + key { type="EIGHT_LEVEL", [ w, W, 2, 2, Cyrillic_tse, Cyrillic_TSE, 2, 2 ] }; + key { type="EIGHT_LEVEL", [ e, E, 3, 3, Cyrillic_u, Cyrillic_U, 3, 3 ] }; + key { type="EIGHT_LEVEL", [ r, R, 4, 4, Cyrillic_ka, Cyrillic_KA, 4, 4 ] }; + key { type="EIGHT_LEVEL", [ t, T, 5, 5, Cyrillic_ie, Cyrillic_IE, 5, 5 ] }; + key { type="EIGHT_LEVEL", [ y, Y, 6, 6, Cyrillic_en, Cyrillic_EN, 6, 6 ] }; + key { type="EIGHT_LEVEL", [ u, U, 7, 7, Cyrillic_ghe, Cyrillic_GHE, 7, 7 ] }; + key { type="EIGHT_LEVEL", [ i, I, 8, 8, Cyrillic_sha, Cyrillic_SHA, 8, 8 ] }; + key { type="EIGHT_LEVEL", [ o, O, 9, 9, Cyrillic_shcha, Cyrillic_SHCHA, 9, 9 ] }; + key { type="EIGHT_LEVEL", [ p, P, 0, 0, Cyrillic_ze, Cyrillic_ZE, 0, 0 ] }; + + key { type="EIGHT_LEVEL", [ a, A, exclam, exclam, Cyrillic_ef, Cyrillic_EF, exclam, exclam ] }; + key { type="EIGHT_LEVEL", [ s, S, quotedbl, quotedbl, Cyrillic_yeru, Cyrillic_YERU, quotedbl, quotedbl ] }; + key { type="EIGHT_LEVEL", [ d, D, at, at, Cyrillic_ve, Cyrillic_VE, at, at ] }; + key { type="EIGHT_LEVEL", [ f, F, numbersign, numbersign, Cyrillic_a, Cyrillic_A, numbersign, numbersign ] }; + key { type="EIGHT_LEVEL", [ g, G, backslash, backslash, Cyrillic_pe, Cyrillic_PE, backslash, backslash ] }; + key { type="EIGHT_LEVEL", [ h, H, slash, slash, Cyrillic_er, Cyrillic_ER, slash, slash ] }; + key { type="EIGHT_LEVEL", [ j, J, parenleft, parenleft, Cyrillic_o, Cyrillic_O, parenleft, parenleft ] }; + key { type="EIGHT_LEVEL", [ k, K, parenright, parenright, Cyrillic_el, Cyrillic_EL, parenright, parenright ] }; + key { type="EIGHT_LEVEL", [ l, L, colon, colon, Cyrillic_de, Cyrillic_DE, colon, colon ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon, Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon, Cyrillic_zhe, Cyrillic_ZHE, semicolon, semicolon ] }; + + key { type="EIGHT_LEVEL", [ z, Z, underscore, underscore, Cyrillic_ya, Cyrillic_YA, minus, minus ] }; + key { type="EIGHT_LEVEL", [ x, X, percent, percent, Cyrillic_che, Cyrillic_CHE, percent, percent ] }; + key { type="EIGHT_LEVEL", [ c, C, 0x1002116, 0x1002116, Cyrillic_es, Cyrillic_ES, 0x1002116, 0x1002116 ] }; + key { type="EIGHT_LEVEL", [ v, V, equal, equal, Cyrillic_em, Cyrillic_EM, equal, equal ] }; + key { type="EIGHT_LEVEL", [ b, B, ampersand, ampersand, Cyrillic_i, Cyrillic_I, ampersand, ampersand ] }; + key { type="EIGHT_LEVEL", [ n, N, asterisk, asterisk, Cyrillic_te, Cyrillic_TE, asterisk, asterisk ] }; + key { type="EIGHT_LEVEL", [ m, M, apostrophe, apostrophe, Cyrillic_softsign, Cyrillic_SOFTSIGN, apostrophe, apostrophe ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_be, Cyrillic_BE, minus, minus, Cyrillic_be, Cyrillic_BE, minus, minus ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_be, Cyrillic_BE, minus, minus, Cyrillic_be, Cyrillic_BE, minus, minus ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_yu, Cyrillic_YU, question, question, Cyrillic_yu, Cyrillic_YU, question, question ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_yu, Cyrillic_YU, question, question, Cyrillic_yu, Cyrillic_YU, question, question ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN, Cyrillic_ha, Cyrillic_HA, Cyrillic_hardsign, Cyrillic_HARDSIGN ] }; + + key { type="EIGHT_LEVEL", [ period, comma, period, comma, period, comma, period, comma ] }; + key { type="EIGHT_LEVEL", [ period, comma, period, comma, period, comma, period, comma ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO, Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO ] }; + key { type="EIGHT_LEVEL", [ Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO, Cyrillic_e, Cyrillic_E, Cyrillic_io, Cyrillic_IO ] }; +}; + + + +partial alphanumeric_keys +xkb_symbols "it" { + name[Group1] = "Italian"; + + include "nokia_vndr/rx-44(base)" + + key { [ a, A, exclam, exclam ] }; + key { [ s, S, quotedbl, quotedbl ] }; + key { [ d, D, at, at ] }; + key { [ f, F, numbersign, numbersign ] }; + key { [ g, G, asterisk, asterisk ] }; + key { [ h, H, backslash, backslash ] }; + key { [ j, J, slash, slash ] }; + key { [ k, K, parenleft, parenleft ] }; + key { [ l, L, parenright, parenright ] }; + key { [ apostrophe, question, igrave, Igrave ] }; + + key { [ z, Z, EuroSign, EuroSign ] }; + key { [ x, X, asciitilde, asciitilde ] }; + key { [ c, C, ampersand, ampersand ] }; + key { [ v, V, equal, equal ] }; + key { [ b, B, less, less ] }; + key { [ n, N, greater, greater ] }; + key { [ m, M, plus, plus ] }; + key { [ eacute, Eacute, ograve, Ograve ] }; + key { [ egrave, Egrave, agrave, Agrave ] }; + key { [ minus, underscore, ugrave, Ugrave ] }; + + key { [ comma, semicolon, comma, semicolon ] }; + key { [ period, colon, period, colon ] }; +}; + +partial default alphanumeric_keys +xkb_symbols "base" { + key { [ q, Q, 1, 1 ] }; + key { [ w, W, 2, 2 ] }; + key { [ e, E, 3, 3 ] }; + key { [ r, R, 4, 4 ] }; + key { [ t, T, 5, 5 ] }; + key { [ y, Y, 6, 6 ] }; + key { [ u, U, 7, 7 ] }; + key { [ i, I, 8, 8 ] }; + key { [ o, O, 9, 9 ] }; + key { [ p, P, 0, 0 ] }; + key { [ BackSpace, BackSpace, BackSpace, BackSpace ] }; + + // broken UI spec. + key { [ KP_Enter, KP_Enter, KP_Enter, KP_Enter ] }; + + key { [ Multi_key, Multi_key, Multi_key, Multi_key ] }; + key { [ Shift_L, Shift_L, Shift_L, Shift_L ] }; +// key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] }; + key { [ ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift, ISO_Level3_Shift ] }; + key { [ space, space, space, space ] }; + key { [ Control_R, Control_R, Control_R, Control_R ] }; + key { [ Tab, Tab, Tab, Tab ] }; + + modifier_map Shift { Shift_L }; + modifier_map Mod5 { ISO_Level3_Shift }; + modifier_map Control { Control_R }; + + key { [ Return ] }; + key { [ Up ] }; + key { [ Down ] }; + key { [ Left ] }; + key { [ Right ] }; + + key { [ Escape ] }; + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F10 ] }; + key { [ F11 ] }; + key { [ F12 ] }; + + // generated from the headset, must always be in the map. + key { [ XF86Phone ] }; +}; diff --git a/Xorg/xorg/data/xkbdata/files/nokia_n810/su-8w b/Xorg/xorg/data/xkbdata/files/nokia_n810/su-8w new file mode 100644 index 0000000000..8292db1a93 --- /dev/null +++ b/Xorg/xorg/data/xkbdata/files/nokia_n810/su-8w @@ -0,0 +1,482 @@ +partial alphanumeric_keys default +xkb_symbols "no" { + name[Group1]= "Norwegian/Danish"; + + include "nokia_vndr/su-8w(base)" + + key { [ 1, exclam, dead_circumflex ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, EuroSign ] }; + key { [ 4, currency, dollar ] }; + key { [ 5, percent, sterling ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ dead_acute, dead_grave, backslash ] }; + + key { [ q, Q, dead_circumflex ] }; + key { [ w, W, at ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, dollar ] }; + key { [ t, T, sterling ] }; + key { [ y, Y ] }; + key { [ u, U, braceleft ] }; + key { [ i, I, bracketleft ] }; + key { [ o, O, bracketright ] }; + key { [ p, P, braceright ] }; + key { [ aring, Aring ] }; + key { [ ssharp, ssharp, backslash ] }; + + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L ] }; + key { [ oslash, Ooblique ] }; + key { [ ae, AE ] }; + + key { [ z, Z ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ comma, semicolon, less ] }; + key { [ period, colon, greater ] }; + key { [ minus, underscore, dead_diaeresis ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "no_nodeadkeys" { + name[Group1] = "Norwegian/Danish (no dead keys)"; + + include "nokia_vndr/su-8w(no)" + + key { [ 1, exclam, asciicircum ] }; + key { [ acute, grave, backslash ] }; + key { [ q, Q, asciicircum ] }; +}; + +partial alphanumeric_keys default +xkb_symbols "dk" { + include "nokia_vndr/su-8w(no)" +}; + +partial alphanumeric_keys default +xkb_symbols "dk_nodeadkeys" { + include "nokia_vndr/su-8w(no_nodeadkeys)" +}; + + + +partial alphanumeric_keys default +xkb_symbols "de" { + name[Group1]= "German"; + include "nokia_vndr/su-8w(base)" + + key { [ 1, exclam, dead_circumflex ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, EuroSign ] }; + key { [ 4, currency, dollar ] }; + key { [ 5, percent, sterling ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ dead_acute, dead_grave, backslash ] }; + + key { [ q, Q, dead_circumflex ] }; + key { [ w, W, at ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, dollar ] }; + key { [ t, T, sterling ] }; + key { [ z, Z ] }; + key { [ u, U, braceleft ] }; + key { [ i, I, bracketleft ] }; + key { [ o, O, bracketright ] }; + key { [ p, P, braceright ] }; + key { [ udiaeresis, Udiaeresis ] }; + key { [ ssharp, ssharp, backslash ] }; + + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L ] }; + key { [ odiaeresis, Odiaeresis ] }; + key { [ adiaeresis, Adiaeresis ] }; + + key { [ y, Y ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ comma, semicolon, less ] }; + key { [ period, colon, greater ] }; + // XXX Inexplicably, the diaeresis is dead on other layouts, but not + // German. Go figure. + key { [ minus, underscore, diaeresis ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "de_nodeadkeys" { + name[Group1] = "German (no dead keys)"; + + include "nokia_vndr/su-8w(de)" + + key { [ 1, exclam, asciicircum ] }; + key { [ acute, grave, backslash ] }; + key { [ q, Q, asciicircum ] }; +}; + + + +partial alphanumeric_keys default +xkb_symbols "se" { + name[Group1]= "Finnish/Swedish"; + + include "nokia_vndr/su-8w(base)" + + key { [ 1, exclam, dead_circumflex ] }; + key { [ 2, quotedbl, at ] }; + key { [ 3, numbersign, EuroSign ] }; + key { [ 4, currency, dollar ] }; + key { [ 5, percent, sterling ] }; + key { [ 6, ampersand ] }; + key { [ 7, slash, braceleft ] }; + key { [ 8, parenleft, bracketleft ] }; + key { [ 9, parenright, bracketright ] }; + key { [ 0, equal, braceright ] }; + key { [ plus, question ] }; + key { [ dead_acute, dead_grave, backslash ] }; + + key { [ q, Q, dead_circumflex ] }; + key { [ w, W, at ] }; + key { [ e, E, EuroSign ] }; + key { [ r, R, dollar ] }; + key { [ t, T, sterling ] }; + key { [ y, Y ] }; + key { [ u, U, braceleft ] }; + key { [ i, I, bracketleft ] }; + key { [ o, O, bracketright ] }; + key { [ p, P, braceright ] }; + key { [ aring, Aring ] }; + key { [ ssharp, ssharp, backslash ] }; + + key { [ a, A ] }; + key { [ s, S ] }; + key { [ d, D ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L ] }; + key { [ odiaeresis, Odiaeresis ] }; + key { [ adiaeresis, Adiaeresis ] }; + + key { [ z, Z ] }; + key { [ x, X ] }; + key { [ c, C ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N ] }; + key { [ m, M ] }; + key { [ comma, semicolon, less ] }; + key { [ period, colon, greater ] }; + key { [ minus, underscore, dead_diaeresis ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "se_nodeadkeys" { + name[Group1] = "Finnish/Swedish (no dead keys)"; + + include "nokia_vndr/su-8w(se)" + + key { [ 1, exclam, asciicircum ] }; + key { [ acute, grave, backslash ] }; + key { [ q, Q, asciicircum ] }; + key { [ minus, underscore, diaeresis ] }; +}; + +partial alphanumeric_keys default +xkb_symbols "fi" { + include "nokia_vndr/su-8w(se)" +}; + +xkb_symbols "fi_nodeadkeys" { + include "nokia_vndr/su-8w(se_nodeadkeys)" +}; + + + +// Russian layout on first two levels, US layout on third and fourth. +partial alphanumeric_keys default +xkb_symbols "ru" { + name[Group1]= "Russian"; + + include "nokia_vndr/su-8w(base)" + + // XXX Would be nice if this actually generated a tilde. + key { [ Cyrillic_io, Cyrillic_IO, grave ] }; + key { [ 1, exclam, exclam, exclam ] }; + key { [ 2, at, quotedbl, at ] }; + key { [ 3, numbersign, numbersign, numbersign ] }; + key { [ 4, dollar, currency, dollar ] }; + key { [ 5, percent, percent, percent ] }; + key { [ 6, dead_circumflex, ampersand, asciicircum ] }; + key { [ 7, ampersand, slash, ampersand ] }; + key { [ 8, asterisk, parenleft, asterisk ] }; + key { [ 9, parenleft, parenright, parenleft ] }; + key { [ 0, parenright, equal, parenright ] }; + key { [ minus, underscore, plus, question ] }; + key { [ equal, plus, equal, plus ] }; + + key { [ Cyrillic_shorti, Cyrillic_SHORTI, q, Q ] }; + key { [ Cyrillic_tse, Cyrillic_TSE, w, W ] }; + key { [ Cyrillic_u, Cyrillic_U, e, E ] }; + key { [ Cyrillic_ka, Cyrillic_KA, r, R ] }; + key { [ Cyrillic_ie, Cyrillic_IE, t, T ] }; + key { [ Cyrillic_en, Cyrillic_EN, y, Y ] }; + key { [ Cyrillic_ghe, Cyrillic_GHE, u, U ] }; + key { [ Cyrillic_sha, Cyrillic_SHA, i, I ] }; + key { [ Cyrillic_shcha, Cyrillic_SHCHA, o, O ] }; + key { [ Cyrillic_ze, Cyrillic_ZE, p, P ] }; + key { [ Cyrillic_ha, Cyrillic_HA, bracketleft, braceleft ] }; + key { [ Cyrillic_hardsign, Cyrillic_HARDSIGN, bracketright, braceright ] }; + + key { [ Cyrillic_ef, Cyrillic_EF, a, A ] }; + key { [ Cyrillic_yeru, Cyrillic_YERU, s, S ] }; + key { [ Cyrillic_ve, Cyrillic_VE, d, D ] }; + key { [ Cyrillic_a, Cyrillic_A, f, F ] }; + key { [ Cyrillic_pe, Cyrillic_PE, g, G ] }; + key { [ Cyrillic_er, Cyrillic_ER, h, H ] }; + key { [ Cyrillic_o, Cyrillic_O, j, J ] }; + key { [ Cyrillic_el, Cyrillic_EL, k, K ] }; + key { [ Cyrillic_de, Cyrillic_DE, l, L ] }; + key { [ Cyrillic_zhe, Cyrillic_ZHE, semicolon, colon ] }; + key { [ Cyrillic_e, Cyrillic_E, apostrophe, quotedbl ] }; + + key { [ Cyrillic_ya, Cyrillic_YA, z, Z ] }; + key { [ Cyrillic_che, Cyrillic_CHE, x, X ] }; + key { [ Cyrillic_es, Cyrillic_ES, c, C ] }; + key { [ Cyrillic_em, Cyrillic_EM, v, V ] }; + key { [ Cyrillic_i, Cyrillic_I, b, B ] }; + key { [ Cyrillic_te, Cyrillic_TE, n, N ] }; + key { [ Cyrillic_softsign, Cyrillic_SOFTSIGN, m, M ] }; + key { [ Cyrillic_be, Cyrillic_BE, comma, less ] }; + key { [ Cyrillic_yu, Cyrillic_YU, period, greater ] }; + key { [ slash, question, slash, question ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "ru_nodeadkeys" { + name[Group1] = "Russian - no dead keys"; + + include "nokia_vndr/su-8w(ru)" + + key { [ 6, asciicircum, ampersand, asciicircum ] }; +}; + + + +partial alphanumeric_keys default +xkb_symbols "us" { + name[Group1]= "U.S. English - International"; + + include "nokia_vndr/su-8w(base)" + + // I can't believe it's not us(intl). + key { [ 1, exclam, exclamdown ] }; + key { [ 2, at, twosuperior ] }; + key { [ 3, numbersign ] }; + key { [ 4, dollar, currency ] }; + key { [ 5, percent, EuroSign ] }; + key { [ 6, asciicircum, onequarter ] }; + key { [ 7, ampersand, onehalf ] }; + key { [ 8, asterisk, threequarters ] }; + key { [ 9, parenleft, leftsinglequotemark ] }; + key { [ 0, parenright, rightsinglequotemark ] }; + key { [ minus, underscore, yen ] }; + key { [ equal, plus, multiply ] }; + + key { [ q, Q, adiaeresis, Adiaeresis ] }; + key { [ w, W, aring, Aring ] }; + key { [ e, E, eacute, Eacute ] }; + key { [ r, R, registered ] }; + key { [ t, T, thorn, THORN ] }; + key { [ y, Y, udiaeresis, Udiaeresis ] }; + key { [ u, U, uacute, Uacute ] }; + key { [ i, I, iacute, Iacute ] }; + key { [ o, O, oacute, Oacute ] }; + key { [ p, P, odiaeresis, Odiaeresis ] }; + key { [ bracketleft, braceleft, guillemotleft ] }; + key { [ bracketright, braceright, guillemotright ] }; + + key { [ a, A, aacute, Aacute ] }; + key { [ s, S, ssharp, section ] }; + key { [ d, D, eth, ETH ] }; + key { [ f, F ] }; + key { [ g, G ] }; + key { [ h, H ] }; + key { [ j, J ] }; + key { [ k, K ] }; + key { [ l, L, oslash, Ooblique ] }; + key { [ semicolon, colon, paragraph, degree ] }; + // XXX Not entirely sure if fourth level is quotedbl or diaeresis. + // The former makes a lot more sense. + key { [ dead_acute, dead_diaeresis, apostrophe, quotedbl ] }; + + key { [ z, Z, ae, AE ] }; + key { [ x, X ] }; + key { [ c, C, copyright ] }; + key { [ v, V ] }; + key { [ b, B ] }; + key { [ n, N, ntilde, Ntilde ] }; + key { [ m, M, mu ] }; + key { [ comma, less, ccedilla, Ccedilla ] }; + key { [ period, greater ] }; + key { [ slash, question, questiondown ] }; + + include "level3(ralt_switch)" +}; + +partial alphanumeric_keys +xkb_symbols "us_nodeadkeys" { + name[Group1] = "U.S. English - no dead keys"; + + include "nokia_vndr/su-8w(us_intl)" + + // XXX Not entirely sure if second level is quotedbl or diaeresis. + // The former makes a lot more sense. + key { [ apostrophe, quotedbl, dead_acute, dead_diaeresis ] }; +}; + + + +partial default alphanumeric_keys +xkb_symbols "base" { + // forked from from pc(pc105); madness. + key { [ Escape ] }; + + // the extra key on most European keyboards + key { [ less, greater, bar, brokenbar ] }; + + // these keys are common to all layouts + key { [ backslash, bar ] }; + key { [ space ] }; + + key { [ BackSpace ] }; + + key { [ Tab, ISO_Left_Tab ] }; + key { [ Return ] }; + // we don't ever generate this key, but the VKB needs it always. + key { [ KP_Enter ] }; + // generated from the headset, must always be in the map. + key { [ XF86Phone ] }; + + key { [ Caps_Lock ] }; + + key { [ Num_Lock, Pointer_EnableKeys ] }; + + key { [ Shift_L ] }; + key { [ Control_L ] }; + key { [ Alt_L, Meta_L ] }; + key { [ Super_L ] }; + + key { [ Shift_R ] }; + key { [ Control_R ] }; + key { [ Alt_R, Meta_R ] }; + key { [ Super_R ] }; + + key

{ [ Menu ] }; + + key { [ F1 ] }; + key { [ F2 ] }; + key { [ F3 ] }; + key { [ F4 ] }; + key { [ F5 ] }; + key { [ F6 ] }; + key { [ F7 ] }; + key { [ F8 ] }; + key { [ F9 ] }; + key { [ F11 ] }; + key { [ F10 ] }; + key { [ F12 ] }; + + // begin modifier mappings + modifier_map Shift { Shift_L, Shift_R }; + modifier_map Lock { Caps_Lock, ISO_Lock }; + modifier_map Control{ Control_L, Control_R }; + modifier_map Mod2 { Num_Lock }; + + // Fake keys for virtual<->real modifiers mapping + key { [ ISO_Level3_Shift ] }; + key { [ Mode_switch ] }; + modifier_map Mod5 { , }; + + key { [ NoSymbol, Alt_L ] }; + modifier_map Mod1 { , }; + + key { [ NoSymbol, Meta_L ] }; + modifier_map Mod1 { }; + + key { [ NoSymbol, Super_L ] }; + modifier_map Mod4 { }; + + key { [ NoSymbol, Hyper_L ] }; + modifier_map Mod4 { }; + + key { [ Insert ] }; + key { [ Delete ] }; + key { [ End ] }; + key { [ Up ] }; + key { [ Left ] }; + key { [ Down ] }; + key { [ Right ] }; + + // True for all layouts (except for ru). + key { [ grave, asterisk, asciitilde ] }; + + // SU-8W uses 140 for Home, not the normal keycode. Very useful. + key { [ NoSymbol ] }; + // Ditto LWIN/RWIN and Page Up/Page Down. + key { [ none ] }; + key { [ NoSymbol ] }; + + // The LWIN & RWIN keys correspond to the 'select left' and + // 'select right' keys. + key { [ Prior ] }; + key { [ Next ] }; + + key { [ Home ] }; + key { [ Menu ] }; + key { [ XF86Mail ] }; + + // Power button. + key { [ Execute ] }; +}; diff --git a/Xorg/xorg/data/xkeyboard-config/Makefile b/Xorg/xorg/data/xkeyboard-config/Makefile new file mode 100644 index 0000000000..dc6079c333 --- /dev/null +++ b/Xorg/xorg/data/xkeyboard-config/Makefile @@ -0,0 +1,40 @@ +# +# Copyright (C) 2008-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xkeyboard-config +PKG_VERSION:=1.7 +PKG_RELEASE:=2 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=http://xlibs.freedesktop.org/xkbdesc/ +PKG_MD5SUM:=d351c0109fac166edcedad32d1b0e38e + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/xkeyboard-config + SECTION:=xorg-data + CATEGORY:=Xorg + SUBMENU:=data + TITLE:=xkeyboard-config + DEPENDS:=+xkbcomp + URL:=http://freedesktop.org/wiki/Software/XKeyboardConfig +endef + +define Package/xkeyboard-config/install + $(INSTALL_DIR) $(1)/usr/share/X11 + $(CP) $(PKG_INSTALL_DIR)/usr/share/X11/xkb $(1)/usr/share/X11/ +endef + +$(eval $(call RequireCommand,intltool-update, \ + $(PKG_NAME) requires intltool installed on the host-system. \ +)) + +$(eval $(call BuildPackage,xkeyboard-config)) diff --git a/Xorg/xorg/driver/xf86-input-evdev/Makefile b/Xorg/xorg/driver/xf86-input-evdev/Makefile new file mode 100644 index 0000000000..99cd18cbbe --- /dev/null +++ b/Xorg/xorg/driver/xf86-input-evdev/Makefile @@ -0,0 +1,43 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86-input-evdev +PKG_RELEASE:=2 +PKG_VERSION:=2.3.0 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=21dac6461379d67ee3b333c77f63e7bf + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +PKG_BUILD_DEPENDS:=randrproto inputproto xproto + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + +define Package/xf86-input-evdev + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg + TITLE:=xf86-input-evdev + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xf86-input-evdev/install + $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/input + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/input/evdev_drv.so \ + $(1)/usr/lib/xorg/modules/input/ +endef + +$(eval $(call BuildPackage,xf86-input-evdev)) diff --git a/Xorg/xorg/driver/xf86-input-keyboard/Makefile b/Xorg/xorg/driver/xf86-input-keyboard/Makefile new file mode 100644 index 0000000000..39110ff283 --- /dev/null +++ b/Xorg/xorg/driver/xf86-input-keyboard/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2009-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86-input-keyboard +PKG_VERSION:=1.4.0 +PKG_RELEASE:=2 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=fd17158ffeacecc8cc670604460cb98b + +PKG_BUILD_DEPENDS:=randrproto inputproto kbproto xproto +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + +define Package/xf86-input-keyboard + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg + TITLE:=xf86-input-keyboard + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xf86-input-keyboard/install + $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/input + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/input/kbd_drv.so \ + $(1)/usr/lib/xorg/modules/input/ +endef + +$(eval $(call BuildPackage,xf86-input-keyboard)) diff --git a/Xorg/xorg/driver/xf86-input-mouse/Makefile b/Xorg/xorg/driver/xf86-input-mouse/Makefile new file mode 100644 index 0000000000..76b0110688 --- /dev/null +++ b/Xorg/xorg/driver/xf86-input-mouse/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86-input-mouse +PKG_VERSION:=1.5.0 +PKG_RELEASE:=2 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=c58629fddf0782dad5c02da6aeb35521 + +PKG_BUILD_DEPENDS:=randrproto inputproto xproto +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + +define Package/xf86-input-mouse + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg + TITLE:=xf86-input-mouse + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xf86-input-mouse/install + $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/input + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/input/mouse_drv.so \ + $(1)/usr/lib/xorg/modules/input/ +endef + +$(eval $(call BuildPackage,xf86-input-mouse)) diff --git a/Xorg/xorg/driver/xf86-video-ati/Makefile b/Xorg/xorg/driver/xf86-video-ati/Makefile new file mode 100644 index 0000000000..7b3f2724d4 --- /dev/null +++ b/Xorg/xorg/driver/xf86-video-ati/Makefile @@ -0,0 +1,73 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=xf86 +PKG_NAME:=xf86-video-ati +PKG_RELEASE:=1 +PKG_VERSION:=6.12.4 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/ +PKG_MD5SUM:=e662348f6f957fcedf52818d668ab9f5 + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + +define Package/xf86-video-ati + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg @TARGET_x86 @BROKEN + TITLE:=xf86-video-ati + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ + -I$(STAGING_DIR)/usr/include/X11/ \ + $(TARGET_CPPFLAGS) + +EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS) + +acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1)))) + +CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \ + sdkdir=$(STAGING_DIR) + +define Build/Configure + (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ + if [ -x $(CONFIGURE_CMD) ]; then \ + $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ + $(CONFIGURE_VARS) \ + $(CONFIGURE_CMD) \ + $(CONFIGURE_ARGS_XTRA) \ + $(CONFIGURE_ARGS) \ + CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\ + fi \ + ) +endef + +define Build/Compile + make -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf +endef + +define Package/xf86-video-ati/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,xf86-video-ati)) diff --git a/Xorg/xorg/driver/xf86-video-fbdev/Makefile b/Xorg/xorg/driver/xf86-video-fbdev/Makefile new file mode 100644 index 0000000000..3b68ad5594 --- /dev/null +++ b/Xorg/xorg/driver/xf86-video-fbdev/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86-video-fbdev +PKG_VERSION:=0.4.1 +PKG_RELEASE:=2 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=79ce1eb9f9d2ed56de70d8e06cb767d9 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + +define Package/xf86-video-fbdev + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg +libpciaccess + TITLE:=xf86-video-fbdev + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-pciaccess \ + ) +endef + +define Package/xf86-video-fbdev/install + $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/*.so \ + $(1)/usr/lib/xorg/modules/drivers +endef + +$(eval $(call BuildPackage,xf86-video-fbdev)) diff --git a/Xorg/xorg/driver/xf86-video-geode/Makefile b/Xorg/xorg/driver/xf86-video-geode/Makefile new file mode 100644 index 0000000000..b53ed85bf6 --- /dev/null +++ b/Xorg/xorg/driver/xf86-video-geode/Makefile @@ -0,0 +1,44 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86-video-geode +PKG_RELEASE:=1 +PKG_VERSION:=2.11.6 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=3ff0dfb4b3bd8872c6efb70371cb6b98 + +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_BUILD_DEPENDS:=randrproto renderproto videoproto xextproto xf86dgaproto \ + xproto fontsproto +PKG_INSTALL:=1 + + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + +define Package/xf86-video-geode + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg +libpciaccess @TARGET_x86 + TITLE:=xf86-video-geode + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xf86-video-geode/install + $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/*.so \ + $(1)/usr/lib/xorg/modules/drivers/ +endef + +$(eval $(call BuildPackage,xf86-video-geode)) diff --git a/Xorg/xorg/driver/xf86-video-intel/Makefile b/Xorg/xorg/driver/xf86-video-intel/Makefile new file mode 100644 index 0000000000..f1c71104d7 --- /dev/null +++ b/Xorg/xorg/driver/xf86-video-intel/Makefile @@ -0,0 +1,76 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=xf86 +PKG_NAME:=xf86-video-intel +PKG_RELEASE:=1 +PKG_VERSION:=2.9.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/ +PKG_BUILD_DEPENDS:=xf86driproto glproto + +PKG_MD5SUM:=8951d0366c16991badb7f9050556f4f3 + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + +define Package/xf86-video-intel + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg @TARGET_x86 + TITLE:=xf86-video-intel + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ + -I$(STAGING_DIR)/usr/include/X11/ \ + -I$(STAGING_DIR)/usr/include/drm \ + $(TARGET_CPPFLAGS) + +EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS) + +acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1)))) + +CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \ + sdkdir=$(STAGING_DIR) + +define Build/Configure + (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ + if [ -x $(CONFIGURE_CMD) ]; then \ + $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ + $(CONFIGURE_VARS) \ + $(CONFIGURE_CMD) \ + $(CONFIGURE_ARGS_XTRA) \ + $(CONFIGURE_ARGS) \ + CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\ + fi \ + ) +endef + +define Build/Compile + make -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf +endef + +define Package/xf86-video-intel/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,xf86-video-intel)) diff --git a/Xorg/xorg/driver/xf86-video-nv/Makefile b/Xorg/xorg/driver/xf86-video-nv/Makefile new file mode 100644 index 0000000000..11bff5f82a --- /dev/null +++ b/Xorg/xorg/driver/xf86-video-nv/Makefile @@ -0,0 +1,73 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=xf86 +PKG_NAME:=xf86-video-nv +PKG_RELEASE:=3 +PKG_VERSION:=2.1.15 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/${PKG_NAME}-$(PKG_VERSION)/ +PKG_MD5SUM:=1b22188bd9012a148206940708b52ea6 + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + +define Package/xf86-video-nv + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg @TARGET_x86 + TITLE:=xf86-video-nv + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +EXTRA_CPPFLAGS= -I$(STAGING_DIR)/usr/include/xorg \ + -I$(STAGING_DIR)/usr/include/X11/ \ + $(TARGET_CPPFLAGS) + +EXTRA_CFLAGS+= $(EXTRA_CPPFLAGS) + +acvar=$(subst -,_,$(subst .,_,$(subst /,_,$(1)))) + +CONFIGURE_VARS +=DRI_CFLAGS="-I$(STAGING_DIR)/usr/include/X11/dri/" ac_cv_file__usr_share_sgml_X11_defs_ent=yes \ + sdkdir=$(STAGING_DIR) + +define Build/Configure + (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ + if [ -x $(CONFIGURE_CMD) ]; then \ + $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ + $(foreach a,dri.h sarea.h dristruct.h exa.h damage.h,export ac_cv_file_$(call acvar,$(STAGING_DIR)/usr/include/xorg/$(a))=yes;) \ + sed -i "s|sdkdir=.*|sdkdir=$(STAGING_DIR)/usr/include/xorg|g" $(PKG_BUILD_DIR)/configure ;\ + $(CONFIGURE_VARS) \ + $(CONFIGURE_CMD) \ + $(CONFIGURE_ARGS_XTRA) \ + $(CONFIGURE_ARGS) \ + CPPFLAGS="$(EXTRA_CPPFLAGS)" ;\ + fi \ + ) +endef + +define Build/Compile + make -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name *a | xargs rm -rf +endef + +define Package/xf86-video-nv/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,xf86-video-nv)) diff --git a/Xorg/xorg/driver/xf86-video-omap/Makefile b/Xorg/xorg/driver/xf86-video-omap/Makefile new file mode 100644 index 0000000000..9b8022563f --- /dev/null +++ b/Xorg/xorg/driver/xf86-video-omap/Makefile @@ -0,0 +1,49 @@ +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86-video-omapfb +PKG_VERSION:=20100810 +PKG_REV:=db636c8436265c3d86c5b8e00785e45d55825c80 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://git.pingu.fi/xf86-video-omapfb +PKG_SOURCE_PROTO:=git +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + +define Package/xf86-video-omapfb + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg + TITLE:=xf86-video-omapfb + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR); ./autogen.sh) + $(call Build/Configure/Default) +endef + +define Package/xf86-video-omapfb/install + $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/*.so \ + $(1)/usr/lib/xorg/modules/drivers +endef + +$(eval $(call BuildPackage,xf86-video-omapfb)) diff --git a/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch b/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch new file mode 100644 index 0000000000..007179f667 --- /dev/null +++ b/Xorg/xorg/driver/xf86-video-omap/patches/001-misc-fixes.patch @@ -0,0 +1,24 @@ +--- + src/omapfb-driver.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- xf86-video-omapfb-20100810.orig/src/omapfb-driver.c ++++ xf86-video-omapfb-20100810/src/omapfb-driver.c +@@ -182,7 +182,7 @@ OMAPFBProbe(DriverPtr drv, int flags) + return FALSE; + + /* FIXME: We don't really want to do it like this... */ +-#define DEFAULT_DEVICE "/dev/fb" ++#define DEFAULT_DEVICE "/dev/fb0" + + for (i = 0; i < numDevSections; i++) { + int fd; +@@ -831,7 +831,7 @@ static XF86ModuleVersionInfo OMAPFBVersR + MODINFOSTRING1, + MODINFOSTRING2, + XORG_VERSION_CURRENT, +- PACKAGE_VERSION_MAJOR, PACKAGE_VERSION_MINOR, PACKAGE_VERSION_PATCHLEVEL, ++ 99, 99, 99, + ABI_CLASS_VIDEODRV, + ABI_VIDEODRV_VERSION, + NULL, diff --git a/Xorg/xorg/driver/xf86-video-vesa/Makefile b/Xorg/xorg/driver/xf86-video-vesa/Makefile new file mode 100644 index 0000000000..d48860db8e --- /dev/null +++ b/Xorg/xorg/driver/xf86-video-vesa/Makefile @@ -0,0 +1,42 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86-video-vesa +PKG_RELEASE:=1 +PKG_VERSION:=2.2.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/driver +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +PKG_MD5SUM:=61a1dc9a22991bd04d0ff98f800775c1 +PKG_BUILD_DEPENDS:=xproto fontsproto randrproto renderproto xextproto +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, xorg-driver.mk) + + +define Package/xf86-video-vesa + SECTION:=xorg-driver + CATEGORY:=Xorg + SUBMENU:=driver + DEPENDS:=+xserver-xorg +libpciaccess @TARGET_x86 + TITLE:=xf86-video-vesa + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xf86-video-vesa/install + $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/drivers + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/drivers/vesa_drv.so \ + $(1)/usr/lib/xorg/modules/drivers/ +endef + +$(eval $(call BuildPackage,xf86-video-vesa)) diff --git a/Xorg/xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch b/Xorg/xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch new file mode 100644 index 0000000000..0ae58f3d3e --- /dev/null +++ b/Xorg/xorg/driver/xf86-video-vesa/patches/010-dont-mess-up-include-paths.patch @@ -0,0 +1,11 @@ +--- a/configure ++++ b/configure +@@ -20787,7 +20787,7 @@ fi + + + CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' +-INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src -I$(prefix)/include' ++INCLUDES="$XORG_INCS -I${sdkdir} "'-I$(top_srcdir)/src' + + + diff --git a/Xorg/xorg/font/encodings/Makefile b/Xorg/xorg/font/encodings/Makefile new file mode 100644 index 0000000000..9ffc949d10 --- /dev/null +++ b/Xorg/xorg/font/encodings/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=encodings +PKG_NAME:=encodings +PKG_RELEASE:=2 +PKG_VERSION:=1.0.2 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=11adda157b03d63fd61d95ad7ef00466 + +include $(INCLUDE_DIR)/package.mk + +define Package/encodings + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=encodings + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.encodings +endef + +define Package/encodings/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/encodings/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.encodings` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (encodings,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,encodings)) + diff --git a/Xorg/xorg/font/font-alias/Makefile b/Xorg/xorg/font/font-alias/Makefile new file mode 100644 index 0000000000..57ec02f95c --- /dev/null +++ b/Xorg/xorg/font/font-alias/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-alias +PKG_RELEASE:=2 +PKG_VERSION:=1.0.1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=c4776b6f0f2ecdb7670b6fe64b5d2a2d + +include $(INCLUDE_DIR)/package.mk + +define Package/font-alias + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-alias + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-alias +endef + +define Package/font-alias/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-alias/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-alias` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-alias,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-alias)) + diff --git a/Xorg/xorg/font/font-bh-75dpi/Makefile b/Xorg/xorg/font/font-bh-75dpi/Makefile new file mode 100644 index 0000000000..e6a547ae4a --- /dev/null +++ b/Xorg/xorg/font/font-bh-75dpi/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-bh-75dpi +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=6e51cd02f4ce32e1393e34ab17a9b211 + +include $(INCLUDE_DIR)/package.mk + +define Package/font-bh-75dpi + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-bh-75dpi + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-bh-75dpi +endef + +define Package/font-bh-75dpi/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-bh-75dpi/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-bh-75dpi` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-bh-75dpi,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-bh-75dpi)) + diff --git a/Xorg/xorg/font/font-cursor-misc/Makefile b/Xorg/xorg/font/font-cursor-misc/Makefile new file mode 100644 index 0000000000..1120f6393a --- /dev/null +++ b/Xorg/xorg/font/font-cursor-misc/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-cursor-misc +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=305fa22cdfefb8f80babd711051a534b + +include $(INCLUDE_DIR)/package.mk + +define Package/font-cursor-misc + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-cursor-misc + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-cursor-misc +endef + +define Package/font-cursor-misc/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-cursor-misc/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-cursor-misc` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-cursor-misc,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-cursor-misc)) + diff --git a/Xorg/xorg/font/font-daewoo-misc/Makefile b/Xorg/xorg/font/font-daewoo-misc/Makefile new file mode 100644 index 0000000000..398563aec0 --- /dev/null +++ b/Xorg/xorg/font/font-daewoo-misc/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-daewoo-misc +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=61f9eab48c619af5494d3e384d8d7d79 + +include $(INCLUDE_DIR)/package.mk + +define Package/font-daewoo-misc + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-daewoo-misc + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-daewoo-misc +endef + +define Package/font-daewoo-misc/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-daewoo-misc/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-daewoo-misc` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-daewoo-misc,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-daewoo-misc)) + diff --git a/Xorg/xorg/font/font-dec-misc/Makefile b/Xorg/xorg/font/font-dec-misc/Makefile new file mode 100644 index 0000000000..107e5442a6 --- /dev/null +++ b/Xorg/xorg/font/font-dec-misc/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-dec-misc +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=284e554db1c64fb7580a06df01444a2b + +include $(INCLUDE_DIR)/package.mk + +define Package/font-dec-misc + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-dec-misc + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-dec-misc +endef + +define Package/font-dec-misc/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-dec-misc/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-dec-misc` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-dec-misc,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-dec-misc)) + diff --git a/Xorg/xorg/font/font-ibm-type1/Makefile b/Xorg/xorg/font/font-ibm-type1/Makefile new file mode 100644 index 0000000000..df6b658cc0 --- /dev/null +++ b/Xorg/xorg/font/font-ibm-type1/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-ibm-type1 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=8e8733051371e2b51123376b49f5d3ea + +include $(INCLUDE_DIR)/package.mk + +define Package/font-ibm-type1 + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-ibm-type1 + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-ibm-type1 +endef + +define Package/font-ibm-type1/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-ibm-type1/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-ibm-type1` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-ibm-type1,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-ibm-type1)) + diff --git a/Xorg/xorg/font/font-isas-misc/Makefile b/Xorg/xorg/font/font-isas-misc/Makefile new file mode 100644 index 0000000000..037bebf96c --- /dev/null +++ b/Xorg/xorg/font/font-isas-misc/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-isas-misc +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=ec709a96b64b497a5cb5658c93bd38dc + +include $(INCLUDE_DIR)/package.mk + +define Package/font-isas-misc + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-isas-misc + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-isas-misc +endef + +define Package/font-isas-misc/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-isas-misc/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-isas-misc` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-isas-misc,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-isas-misc)) + diff --git a/Xorg/xorg/font/font-jis-misc/Makefile b/Xorg/xorg/font/font-jis-misc/Makefile new file mode 100644 index 0000000000..b3073f3807 --- /dev/null +++ b/Xorg/xorg/font/font-jis-misc/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-jis-misc +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=61febb49a71065723a1fba17cbf23c67 + +include $(INCLUDE_DIR)/package.mk + +define Package/font-jis-misc + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-jis-misc + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-jis-misc +endef + +define Package/font-jis-misc/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-jis-misc/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-jis-misc` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-jis-misc,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-jis-misc)) + diff --git a/Xorg/xorg/font/font-micro-misc/Makefile b/Xorg/xorg/font/font-micro-misc/Makefile new file mode 100644 index 0000000000..d8f84dcbe9 --- /dev/null +++ b/Xorg/xorg/font/font-micro-misc/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-micro-misc +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=8c8bffd7540f05caa0dbb4e6e1d6c58e + +include $(INCLUDE_DIR)/package.mk + +define Package/font-micro-misc + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-micro-misc + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-micro-misc +endef + +define Package/font-micro-misc/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-micro-misc/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-micro-misc` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-micro-misc,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-micro-misc)) + diff --git a/Xorg/xorg/font/font-misc-cyrillic/Makefile b/Xorg/xorg/font/font-misc-cyrillic/Makefile new file mode 100644 index 0000000000..2e1d38c294 --- /dev/null +++ b/Xorg/xorg/font/font-misc-cyrillic/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-misc-cyrillic +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=3596907d7a2a99c81d8de99bc4552b6a + +include $(INCLUDE_DIR)/package.mk + +define Package/font-misc-cyrillic + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-misc-cyrillic + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-misc-cyrillic +endef + +define Package/font-misc-cyrillic/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-misc-cyrillic/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-misc-cyrillic` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-misc-cyrillic,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-misc-cyrillic)) + diff --git a/Xorg/xorg/font/font-misc-misc/Makefile b/Xorg/xorg/font/font-misc-misc/Makefile new file mode 100644 index 0000000000..e6aa36b37b --- /dev/null +++ b/Xorg/xorg/font/font-misc-misc/Makefile @@ -0,0 +1,135 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font-base +PKG_NAME:=font-misc-misc +PKG_RELEASE:=1 +PKG_VERSION:=1.0.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=2a57f6188c41d4bc1b88ca3d08ad011d + +include $(INCLUDE_DIR)/package.mk + +define Package/font-misc-misc/Default + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font +endef + +define Package/font-base + $(call Package/font-misc-misc/Default) + DEPENDS:=+xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-base + URL:=http://xorg.freedesktop.org/ +endef + +define Package/font-misc-misc + $(call Package/font-misc-misc/Default) + DEPENDS:=font-base + TITLE:=font-misc-misc + URL:=http://xorg.freedesktop.org/ +endef + + +CONFIGURE_ARGS_XTRA+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs rm +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR)/$(CONFIGURE_PATH); \ + if [ -x $(CONFIGURE_CMD) ]; then \ + $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ + $(CONFIGURE_VARS) \ + $(CONFIGURE_CMD) \ + $(CONFIGURE_ARGS_XTRA) \ + $(CONFIGURE_ARGS) ;\ + fi \ + ) +endef + +define Build/InstallDev + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Package/font-base/install + $(INSTALL_DIR) $(1)/usr/lib/X11/fonts/misc/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/X11/fonts/misc/6x13* $(1)/usr/lib/X11/fonts/misc/ + $(CP) files/fonts.dir.font-base $(1)/usr/lib/X11/fonts/misc/ +endef + +define Package/font-misc-misc/install + $(INSTALL_DIR) $(1)/usr/lib/X11/fonts/misc/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/X11/fonts/misc/* $(1)/usr/lib/X11/fonts/misc/ + rm $(1)/usr/lib/X11/fonts/misc/6x13* + $(CP) files/fonts.dir.font-misc-misc $(1)/usr/lib/X11/fonts/misc/ +endef + +define Package/font-base/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-base` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +define Package/font-misc-misc/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-misc-misc` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +# FIXME: replace with native versions +$(eval $(call RequireCommand,mkfontscale, \ + Please install mkfontscale (usually in xfonts-utils) \ +)) +$(eval $(call RequireCommand,mkfontdir, \ + Please install mkfontdir (usually in xfonts-utils) \ +)) + +$(eval $(call BuildPackage,font-misc-misc)) +$(eval $(call BuildPackage,font-base)) + + diff --git a/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-base b/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-base new file mode 100644 index 0000000000..0158265a15 --- /dev/null +++ b/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-base @@ -0,0 +1,9 @@ +6x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso8859-15 +6x13.pcf.gz -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1 +6x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso8859-15 +6x13B.pcf.gz -misc-fixed-bold-r-semicondensed--13-120-75-75-c-60-iso10646-1 +6x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-1 +6x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso8859-15 +6x13O.pcf.gz -misc-fixed-medium-o-semicondensed--13-120-75-75-c-60-iso10646-1 diff --git a/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc b/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc new file mode 100644 index 0000000000..1adf284dd2 --- /dev/null +++ b/Xorg/xorg/font/font-misc-misc/files/fonts.dir.font-misc-misc @@ -0,0 +1,62 @@ +10x20-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-1 +10x20-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso8859-15 +10x20.pcf.gz -misc-fixed-medium-r-normal--20-200-75-75-c-100-iso10646-1 +12x13ja.pcf.gz -misc-fixed-medium-r-normal-ja-13-120-75-75-c-120-iso10646-1 +18x18ja.pcf.gz -misc-fixed-medium-r-normal-ja-18-120-100-100-c-180-iso10646-1 +18x18ko.pcf.gz -misc-fixed-medium-r-normal-ko-18-120-100-100-c-180-iso10646-1 +4x6-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-1 +4x6-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso8859-15 +4x6.pcf.gz -misc-fixed-medium-r-normal--6-60-75-75-c-40-iso10646-1 +5x7-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-1 +5x7-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso8859-15 +5x7.pcf.gz -misc-fixed-medium-r-normal--7-70-75-75-c-50-iso10646-1 +5x8-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-1 +5x8-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso8859-15 +5x8.pcf.gz -misc-fixed-medium-r-normal--8-80-75-75-c-50-iso10646-1 +6x10-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-1 +6x10-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso8859-15 +6x10.pcf.gz -misc-fixed-medium-r-normal--10-100-75-75-c-60-iso10646-1 +6x12-ISO8859-1.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-1 +6x12-ISO8859-15.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso8859-15 +6x12.pcf.gz -misc-fixed-medium-r-semicondensed--12-110-75-75-c-60-iso10646-1 +6x9-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-1 +6x9-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso8859-15 +6x9.pcf.gz -misc-fixed-medium-r-normal--9-90-75-75-c-60-iso10646-1 +7x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-1 +7x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso8859-15 +7x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-70-iso10646-1 +7x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-1 +7x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso8859-15 +7x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-70-iso10646-1 +7x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-1 +7x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso8859-15 +7x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-70-iso10646-1 +7x14-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-1 +7x14-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso8859-15 +7x14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-70-iso10646-1 +7x14B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-1 +7x14B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso8859-15 +7x14B.pcf.gz -misc-fixed-bold-r-normal--14-130-75-75-c-70-iso10646-1 +8x13-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-1 +8x13-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso8859-15 +8x13.pcf.gz -misc-fixed-medium-r-normal--13-120-75-75-c-80-iso10646-1 +8x13B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-1 +8x13B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso8859-15 +8x13B.pcf.gz -misc-fixed-bold-r-normal--13-120-75-75-c-80-iso10646-1 +8x13O-ISO8859-1.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-1 +8x13O-ISO8859-15.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso8859-15 +8x13O.pcf.gz -misc-fixed-medium-o-normal--13-120-75-75-c-80-iso10646-1 +9x15-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-1 +9x15-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso8859-15 +9x15.pcf.gz -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1 +9x15B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-1 +9x15B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso8859-15 +9x15B.pcf.gz -misc-fixed-bold-r-normal--15-140-75-75-c-90-iso10646-1 +9x18-ISO8859-1.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-1 +9x18-ISO8859-15.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso8859-15 +9x18.pcf.gz -misc-fixed-medium-r-normal--18-120-100-100-c-90-iso10646-1 +9x18B-ISO8859-1.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-1 +9x18B-ISO8859-15.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso8859-15 +9x18B.pcf.gz -misc-fixed-bold-r-normal--18-120-100-100-c-90-iso10646-1 +k14.pcf.gz -misc-fixed-medium-r-normal--14-130-75-75-c-140-jisx0208.1983-0 +nil2.pcf.gz -misc-nil-medium-r-normal--2-20-75-75-c-10-misc-fontspecific diff --git a/Xorg/xorg/font/font-xfree86-type1/Makefile b/Xorg/xorg/font/font-xfree86-type1/Makefile new file mode 100644 index 0000000000..c4535a796c --- /dev/null +++ b/Xorg/xorg/font/font-xfree86-type1/Makefile @@ -0,0 +1,81 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=font +PKG_NAME:=font-xfree86-type1 +PKG_RELEASE:=2 +PKG_VERSION:=1.0.0 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font +PKG_MD5SUM:=e66f36a6d68203cc4cf7b56ebbb192dd + +include $(INCLUDE_DIR)/package.mk + +define Package/font-xfree86-type1 + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:= +xserver +font-util @DISPLAY_SUPPORT + TITLE:=font-xfree86-type1 + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.font-xfree86-type1 +endef + +define Package/font-xfree86-type1/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/font-xfree86-type1/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.font-xfree86-type1` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (font-xfree86-type1,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,font-xfree86-type1)) + diff --git a/Xorg/xorg/font/packages b/Xorg/xorg/font/packages new file mode 100644 index 0000000000..1766b9b034 --- /dev/null +++ b/Xorg/xorg/font/packages @@ -0,0 +1,12 @@ +encodings-1.0.2| +font-xfree86-type1-1.0.0| +font-cursor-misc-1.0.0| +font-daewoo-misc-1.0.0| +font-dec-misc-1.0.0| +font-ibm-type1-1.0.0| +font-isas-misc-1.0.0| +font-jis-misc-1.0.0| +font-micro-misc-1.0.0| +font-misc-cyrillic-1.0.0| +font-bh-75dpi-1.0.0| +font-alias-1.0.1| diff --git a/Xorg/xorg/font/template.mk b/Xorg/xorg/font/template.mk new file mode 100644 index 0000000000..149f894701 --- /dev/null +++ b/Xorg/xorg/font/template.mk @@ -0,0 +1,80 @@ +# +# Copyright (C) 2007 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=@BASE_NAME@ +PKG_NAME:=@NAME@ +PKG_RELEASE:=2 +PKG_VERSION:=@VER@ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/ +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/font + +include $(INCLUDE_DIR)/package.mk + +define Package/@NAME@ + SECTION:=xorg-font + CATEGORY:=Xorg + SUBMENU:=font + DEPENDS:=@DEP@ +xorg-server +font-util @DISPLAY_SUPPORT + TITLE:=@NAME@ + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install +endef + +CONFIGURE_ARGS+=--disable-iso8859-2 --disable-iso8859-3 --disable-iso8859-4 --disable-iso8859-5 --disable-iso8859-7 --disable-iso8859-8 --disable-iso8859-9 --disable-iso8859-10 --disable-iso8859-11 --disable-iso8859-13 --disable-iso8859-14 --disable-iso8859-16 --disable-koi8-r --disable-jisx0201 + +define Build/Compile + UTIL_DIR="$(STAGING_DIR)/usr/lib/X11/fonts/util/" make -e -C $(PKG_BUILD_DIR) + DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + sed -i '1d' {} + find $(PKG_INSTALL_DIR) -name fonts.dir | \ + xargs -i -t \ + mv {} {}.@NAME@ +endef + +define Package/@NAME@/install + $(INSTALL_DIR) $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Package/@NAME@/postinst +#!/bin/sh + +FILE_NEW=`find $${IPKG_INSTROOT} -name fonts.dir.@NAME@` +FILE_OLD=`dirname $${FILE_NEW}`/fonts.dir + +echo found $${FILE} + +if [ ! -z $${FILE_NEW} ]; then + if [ -f $${FILE_OLD} ]; then + sed -i "1d" $${FILE_OLD} + cat $${FILE_NEW} >> $${FILE_OLD} + rm -rf $${FILE_NEW} + mv $${FILE_OLD} $${FILE_OLD}.tmp + else + mv $${FILE_NEW} $${FILE_OLD}.tmp + fi + (echo `wc -l $${FILE_OLD}.tmp | awk '{print($$1)}'`; cat $${FILE_OLD}.tmp) > $${FILE_OLD} + rm $${FILE_OLD}.tmp +fi +endef + +ifeq (@NAME@,font-util) +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/ +endef +endif + +$(eval $(call BuildPackage,@NAME@)) + diff --git a/Xorg/xorg/lib/libICE/Makefile b/Xorg/xorg/lib/libICE/Makefile new file mode 100644 index 0000000000..bf74d5c604 --- /dev/null +++ b/Xorg/xorg/lib/libICE/Makefile @@ -0,0 +1,53 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libICE +PKG_RELEASE:=1 +PKG_VERSION:=1.0.6 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=2d39bc924af24325dae589e9a849180c + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto xtrans + +include $(INCLUDE_DIR)/package.mk + +define Package/libICE + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=libICE + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/ICE} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/ICE/* \ + $(1)/usr/include/X11/ICE/ +endef + +define Package/libICE/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libICE)) diff --git a/Xorg/xorg/lib/libSM/Makefile b/Xorg/xorg/lib/libSM/Makefile new file mode 100644 index 0000000000..08dbd64c14 --- /dev/null +++ b/Xorg/xorg/lib/libSM/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=libSM +PKG_NAME:=libSM +PKG_RELEASE:=2 +PKG_VERSION:=1.1.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=6889a455496aaaa65b1fa05fc518d179 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto xtrans + +include $(INCLUDE_DIR)/package.mk + +define Package/libSM + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libICE +libuuid + TITLE:=libSM + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/SM} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/SM/* \ + $(1)/usr/include/X11/SM/ +endef + +define Package/libSM/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libSM)) diff --git a/Xorg/xorg/lib/libX11/Makefile b/Xorg/xorg/lib/libX11/Makefile new file mode 100644 index 0000000000..6468b04e31 --- /dev/null +++ b/Xorg/xorg/lib/libX11/Makefile @@ -0,0 +1,87 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libX11 +PKG_RELEASE:=1 +PKG_VERSION:=1.3.2 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=001d780829f936e34851ef7cd37b4dfd + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto xextproto xf86bigfontproto kbproto inputproto \ + xtrans xcmiscproto bigreqsproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libX11 + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libXdmcp +libXau @FEATURE_drawing-backend_libX11 @DISPLAY_SUPPORT + TITLE:=libX11 + URL:=http://xorg.freedesktop.org/ +endef + +define Feature/libX11 + TARGET_NAME:=drawing-backend + TARGET_TITLE:=Drawing Backend + NAME:=libX11 +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-malloc0returnsnull \ + --enable-xf86bigfont \ + --without-xcb \ + --without-launchd \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/src/util \ + CC="$(HOSTCC)" \ + CFLAGS="$(HOST_CFLAGS)" \ + CPPFLAGS="$(HOST_CPPFLAGS)" \ + LDFLAGS="$(HOST_LDFLAGS)" + + $(call Build/Compile/Default) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,la,a} \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/* \ + $(1)/usr/include/X11/ +endef + +define Package/libX11/install + $(INSTALL_DIR) $(1)/usr/lib + $(INSTALL_DIR) $(1)/usr/share/X11 + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ + $(CP) \ + $(PKG_INSTALL_DIR)/usr/share/X11/* \ + $(1)/usr/share/X11 +endef + +$(eval $(call Feature,libX11)) +$(eval $(call BuildPackage,libX11)) diff --git a/Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch b/Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch new file mode 100644 index 0000000000..6d28221a4b --- /dev/null +++ b/Xorg/xorg/lib/libX11/patches/005-fix-include-path.patch @@ -0,0 +1,143 @@ +diff --git a/modules/im/ximcp/Makefile.in b/modules/im/ximcp/Makefile.in +index 905d526..6027e58 100644 +--- a/modules/im/ximcp/Makefile.in ++++ b/modules/im/ximcp/Makefile.in +@@ -96,7 +96,7 @@ ximcp_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(ximcp_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_ximcp_la_rpath = -rpath $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/lc/Utf8/Makefile.in b/modules/lc/Utf8/Makefile.in +index 4078c1c..e7e52fa 100644 +--- a/modules/lc/Utf8/Makefile.in ++++ b/modules/lc/Utf8/Makefile.in +@@ -88,7 +88,7 @@ xlcUTF8Load_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC \ + $@ + @XLIB_LOADABLE_I18N_TRUE@am_xlcUTF8Load_la_rpath = -rpath \ + @XLIB_LOADABLE_I18N_TRUE@ $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/lc/def/Makefile.in b/modules/lc/def/Makefile.in +index b37cec6..89ce832 100644 +--- a/modules/lc/def/Makefile.in ++++ b/modules/lc/def/Makefile.in +@@ -86,7 +86,7 @@ xlcDef_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(xlcDef_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_xlcDef_la_rpath = -rpath $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/lc/gen/Makefile.in b/modules/lc/gen/Makefile.in +index 6e2e522..e832723 100644 +--- a/modules/lc/gen/Makefile.in ++++ b/modules/lc/gen/Makefile.in +@@ -86,7 +86,7 @@ xlibi18n_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(xlibi18n_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_xlibi18n_la_rpath = -rpath $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/lc/xlocale/Makefile.in b/modules/lc/xlocale/Makefile.in +index 7c947ee..b68b06e 100644 +--- a/modules/lc/xlocale/Makefile.in ++++ b/modules/lc/xlocale/Makefile.in +@@ -86,7 +86,7 @@ xlocale_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(xlocale_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_xlocale_la_rpath = -rpath $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/modules/om/generic/Makefile.in b/modules/om/generic/Makefile.in +index e39802b..0979207 100644 +--- a/modules/om/generic/Makefile.in ++++ b/modules/om/generic/Makefile.in +@@ -89,7 +89,7 @@ xomGeneric_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(xomGeneric_la_LDFLAGS) $(LDFLAGS) -o $@ + @XLIB_LOADABLE_I18N_TRUE@am_xomGeneric_la_rpath = -rpath \ + @XLIB_LOADABLE_I18N_TRUE@ $(commonlibdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/util/Makefile.in b/src/util/Makefile.in +index 65c181e..bfa7c05 100644 +--- a/src/util/Makefile.in ++++ b/src/util/Makefile.in +@@ -59,7 +59,7 @@ am__v_lt_0 = --silent + makekeys_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(makekeys_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/xcms/Makefile.in b/src/xcms/Makefile.in +index 6573196..a140221 100644 +--- a/src/xcms/Makefile.in ++++ b/src/xcms/Makefile.in +@@ -65,7 +65,7 @@ libxcms_la_OBJECTS = $(am_libxcms_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/xkb/Makefile.in b/src/xkb/Makefile.in +index 0e52692..43a9660 100644 +--- a/src/xkb/Makefile.in ++++ b/src/xkb/Makefile.in +@@ -57,7 +57,7 @@ libxkb_la_OBJECTS = $(am_libxkb_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/xlibi18n/Makefile.in b/src/xlibi18n/Makefile.in +index 50ac253..6c44c48 100644 +--- a/src/xlibi18n/Makefile.in ++++ b/src/xlibi18n/Makefile.in +@@ -85,7 +85,7 @@ libi18n_la_OBJECTS = $(am_libi18n_la_OBJECTS) + AM_V_lt = $(am__v_lt_$(V)) + am__v_lt_ = $(am__v_lt_$(AM_DEFAULT_VERBOSITY)) + am__v_lt_0 = --silent +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src -I$(top_builddir)/include -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f +diff --git a/src/Makefile.in b/src/Makefile.in +index a79daa8..ca7f366 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -218,7 +218,7 @@ libX11_la_OBJECTS = $(am_libX11_la_OBJECTS) + libX11_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ + $(libX11_la_LDFLAGS) $(LDFLAGS) -o $@ +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/X11 ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include/ -I$(top_builddir)/include/X11 + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + am__mv = mv -f diff --git a/Xorg/xorg/lib/libX11/patches/010-ignore-groff-warnings.patch b/Xorg/xorg/lib/libX11/patches/010-ignore-groff-warnings.patch new file mode 100644 index 0000000000..a83e76150f --- /dev/null +++ b/Xorg/xorg/lib/libX11/patches/010-ignore-groff-warnings.patch @@ -0,0 +1,13 @@ +--- a/specs/troffrules.in 2010-01-15 01:11:36.000000000 +0000 ++++ b/specs/troffrules.in 2011-01-24 21:37:01.000000000 +0000 +@@ -49,7 +49,9 @@ + + .ms.ps: + -$(AM_V_GEN) $(GROFF) -Tps $(GROFF_FLAGS) $< 2> index.$@.raw > $@ +- @if grep '^[^1-9.]' index.$@.raw | grep -v warning; then exit 1; \ ++ @if grep '^[^1-9.]' index.$@.raw | grep -v warning | \ ++ grep -v 'table wider than line width'; \ ++ then exit 1; \ + else test $$? -le 1; fi + + .ms.txt: diff --git a/Xorg/xorg/lib/libXau/Makefile b/Xorg/xorg/lib/libXau/Makefile new file mode 100644 index 0000000000..74a5908cfa --- /dev/null +++ b/Xorg/xorg/lib/libXau/Makefile @@ -0,0 +1,56 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=libXau +PKG_NAME:=libXau +PKG_RELEASE:=1 +PKG_VERSION:=1.0.5 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=993b3185c629e4b89401fca072dcb663 + +PKG_FIXUP:=libtool + +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXau + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=libXau + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/* \ + $(1)/usr/include/X11/ +endef + +define Package/libXau/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXau)) diff --git a/Xorg/xorg/lib/libXaw/Makefile b/Xorg/xorg/lib/libXaw/Makefile new file mode 100644 index 0000000000..5733b51980 --- /dev/null +++ b/Xorg/xorg/lib/libXaw/Makefile @@ -0,0 +1,64 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXaw +PKG_RELEASE:=1 +PKG_VERSION:=1.0.7 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=815e74de989ccda684e2baf8d12cf519 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto xextproto printproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXaw + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXext +libXt +libXmu +libXpm +libXau + TITLE:=libXaw + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --disable-xaw6 \ + --disable-xaw8 \ + --disable-docs \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xaw} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/Xaw/* \ + $(1)/usr/include/X11/Xaw/ + +endef + +define Package/libXaw/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXaw)) diff --git a/Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch b/Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch new file mode 100644 index 0000000000..036523c9f7 --- /dev/null +++ b/Xorg/xorg/lib/libXaw/patches/001-fix-includes.patch @@ -0,0 +1,13 @@ +diff --git a/src/Makefile.in b/src/Makefile.in +index eff87e9..3a9834e 100644 +--- a/src/Makefile.in ++++ b/src/Makefile.in +@@ -126,7 +126,7 @@ libXaw7_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libXaw7_la_CFLAGS) \ + $(CFLAGS) $(libXaw7_la_LDFLAGS) $(LDFLAGS) -o $@ + @BUILD_XAW7_TRUE@am_libXaw7_la_rpath = -rpath $(libdir) +-DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) ++DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir) -I$(top_builddir)/include + depcomp = $(SHELL) $(top_srcdir)/depcomp + am__depfiles_maybe = depfiles + COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ diff --git a/Xorg/xorg/lib/libXcomposite/Makefile b/Xorg/xorg/lib/libXcomposite/Makefile new file mode 100644 index 0000000000..10f970a62c --- /dev/null +++ b/Xorg/xorg/lib/libXcomposite/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2009-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXcomposite +PKG_RELEASE:=1 +PKG_VERSION:=0.4.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=0f1367f57fdf5df17a8dd71d0fa68248 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=compositeproto fixesproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXcomposite + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXfixes +libXext + TITLE:=libXcomposite + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +define Package/libXcomposite/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXcomposite)) diff --git a/Xorg/xorg/lib/libXcursor/Makefile b/Xorg/xorg/lib/libXcursor/Makefile new file mode 100644 index 0000000000..d83e5e3c53 --- /dev/null +++ b/Xorg/xorg/lib/libXcursor/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXcursor +PKG_RELEASE:=1 +PKG_VERSION:=1.1.10 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=7dcdad1c10daea872cb3355af414b2ca + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=fixesproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXcursor + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libXrender +libXfixes +libX11 + TITLE:=libXcursor + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xcursor} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/Xcursor/* \ + $(1)/usr/include/X11/Xcursor +endef + +define Package/libXcursor/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXcursor)) diff --git a/Xorg/xorg/lib/libXdamage/Makefile b/Xorg/xorg/lib/libXdamage/Makefile new file mode 100644 index 0000000000..34f31b895b --- /dev/null +++ b/Xorg/xorg/lib/libXdamage/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2009-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXdamage +PKG_RELEASE:=1 +PKG_VERSION:=1.1.2 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=b42780bce703ec202a33e5693991c09d + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto xextproto fixesproto damageproto + +include $(INCLUDE_DIR)/package.mk + + +define Package/libXdamage + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXfixes + TITLE:=libXdamage + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +define Package/libXdamage/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXdamage)) diff --git a/Xorg/xorg/lib/libXdmcp/Makefile b/Xorg/xorg/lib/libXdmcp/Makefile new file mode 100644 index 0000000000..a8da2c33b9 --- /dev/null +++ b/Xorg/xorg/lib/libXdmcp/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXdmcp +PKG_RELEASE:=1 +PKG_VERSION:=1.0.3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=d60941d471800f41a3f19b24bea855a7 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXdmcp + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=libXdmcp + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/* \ + $(1)/usr/include/X11/ +endef + +define Package/libXdmcp/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXdmcp)) diff --git a/Xorg/xorg/lib/libXext/Makefile b/Xorg/xorg/lib/libXext/Makefile new file mode 100644 index 0000000000..3bb31f06a6 --- /dev/null +++ b/Xorg/xorg/lib/libXext/Makefile @@ -0,0 +1,61 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXext +PKG_RELEASE:=1 +PKG_VERSION:=1.1.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=c417c0e8df39a067f90a2a2e7133637d + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto xextproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXext + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXau + TITLE:=libXext + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-malloc0returnsnull \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DIR) $(1)/usr/include/X11/extensions + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +define Package/libXext/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXext)) diff --git a/Xorg/xorg/lib/libXfixes/Makefile b/Xorg/xorg/lib/libXfixes/Makefile new file mode 100644 index 0000000000..7bb353a56c --- /dev/null +++ b/Xorg/xorg/lib/libXfixes/Makefile @@ -0,0 +1,56 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXfixes +PKG_RELEASE:=1 +PKG_VERSION:=4.0.4 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=7f2c40852eb337b237ad944ca5c30d49 + +PKG_FIXUP:=libtool + +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto fixesproto xextproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXfixes + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 + TITLE:=libXfixes + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +define Package/libXfixes/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXfixes)) diff --git a/Xorg/xorg/lib/libXfont/Makefile b/Xorg/xorg/lib/libXfont/Makefile new file mode 100644 index 0000000000..6971629b93 --- /dev/null +++ b/Xorg/xorg/lib/libXfont/Makefile @@ -0,0 +1,60 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXfont +PKG_RELEASE:=1 +PKG_VERSION:=1.4.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=4f2bed2a2be82e90a51a24bb3a22cdf0 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto fontcacheproto fontsproto xtrans + +include $(INCLUDE_DIR)/package.mk + +define Package/libXfont + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+zlib +libfontenc +libfreetype + TITLE:=libXfont + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --disable-devel-docs \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/fonts} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/fonts/* \ + $(1)/usr/include/X11/fonts/ +endef + +define Package/libXfont/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXfont)) diff --git a/Xorg/xorg/lib/libXft/Makefile b/Xorg/xorg/lib/libXft/Makefile new file mode 100644 index 0000000000..1b865890c0 --- /dev/null +++ b/Xorg/xorg/lib/libXft/Makefile @@ -0,0 +1,54 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXft +PKG_RELEASE:=1 +PKG_VERSION:=2.1.14 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=254e62a233491e0e1251636536163e20 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/libXft + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+fontconfig +libfreetype +libXrender + TITLE:=libXft + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xft} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/Xft/* \ + $(1)/usr/include/X11/Xft/ +endef + +define Package/libXft/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXft)) diff --git a/Xorg/xorg/lib/libXi/Makefile b/Xorg/xorg/lib/libXi/Makefile new file mode 100644 index 0000000000..661450cdee --- /dev/null +++ b/Xorg/xorg/lib/libXi/Makefile @@ -0,0 +1,61 @@ +# +# Copyright (C) 2007-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXi +PKG_RELEASE:=1 +PKG_VERSION:=1.3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=8df4ece9bd1efb02c28acb2b6f485e09 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto xextproto inputproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXi + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXext + TITLE:=libXi + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, --enable-malloc0returnsnull) +endef + +define Package/libXi/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libXi.so* \ + $(1)/usr/lib/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libXi.{so*,a,la} \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DIR) $(1)/usr/include/X11/extensions + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +$(eval $(call BuildPackage,libXi)) diff --git a/Xorg/xorg/lib/libXmu/Makefile b/Xorg/xorg/lib/libXmu/Makefile new file mode 100644 index 0000000000..758b3ec7d4 --- /dev/null +++ b/Xorg/xorg/lib/libXmu/Makefile @@ -0,0 +1,72 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXmu +PKG_RELEASE:=1 +PKG_VERSION:=1.0.5 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=fc4d66be7a1a1eb474954728415e46d6 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=libXt libXext xextproto + +include $(INCLUDE_DIR)/package.mk + + +define Package/libXmu + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libXt +libXext + TITLE:=libXmu + URL:=http://xorg.freedesktop.org/ +endef + +define Package/libXmuu + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 + TITLE:=libXmuu + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xmu} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/Xmu/* \ + $(1)/usr/include/X11/Xmu/ +endef + +define Package/libXmu/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libXmu.so* \ + $(1)/usr/lib/ +endef + +define Package/libXmuu/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libXmuu.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXmu)) +$(eval $(call BuildPackage,libXmuu)) diff --git a/Xorg/xorg/lib/libXpm/Makefile b/Xorg/xorg/lib/libXpm/Makefile new file mode 100644 index 0000000000..05186d1302 --- /dev/null +++ b/Xorg/xorg/lib/libXpm/Makefile @@ -0,0 +1,56 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXpm +PKG_RELEASE:=2 +PKG_VERSION:=3.5.8 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=38e58e72d476a74298a59052fde185a3 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUID_DEPENDS:=xproto xextproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXpm + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXt +libXext +libSM + TITLE:=libXpm + URL:=http://xorg.freedesktop.org/ +endef + +TARGET_LDFLAGS+=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/* \ + $(1)/usr/include/X11/ +endef + +define Package/libXpm/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXpm)) diff --git a/Xorg/xorg/lib/libXrandr/Makefile b/Xorg/xorg/lib/libXrandr/Makefile new file mode 100644 index 0000000000..398581770c --- /dev/null +++ b/Xorg/xorg/lib/libXrandr/Makefile @@ -0,0 +1,60 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXrandr +PKG_RELEASE:=4 +PKG_VERSION:=1.3.0 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=68eb59c3b7524db6ffd78746ee893d1d + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=randrproto renderproto xextproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXrandr + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libXext +libXrender +libX11 + TITLE:=libXrandr + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-malloc0returnsnull \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +define Package/libXrandr/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXrandr)) diff --git a/Xorg/xorg/lib/libXrender/Makefile b/Xorg/xorg/lib/libXrender/Makefile new file mode 100644 index 0000000000..dfc541b685 --- /dev/null +++ b/Xorg/xorg/lib/libXrender/Makefile @@ -0,0 +1,60 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXrender +PKG_RELEASE:=1 +PKG_VERSION:=0.9.5 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=276dd9e85daf0680616cd9f132b354c9 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=renderproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXrender + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 + TITLE:=libXrender + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-malloc0returnsnull \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +define Package/libXrender/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXrender)) diff --git a/Xorg/xorg/lib/libXt/Makefile b/Xorg/xorg/lib/libXt/Makefile new file mode 100644 index 0000000000..81cbad4602 --- /dev/null +++ b/Xorg/xorg/lib/libXt/Makefile @@ -0,0 +1,72 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXt +PKG_RELEASE:=1 +PKG_VERSION:=1.0.7 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=96f3c93434a93186d178b60d4a262496 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto kbproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXt + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libSM +libX11 +libICE + TITLE:=libXt + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-malloc0returnsnull \ + --without-xcb \ + , \ + CC_FOR_BUILD="$(HOSTCC)" \ + CFLAGS_FOR_BUILD="$(HOST_CFLAGS)" \ + LDFLAGS_FOR_BUILD="$(HOST_LDFLAGS)" \ + ) +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR)/util \ + CPPFLAGS="$(HOST_CPPFLAGS)" + + $(call Build/Compile/Default) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/* \ + $(1)/usr/include/X11/ +endef + +define Package/libXt/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXt)) diff --git a/Xorg/xorg/lib/libXtst/Makefile b/Xorg/xorg/lib/libXtst/Makefile new file mode 100644 index 0000000000..60a37b1e4a --- /dev/null +++ b/Xorg/xorg/lib/libXtst/Makefile @@ -0,0 +1,56 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXtst +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=dd6f3e20b87310187121539f9605d977 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=recordproto xextproto inputproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXtst + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXext +libXi + TITLE:=libXtst + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{include,lib/pkgconfig} + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/include/* \ + $(1)/usr/include/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/libXtst/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXtst)) diff --git a/Xorg/xorg/lib/libXv/Makefile b/Xorg/xorg/lib/libXv/Makefile new file mode 100644 index 0000000000..95ca1cf9da --- /dev/null +++ b/Xorg/xorg/lib/libXv/Makefile @@ -0,0 +1,60 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXv +PKG_RELEASE:= +PKG_VERSION:=1.0.5 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=1d97798b1d8bbf8d9085e1b223a0738f + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=videoproto xextproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXv + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXext + TITLE:=libXv + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-malloc0returnsnull \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +define Package/libXv/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXv)) diff --git a/Xorg/xorg/lib/libXvMC/Makefile b/Xorg/xorg/lib/libXvMC/Makefile new file mode 100644 index 0000000000..82b421b5b9 --- /dev/null +++ b/Xorg/xorg/lib/libXvMC/Makefile @@ -0,0 +1,60 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXvMC +PKG_RELEASE:=1 +PKG_VERSION:=1.0.5 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=16c3a11add14979beb7510e44623cac6 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=videoproto xextproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libXvMC + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libXext +libXv +libX11 + TITLE:=libXvMC + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-malloc0returnsnull \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +define Package/libXvMC/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXvMC)) diff --git a/Xorg/xorg/lib/libXxf86vm/Makefile b/Xorg/xorg/lib/libXxf86vm/Makefile new file mode 100644 index 0000000000..2a09cb81f1 --- /dev/null +++ b/Xorg/xorg/lib/libXxf86vm/Makefile @@ -0,0 +1,63 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libXxf86vm +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=b431ad7084e1055fef99a9115237edd8 + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto xextproto xf86vidmodeproto + +include $(INCLUDE_DIR)/package.mk + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-malloc0returnsnull \ + ) +endef + +define Package/libXxf86vm + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 +libXext + TITLE:=libXxf86vm + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/X11/extensions + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ + + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/libXxf86vm/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libXxf86vm)) diff --git a/Xorg/xorg/lib/libfontenc/Makefile b/Xorg/xorg/lib/libfontenc/Makefile new file mode 100644 index 0000000000..99fdf869e7 --- /dev/null +++ b/Xorg/xorg/lib/libfontenc/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libfontenc +PKG_RELEASE:=1 +PKG_VERSION:=1.0.5 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=4f0d8191819be9f2bdf9dad49a65e43b + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=xproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libfontenc + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+zlib + TITLE:=libfontenc + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/fonts} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/fonts/* \ + $(1)/usr/include/X11/fonts/ +endef + +define Package/libfontenc/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libfontenc)) diff --git a/Xorg/xorg/lib/libpciaccess/Makefile b/Xorg/xorg/lib/libpciaccess/Makefile new file mode 100644 index 0000000000..54ac26db66 --- /dev/null +++ b/Xorg/xorg/lib/libpciaccess/Makefile @@ -0,0 +1,69 @@ +# +# Copyright (C) 2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_BASE_NAME:=libpciaccess +PKG_NAME:=libpciaccess +PKG_RELEASE:=1 +PKG_VERSION:=0.10.9 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=685cb20e7a6165bc010972f1183addbd + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + + +define Package/libpciaccess + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+pciutils + TITLE:=libpciaccess + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --with-pciids-path=/usr/share/pci.ids \ + , \ + ac_cv_file__usr_include_asm_mtrr_h=$(shell \ + test -f "$(TOOLCHAIN_DIR)/include/asm/mtrr.h" \ + && echo "yes" \ + || echo "no") \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/*.h \ + $(1)/usr/include + + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libpciaccess.{so*,a,la} \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/libpciaccess/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libpciaccess.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libpciaccess)) diff --git a/Xorg/xorg/lib/libxkbfile/Makefile b/Xorg/xorg/lib/libxkbfile/Makefile new file mode 100644 index 0000000000..9cdfeabb48 --- /dev/null +++ b/Xorg/xorg/lib/libxkbfile/Makefile @@ -0,0 +1,55 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=libxkbfile +PKG_RELEASE:=1 +PKG_VERSION:=1.0.6 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=b01156e263eca8177e6b7f10441951c4 + +PKG_FIXUP:=libtool + +PKG_INSTALL:=1 +PKG_BUILD_DEPENDS:=kbproto + +include $(INCLUDE_DIR)/package.mk + +define Package/libxkbfile + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + DEPENDS:=+libX11 + TITLE:=libxkbfile + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/extensions} + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.{so*,a,la} \ + $(1)/usr/lib/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/extensions/* \ + $(1)/usr/include/X11/extensions/ +endef + +define Package/libxkbfile/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/*.so* \ + $(1)/usr/lib/ +endef + +$(eval $(call BuildPackage,libxkbfile)) diff --git a/Xorg/xorg/lib/xtrans/Makefile b/Xorg/xorg/lib/xtrans/Makefile new file mode 100644 index 0000000000..2b44bc95ee --- /dev/null +++ b/Xorg/xorg/lib/xtrans/Makefile @@ -0,0 +1,47 @@ +# +# Copyright (C) 2007-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xtrans +PKG_RELEASE:=1 +PKG_VERSION:=1.2.5 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/lib +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=2d1e57e82acc5f21797e92341415af2f + +PKG_INSTALL:=1 + +include $(INCLUDE_DIR)/package.mk + +define Package/xtrans + SECTION:=xorg-libraries + CATEGORY:=Xorg + SUBMENU:=libraries + TITLE:=xtrans + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{lib/pkgconfig,include/X11/Xtrans} + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/X11/Xtrans/* \ + $(1)/usr/include/X11/Xtrans/ + + $(INSTALL_DIR) $(1)/usr/share/aclocal + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ + $(1)/usr/share/aclocal/ +endef + +$(eval $(call BuildPackage,xtrans)) diff --git a/Xorg/xorg/proto/applewmproto/Makefile b/Xorg/xorg/proto/applewmproto/Makefile new file mode 100644 index 0000000000..921706bb1d --- /dev/null +++ b/Xorg/xorg/proto/applewmproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=applewmproto +PKG_VERSION:=1.4.1 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=76ca1c6e1d8904d2d885f81f7332eba6 + +include $(INCLUDE_DIR)/package.mk + +define Package/applewmproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=applewmproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,applewmproto)) diff --git a/Xorg/xorg/proto/bigreqsproto/Makefile b/Xorg/xorg/proto/bigreqsproto/Makefile new file mode 100644 index 0000000000..7103170866 --- /dev/null +++ b/Xorg/xorg/proto/bigreqsproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=bigreqsproto +PKG_VERSION:=1.1.0 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=d30c5dbf19ca6dffcd9788227ecff8c5 + +include $(INCLUDE_DIR)/package.mk + +define Package/bigreqsproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=bigreqsproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,bigreqsproto)) diff --git a/Xorg/xorg/proto/calibrateproto/Makefile b/Xorg/xorg/proto/calibrateproto/Makefile new file mode 100644 index 0000000000..40d812ea29 --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/Makefile @@ -0,0 +1,38 @@ +# +# Copyright (C) 2006-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=calibrateproto +PKG_RELEASE:=1 +PKG_VERSION:=git + +include $(INCLUDE_DIR)/package.mk + +define Package/calibrateproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=calibrateproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/Prepare +$(call Build/Prepare/Default) + $(CP) src/* $(PKG_BUILD_DIR) +endef + +define Build/InstallDev + DESTDIR=$(1) $(MAKE) -C $(PKG_BUILD_DIR)/$(SUBPACKAGE) $(MAKE_FLAGS) install +endef + +define Build/Compile + echo +endef + +$(eval $(call BuildPackage,calibrateproto)) diff --git a/Xorg/xorg/proto/calibrateproto/src/ChangeLog b/Xorg/xorg/proto/calibrateproto/src/ChangeLog new file mode 100644 index 0000000000..b36632c44b --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/ChangeLog @@ -0,0 +1,5 @@ +2004-10-21 Daniel Stone + + * configure.ac: + * xcalibratewire.h: + Bump version to 0.1. diff --git a/Xorg/xorg/proto/calibrateproto/src/Makefile b/Xorg/xorg/proto/calibrateproto/src/Makefile new file mode 100644 index 0000000000..35611b3aef --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/Makefile @@ -0,0 +1,527 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# Makefile. Generated from Makefile.in by configure. + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + + + +# +# Copyright © 2003 Philip Blundell +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Philip Blundell not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Philip Blundell makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# + + + +pkgdatadir = $(datadir)/xcalibrateproto +pkglibdir = $(libdir)/xcalibrateproto +pkgincludedir = $(includedir)/xcalibrateproto +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = . +DIST_COMMON = $(XCalibrateinclude_HEADERS) $(am__configure_deps) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/xcalibrateproto.pc.in $(top_srcdir)/configure \ + ChangeLog install-sh missing +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = xcalibrateproto.pc +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(XCalibrateincludedir)" +pkgconfigDATA_INSTALL = $(INSTALL_DATA) +DATA = $(pkgconfig_DATA) +XCalibrateincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(XCalibrateinclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run aclocal-1.10 +AMTAR = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run tar +AUTOCONF = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoconf +AUTOHEADER = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoheader +AUTOMAKE = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run automake-1.10 +AWK = gawk +CYGPATH_W = echo +DEFS = -DPACKAGE_NAME=\"xcalibrateproto\" -DPACKAGE_TARNAME=\"xcalibrateproto\" -DPACKAGE_VERSION=\"0.1.0\" -DPACKAGE_STRING=\"xcalibrateproto\ 0.1.0\" -DPACKAGE_BUGREPORT=\"pb@nexus.co.uk\" -DPACKAGE=\"xcalibrateproto\" -DVERSION=\"0.1.0\" +ECHO_C = +ECHO_N = -n +ECHO_T = +INSTALL = /usr/bin/install -c +INSTALL_DATA = ${INSTALL} -m 644 +INSTALL_PROGRAM = ${INSTALL} +INSTALL_SCRIPT = ${INSTALL} +INSTALL_STRIP_PROGRAM = $(install_sh) -c -s +LIBOBJS = +LIBS = +LTLIBOBJS = +MAKEINFO = ${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run makeinfo +MKDIR_P = /bin/mkdir -p +PACKAGE = xcalibrateproto +PACKAGE_BUGREPORT = pb@nexus.co.uk +PACKAGE_NAME = xcalibrateproto +PACKAGE_STRING = xcalibrateproto 0.1.0 +PACKAGE_TARNAME = xcalibrateproto +PACKAGE_VERSION = 0.1.0 +PATH_SEPARATOR = : +SET_MAKE = +SHELL = /bin/sh +STRIP = +VERSION = 0.1.0 +abs_builddir = /var/src/owrt-X/build_dir/i386/calibrateproto-git +abs_srcdir = /var/src/owrt-X/build_dir/i386/calibrateproto-git +abs_top_builddir = /var/src/owrt-X/build_dir/i386/calibrateproto-git +abs_top_srcdir = /var/src/owrt-X/build_dir/i386/calibrateproto-git +am__leading_dot = . +am__tar = ${AMTAR} chof - "$$tardir" +am__untar = ${AMTAR} xf - +bindir = ${exec_prefix}/bin +build_alias = +builddir = . +datadir = ${datarootdir} +datarootdir = ${prefix}/share +docdir = ${datarootdir}/doc/${PACKAGE_TARNAME} +dvidir = ${docdir} +exec_prefix = ${prefix} +host_alias = +htmldir = ${docdir} +includedir = ${prefix}/include +infodir = ${datarootdir}/info +install_sh = $(SHELL) /var/src/owrt-X/build_dir/i386/calibrateproto-git/install-sh +libdir = ${exec_prefix}/lib +libexecdir = ${exec_prefix}/libexec +localedir = ${datarootdir}/locale +localstatedir = ${prefix}/var +mandir = ${datarootdir}/man +mkdir_p = /bin/mkdir -p +oldincludedir = /usr/include +pdfdir = ${docdir} +prefix = /usr/local +program_transform_name = s,x,x, +psdir = ${docdir} +sbindir = ${exec_prefix}/sbin +sharedstatedir = ${prefix}/com +srcdir = . +sysconfdir = ${prefix}/etc +target_alias = +top_builddir = . +top_srcdir = . +XCalibrateincludedir = $(includedir)/X11/extensions +XCalibrateinclude_HEADERS = xcalibrateproto.h xcalibratewire.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xcalibrateproto.pc +EXTRA_DIST = autogen.sh xcalibrateproto.pc.in +all: all-am + +.SUFFIXES: +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +xcalibrateproto.pc: $(top_builddir)/config.status $(srcdir)/xcalibrateproto.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done +install-XCalibrateincludeHEADERS: $(XCalibrateinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(XCalibrateincludedir)" || $(MKDIR_P) "$(DESTDIR)$(XCalibrateincludedir)" + @list='$(XCalibrateinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(XCalibrateincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(XCalibrateincludedir)/$$f'"; \ + $(XCalibrateincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(XCalibrateincludedir)/$$f"; \ + done + +uninstall-XCalibrateincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(XCalibrateinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(XCalibrateincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(XCalibrateincludedir)/$$f"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(am__remove_distdir) + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-am +all-am: Makefile $(DATA) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(XCalibrateincludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-XCalibrateincludeHEADERS \ + install-pkgconfigDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-XCalibrateincludeHEADERS \ + uninstall-pkgconfigDATA + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ + clean-generic ctags dist dist-all dist-bzip2 dist-gzip \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-XCalibrateincludeHEADERS install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-XCalibrateincludeHEADERS uninstall-am \ + uninstall-pkgconfigDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/Xorg/xorg/proto/calibrateproto/src/Makefile.am b/Xorg/xorg/proto/calibrateproto/src/Makefile.am new file mode 100644 index 0000000000..87bcd58508 --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/Makefile.am @@ -0,0 +1,29 @@ +# +# Copyright © 2003 Philip Blundell +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Philip Blundell not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Philip Blundell makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# + +XCalibrateincludedir = $(includedir)/X11/extensions +XCalibrateinclude_HEADERS = xcalibrateproto.h xcalibratewire.h + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xcalibrateproto.pc + +EXTRA_DIST = autogen.sh xcalibrateproto.pc.in diff --git a/Xorg/xorg/proto/calibrateproto/src/Makefile.in b/Xorg/xorg/proto/calibrateproto/src/Makefile.in new file mode 100644 index 0000000000..73a01dca77 --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/Makefile.in @@ -0,0 +1,527 @@ +# Makefile.in generated by automake 1.10 from Makefile.am. +# @configure_input@ + +# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, +# 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This Makefile.in is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +@SET_MAKE@ + +# +# Copyright © 2003 Philip Blundell +# +# Permission to use, copy, modify, distribute, and sell this software and its +# documentation for any purpose is hereby granted without fee, provided that +# the above copyright notice appear in all copies and that both that +# copyright notice and this permission notice appear in supporting +# documentation, and that the name of Philip Blundell not be used in +# advertising or publicity pertaining to distribution of the software without +# specific, written prior permission. Philip Blundell makes no +# representations about the suitability of this software for any purpose. It +# is provided "as is" without express or implied warranty. +# +# PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, +# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO +# EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR +# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, +# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER +# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR +# PERFORMANCE OF THIS SOFTWARE. +# + + +VPATH = @srcdir@ +pkgdatadir = $(datadir)/@PACKAGE@ +pkglibdir = $(libdir)/@PACKAGE@ +pkgincludedir = $(includedir)/@PACKAGE@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c +install_sh_SCRIPT = $(install_sh) -c +INSTALL_HEADER = $(INSTALL_DATA) +transform = $(program_transform_name) +NORMAL_INSTALL = : +PRE_INSTALL = : +POST_INSTALL = : +NORMAL_UNINSTALL = : +PRE_UNINSTALL = : +POST_UNINSTALL = : +subdir = . +DIST_COMMON = $(XCalibrateinclude_HEADERS) $(am__configure_deps) \ + $(srcdir)/Makefile.am $(srcdir)/Makefile.in \ + $(srcdir)/xcalibrateproto.pc.in $(top_srcdir)/configure \ + ChangeLog install-sh missing +ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 +am__aclocal_m4_deps = $(top_srcdir)/configure.ac +am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ + $(ACLOCAL_M4) +am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ + configure.lineno config.status.lineno +mkinstalldirs = $(install_sh) -d +CONFIG_CLEAN_FILES = xcalibrateproto.pc +SOURCES = +DIST_SOURCES = +am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; +am__vpath_adj = case $$p in \ + $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ + *) f=$$p;; \ + esac; +am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; +am__installdirs = "$(DESTDIR)$(pkgconfigdir)" \ + "$(DESTDIR)$(XCalibrateincludedir)" +pkgconfigDATA_INSTALL = $(INSTALL_DATA) +DATA = $(pkgconfig_DATA) +XCalibrateincludeHEADERS_INSTALL = $(INSTALL_HEADER) +HEADERS = $(XCalibrateinclude_HEADERS) +ETAGS = etags +CTAGS = ctags +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) +distdir = $(PACKAGE)-$(VERSION) +top_distdir = $(distdir) +am__remove_distdir = \ + { test ! -d $(distdir) \ + || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \ + && rm -fr $(distdir); }; } +DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2 +GZIP_ENV = --best +distuninstallcheck_listfiles = find . -type f -print +distcleancheck_listfiles = find . -type f -print +ACLOCAL = @ACLOCAL@ +AMTAR = @AMTAR@ +AUTOCONF = @AUTOCONF@ +AUTOHEADER = @AUTOHEADER@ +AUTOMAKE = @AUTOMAKE@ +AWK = @AWK@ +CYGPATH_W = @CYGPATH_W@ +DEFS = @DEFS@ +ECHO_C = @ECHO_C@ +ECHO_N = @ECHO_N@ +ECHO_T = @ECHO_T@ +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ +INSTALL_PROGRAM = @INSTALL_PROGRAM@ +INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ +LIBOBJS = @LIBOBJS@ +LIBS = @LIBS@ +LTLIBOBJS = @LTLIBOBJS@ +MAKEINFO = @MAKEINFO@ +MKDIR_P = @MKDIR_P@ +PACKAGE = @PACKAGE@ +PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ +PACKAGE_NAME = @PACKAGE_NAME@ +PACKAGE_STRING = @PACKAGE_STRING@ +PACKAGE_TARNAME = @PACKAGE_TARNAME@ +PACKAGE_VERSION = @PACKAGE_VERSION@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +SET_MAKE = @SET_MAKE@ +SHELL = @SHELL@ +STRIP = @STRIP@ +VERSION = @VERSION@ +abs_builddir = @abs_builddir@ +abs_srcdir = @abs_srcdir@ +abs_top_builddir = @abs_top_builddir@ +abs_top_srcdir = @abs_top_srcdir@ +am__leading_dot = @am__leading_dot@ +am__tar = @am__tar@ +am__untar = @am__untar@ +bindir = @bindir@ +build_alias = @build_alias@ +builddir = @builddir@ +datadir = @datadir@ +datarootdir = @datarootdir@ +docdir = @docdir@ +dvidir = @dvidir@ +exec_prefix = @exec_prefix@ +host_alias = @host_alias@ +htmldir = @htmldir@ +includedir = @includedir@ +infodir = @infodir@ +install_sh = @install_sh@ +libdir = @libdir@ +libexecdir = @libexecdir@ +localedir = @localedir@ +localstatedir = @localstatedir@ +mandir = @mandir@ +mkdir_p = @mkdir_p@ +oldincludedir = @oldincludedir@ +pdfdir = @pdfdir@ +prefix = @prefix@ +program_transform_name = @program_transform_name@ +psdir = @psdir@ +sbindir = @sbindir@ +sharedstatedir = @sharedstatedir@ +srcdir = @srcdir@ +sysconfdir = @sysconfdir@ +target_alias = @target_alias@ +top_builddir = @top_builddir@ +top_srcdir = @top_srcdir@ +XCalibrateincludedir = $(includedir)/X11/extensions +XCalibrateinclude_HEADERS = xcalibrateproto.h xcalibratewire.h +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = xcalibrateproto.pc +EXTRA_DIST = autogen.sh xcalibrateproto.pc.in +all: all-am + +.SUFFIXES: +am--refresh: + @: +$(srcdir)/Makefile.in: $(srcdir)/Makefile.am $(am__configure_deps) + @for dep in $?; do \ + case '$(am__configure_deps)' in \ + *$$dep*) \ + echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \ + cd $(srcdir) && $(AUTOMAKE) --foreign \ + && exit 0; \ + exit 1;; \ + esac; \ + done; \ + echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \ + cd $(top_srcdir) && \ + $(AUTOMAKE) --foreign Makefile +.PRECIOUS: Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + @case '$?' in \ + *config.status*) \ + echo ' $(SHELL) ./config.status'; \ + $(SHELL) ./config.status;; \ + *) \ + echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \ + cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \ + esac; + +$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) + $(SHELL) ./config.status --recheck + +$(top_srcdir)/configure: $(am__configure_deps) + cd $(srcdir) && $(AUTOCONF) +$(ACLOCAL_M4): $(am__aclocal_m4_deps) + cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS) +xcalibrateproto.pc: $(top_builddir)/config.status $(srcdir)/xcalibrateproto.pc.in + cd $(top_builddir) && $(SHELL) ./config.status $@ +install-pkgconfigDATA: $(pkgconfig_DATA) + @$(NORMAL_INSTALL) + test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)" + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done + +uninstall-pkgconfigDATA: + @$(NORMAL_UNINSTALL) + @list='$(pkgconfig_DATA)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \ + rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \ + done +install-XCalibrateincludeHEADERS: $(XCalibrateinclude_HEADERS) + @$(NORMAL_INSTALL) + test -z "$(XCalibrateincludedir)" || $(MKDIR_P) "$(DESTDIR)$(XCalibrateincludedir)" + @list='$(XCalibrateinclude_HEADERS)'; for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + f=$(am__strip_dir) \ + echo " $(XCalibrateincludeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(XCalibrateincludedir)/$$f'"; \ + $(XCalibrateincludeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(XCalibrateincludedir)/$$f"; \ + done + +uninstall-XCalibrateincludeHEADERS: + @$(NORMAL_UNINSTALL) + @list='$(XCalibrateinclude_HEADERS)'; for p in $$list; do \ + f=$(am__strip_dir) \ + echo " rm -f '$(DESTDIR)$(XCalibrateincludedir)/$$f'"; \ + rm -f "$(DESTDIR)$(XCalibrateincludedir)/$$f"; \ + done + +ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + mkid -fID $$unique +tags: TAGS + +TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \ + test -n "$$unique" || unique=$$empty_fix; \ + $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ + $$tags $$unique; \ + fi +ctags: CTAGS +CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ + $(TAGS_FILES) $(LISP) + tags=; \ + here=`pwd`; \ + list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ + unique=`for i in $$list; do \ + if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ + done | \ + $(AWK) ' { files[$$0] = 1; } \ + END { for (i in files) print i; }'`; \ + test -z "$(CTAGS_ARGS)$$tags$$unique" \ + || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ + $$tags $$unique + +GTAGS: + here=`$(am__cd) $(top_builddir) && pwd` \ + && cd $(top_srcdir) \ + && gtags -i $(GTAGS_ARGS) $$here + +distclean-tags: + -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags + +distdir: $(DISTFILES) + $(am__remove_distdir) + test -d $(distdir) || mkdir $(distdir) + @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ + list='$(DISTFILES)'; \ + dist_files=`for file in $$list; do echo $$file; done | \ + sed -e "s|^$$srcdirstrip/||;t" \ + -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ + case $$dist_files in \ + */*) $(MKDIR_P) `echo "$$dist_files" | \ + sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ + sort -u` ;; \ + esac; \ + for file in $$dist_files; do \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + if test -d $$d/$$file; then \ + dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ + cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \ + fi; \ + cp -pR $$d/$$file $(distdir)$$dir || exit 1; \ + else \ + test -f $(distdir)/$$file \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ + fi; \ + done + -find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ + ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ + || chmod -R a+r $(distdir) +dist-gzip: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + $(am__remove_distdir) +dist-bzip2: distdir + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +dist-tarZ: distdir + tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z + $(am__remove_distdir) + +dist-shar: distdir + shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz + $(am__remove_distdir) + +dist-zip: distdir + -rm -f $(distdir).zip + zip -rq $(distdir).zip $(distdir) + $(am__remove_distdir) + +dist dist-all: distdir + tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz + tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2 + $(am__remove_distdir) + +# This target untars the dist file and tries a VPATH configuration. Then +# it guarantees that the distribution is self-contained by making another +# tarfile. +distcheck: dist + case '$(DIST_ARCHIVES)' in \ + *.tar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + *.tar.bz2*) \ + bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + *.tar.Z*) \ + uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ + *.shar.gz*) \ + GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + *.zip*) \ + unzip $(distdir).zip ;;\ + esac + chmod -R a-w $(distdir); chmod a+w $(distdir) + mkdir $(distdir)/_build + mkdir $(distdir)/_inst + chmod a-w $(distdir) + dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ + && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ + && cd $(distdir)/_build \ + && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + $(DISTCHECK_CONFIGURE_FLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) \ + && $(MAKE) $(AM_MAKEFLAGS) dvi \ + && $(MAKE) $(AM_MAKEFLAGS) check \ + && $(MAKE) $(AM_MAKEFLAGS) install \ + && $(MAKE) $(AM_MAKEFLAGS) installcheck \ + && $(MAKE) $(AM_MAKEFLAGS) uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \ + distuninstallcheck \ + && chmod -R a-w "$$dc_install_base" \ + && ({ \ + (cd ../.. && umask 077 && mkdir "$$dc_destdir") \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \ + && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \ + distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \ + } || { rm -rf "$$dc_destdir"; exit 1; }) \ + && rm -rf "$$dc_destdir" \ + && $(MAKE) $(AM_MAKEFLAGS) dist \ + && rm -rf $(DIST_ARCHIVES) \ + && $(MAKE) $(AM_MAKEFLAGS) distcleancheck + $(am__remove_distdir) + @(echo "$(distdir) archives ready for distribution: "; \ + list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \ + sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x' +distuninstallcheck: + @cd $(distuninstallcheck_dir) \ + && test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \ + || { echo "ERROR: files left after uninstall:" ; \ + if test -n "$(DESTDIR)"; then \ + echo " (check DESTDIR support)"; \ + fi ; \ + $(distuninstallcheck_listfiles) ; \ + exit 1; } >&2 +distcleancheck: distclean + @if test '$(srcdir)' = . ; then \ + echo "ERROR: distcleancheck can only run from a VPATH build" ; \ + exit 1 ; \ + fi + @test `$(distcleancheck_listfiles) | wc -l` -eq 0 \ + || { echo "ERROR: files left in build directory after distclean:" ; \ + $(distcleancheck_listfiles) ; \ + exit 1; } >&2 +check-am: all-am +check: check-am +all-am: Makefile $(DATA) $(HEADERS) +installdirs: + for dir in "$(DESTDIR)$(pkgconfigdir)" "$(DESTDIR)$(XCalibrateincludedir)"; do \ + test -z "$$dir" || $(MKDIR_P) "$$dir"; \ + done +install: install-am +install-exec: install-exec-am +install-data: install-data-am +uninstall: uninstall-am + +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am + +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install +mostlyclean-generic: + +clean-generic: + +distclean-generic: + -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) + +maintainer-clean-generic: + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am + +clean-am: clean-generic mostlyclean-am + +distclean: distclean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -f Makefile +distclean-am: clean-am distclean-generic distclean-tags + +dvi: dvi-am + +dvi-am: + +html: html-am + +info: info-am + +info-am: + +install-data-am: install-XCalibrateincludeHEADERS \ + install-pkgconfigDATA + +install-dvi: install-dvi-am + +install-exec-am: + +install-html: install-html-am + +install-info: install-info-am + +install-man: + +install-pdf: install-pdf-am + +install-ps: install-ps-am + +installcheck-am: + +maintainer-clean: maintainer-clean-am + -rm -f $(am__CONFIG_DISTCLEAN_FILES) + -rm -rf $(top_srcdir)/autom4te.cache + -rm -f Makefile +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +pdf: pdf-am + +pdf-am: + +ps: ps-am + +ps-am: + +uninstall-am: uninstall-XCalibrateincludeHEADERS \ + uninstall-pkgconfigDATA + +.MAKE: install-am install-strip + +.PHONY: CTAGS GTAGS all all-am am--refresh check check-am clean \ + clean-generic ctags dist dist-all dist-bzip2 dist-gzip \ + dist-shar dist-tarZ dist-zip distcheck distclean \ + distclean-generic distclean-tags distcleancheck distdir \ + distuninstallcheck dvi dvi-am html html-am info info-am \ + install install-XCalibrateincludeHEADERS install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkgconfigDATA install-ps install-ps-am \ + install-strip installcheck installcheck-am installdirs \ + maintainer-clean maintainer-clean-generic mostlyclean \ + mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \ + uninstall-XCalibrateincludeHEADERS uninstall-am \ + uninstall-pkgconfigDATA + +# Tell versions [3.59,3.63) of GNU make to not export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: diff --git a/Xorg/xorg/proto/calibrateproto/src/aclocal.m4 b/Xorg/xorg/proto/calibrateproto/src/aclocal.m4 new file mode 100644 index 0000000000..29813443a1 --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/aclocal.m4 @@ -0,0 +1,548 @@ +# generated automatically by aclocal 1.10 -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_if(m4_PACKAGE_VERSION, [2.61],, +[m4_fatal([this file was generated for autoconf 2.61. +You have another version of autoconf. If you want to use that, +you should regenerate the build system entirely.], [63])]) + +# Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.10' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.10], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.10])dnl +_AM_AUTOCONF_VERSION(m4_PACKAGE_VERSION)]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[dnl Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50])dnl +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, +# 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 12 + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.60])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if(m4_ifdef([AC_PACKAGE_NAME], 1)m4_ifdef([AC_PACKAGE_VERSION], 1), 11,, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +AC_REQUIRE([AM_PROG_MKDIR_P])dnl +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_CC], + defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_CXX], + defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES(OBJC)], + [define([AC_PROG_OBJC], + defn([AC_PROG_OBJC])[_AM_DEPENDENCIES(OBJC)])])dnl +]) +]) + + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $1 | $1:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# Copyright (C) 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 5 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check for `mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001, 2002, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 3 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005 +# Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 4 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken +alias in your environment]) + fi + + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT(yes)]) + +# Copyright (C) 2001, 2003, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputing VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004, 2005 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# serial 2 + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of `v7', `ustar', or `pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. +AM_MISSING_PROG([AMTAR], [tar]) +m4_if([$1], [v7], + [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'], + [m4_case([$1], [ustar],, [pax],, + [m4_fatal([Unknown tar format])]) +AC_MSG_CHECKING([how to create a $1 tar archive]) +# Loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' +_am_tools=${am_cv_prog_tar_$1-$_am_tools} +# Do not fold the above two line into one, because Tru64 sh and +# Solaris sh will not grok spaces in the rhs of `-'. +for _am_tool in $_am_tools +do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; + do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi +done +rm -rf conftest.dir + +AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) +AC_MSG_RESULT([$am_cv_prog_tar_$1])]) +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + diff --git a/Xorg/xorg/proto/calibrateproto/src/autogen.sh b/Xorg/xorg/proto/calibrateproto/src/autogen.sh new file mode 100755 index 0000000000..904cd6746c --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/autogen.sh @@ -0,0 +1,12 @@ +#! /bin/sh + +srcdir=`dirname $0` +test -z "$srcdir" && srcdir=. + +ORIGDIR=`pwd` +cd $srcdir + +autoreconf -v --install || exit 1 +cd $ORIGDIR || exit $? + +$srcdir/configure --enable-maintainer-mode "$@" diff --git a/Xorg/xorg/proto/calibrateproto/src/config.log b/Xorg/xorg/proto/calibrateproto/src/config.log new file mode 100644 index 0000000000..3b696e241c --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/config.log @@ -0,0 +1,165 @@ +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by xcalibrateproto configure 0.1.0, which was +generated by GNU Autoconf 2.61. Invocation command line was + + $ ./configure --enable-maintainer-mode + +## --------- ## +## Platform. ## +## --------- ## + +hostname = blap +uname -m = i686 +uname -r = 2.6.22.5 +uname -s = Linux +uname -v = #12 Fri Aug 31 21:30:17 CEST 2007 + +/usr/bin/uname -p = unknown +/bin/uname -X = unknown + +/bin/arch = i686 +/usr/bin/arch -k = unknown +/usr/convex/getsysinfo = unknown +/usr/bin/hostinfo = unknown +/bin/machine = unknown +/usr/bin/oslevel = unknown +/bin/universe = unknown + +PATH: /usr/local/bin +PATH: /usr/bin +PATH: /bin +PATH: /usr/bin/X11 +PATH: /usr/games + + +## ----------- ## +## Core tests. ## +## ----------- ## + +configure:1692: checking for a BSD-compatible install +configure:1748: result: /usr/bin/install -c +configure:1759: checking whether build environment is sane +configure:1802: result: yes +configure:1830: checking for a thread-safe mkdir -p +configure:1869: result: /bin/mkdir -p +configure:1882: checking for gawk +configure:1898: found /usr/bin/gawk +configure:1909: result: gawk +configure:1920: checking whether make sets $(MAKE) +configure:1941: result: yes +configure:2262: creating ./config.status + +## ---------------------- ## +## Running config.status. ## +## ---------------------- ## + +This file was extended by xcalibrateproto config.status 0.1.0, which was +generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = + CONFIG_HEADERS = + CONFIG_LINKS = + CONFIG_COMMANDS = + $ ./config.status + +on blap + +config.status:589: creating Makefile +config.status:589: creating xcalibrateproto.pc + +## ---------------- ## +## Cache variables. ## +## ---------------- ## + +ac_cv_env_build_alias_set= +ac_cv_env_build_alias_value= +ac_cv_env_host_alias_set= +ac_cv_env_host_alias_value= +ac_cv_env_target_alias_set= +ac_cv_env_target_alias_value= +ac_cv_path_install='/usr/bin/install -c' +ac_cv_path_mkdir=/bin/mkdir +ac_cv_prog_AWK=gawk +ac_cv_prog_make_make_set=yes + +## ----------------- ## +## Output variables. ## +## ----------------- ## + +ACLOCAL='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run aclocal-1.10' +AMTAR='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run tar' +AUTOCONF='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoconf' +AUTOHEADER='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoheader' +AUTOMAKE='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run automake-1.10' +AWK='gawk' +CYGPATH_W='echo' +DEFS='-DPACKAGE_NAME=\"xcalibrateproto\" -DPACKAGE_TARNAME=\"xcalibrateproto\" -DPACKAGE_VERSION=\"0.1.0\" -DPACKAGE_STRING=\"xcalibrateproto\ 0.1.0\" -DPACKAGE_BUGREPORT=\"pb@nexus.co.uk\" -DPACKAGE=\"xcalibrateproto\" -DVERSION=\"0.1.0\"' +ECHO_C='' +ECHO_N='-n' +ECHO_T='' +INSTALL_DATA='${INSTALL} -m 644' +INSTALL_PROGRAM='${INSTALL}' +INSTALL_SCRIPT='${INSTALL}' +INSTALL_STRIP_PROGRAM='$(install_sh) -c -s' +LIBOBJS='' +LIBS='' +LTLIBOBJS='' +MAKEINFO='${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run makeinfo' +PACKAGE='xcalibrateproto' +PACKAGE_BUGREPORT='pb@nexus.co.uk' +PACKAGE_NAME='xcalibrateproto' +PACKAGE_STRING='xcalibrateproto 0.1.0' +PACKAGE_TARNAME='xcalibrateproto' +PACKAGE_VERSION='0.1.0' +PATH_SEPARATOR=':' +SET_MAKE='' +SHELL='/bin/sh' +STRIP='' +VERSION='0.1.0' +am__isrc='' +am__leading_dot='.' +am__tar='${AMTAR} chof - "$$tardir"' +am__untar='${AMTAR} xf -' +bindir='${exec_prefix}/bin' +build_alias='' +datadir='${datarootdir}' +datarootdir='${prefix}/share' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +dvidir='${docdir}' +exec_prefix='${prefix}' +host_alias='' +htmldir='${docdir}' +includedir='${prefix}/include' +infodir='${datarootdir}/info' +install_sh='$(SHELL) /var/src/owrt-X/build_dir/i386/calibrateproto-git/install-sh' +libdir='${exec_prefix}/lib' +libexecdir='${exec_prefix}/libexec' +localedir='${datarootdir}/locale' +localstatedir='${prefix}/var' +mandir='${datarootdir}/man' +mkdir_p='/bin/mkdir -p' +oldincludedir='/usr/include' +pdfdir='${docdir}' +prefix='/usr/local' +program_transform_name='s,x,x,' +psdir='${docdir}' +sbindir='${exec_prefix}/sbin' +sharedstatedir='${prefix}/com' +sysconfdir='${prefix}/etc' +target_alias='' + +## ----------- ## +## confdefs.h. ## +## ----------- ## + +#define PACKAGE_NAME "xcalibrateproto" +#define PACKAGE_TARNAME "xcalibrateproto" +#define PACKAGE_VERSION "0.1.0" +#define PACKAGE_STRING "xcalibrateproto 0.1.0" +#define PACKAGE_BUGREPORT "pb@nexus.co.uk" +#define PACKAGE "xcalibrateproto" +#define VERSION "0.1.0" + +configure: exit 0 diff --git a/Xorg/xorg/proto/calibrateproto/src/config.status b/Xorg/xorg/proto/calibrateproto/src/config.status new file mode 100755 index 0000000000..8d863242e7 --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/config.status @@ -0,0 +1,786 @@ +#! /bin/sh +# Generated by configure. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=${CONFIG_SHELL-/bin/sh} +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 + +# Save the log message, to keep $[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by xcalibrateproto $as_me 0.1.0, which was +generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +# Files that config.status was made for. +config_files=" Makefile xcalibrateproto.pc" + +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + +Configuration files: +$config_files + +Report bugs to ." + +ac_cs_version="\ +xcalibrateproto config.status 0.1.0 +configured by ./configure, generated by GNU Autoconf 2.61, + with options \"'--enable-maintainer-mode'\" + +Copyright (C) 2006 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='/var/src/owrt-X/build_dir/i386/calibrateproto-git' +srcdir='.' +INSTALL='/usr/bin/install -c' +MKDIR_P='/bin/mkdir -p' +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" + ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +if $ac_cs_recheck; then + echo "running CONFIG_SHELL=/bin/sh /bin/sh ./configure " '--enable-maintainer-mode' $ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=/bin/sh + export CONFIG_SHELL + exec /bin/sh "./configure" '--enable-maintainer-mode' $ac_configure_extra_args --no-create --no-recursion +fi + +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 + + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "xcalibrateproto.pc") CONFIG_FILES="$CONFIG_FILES xcalibrateproto.pc" ;; + + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || +{ + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } +} + +# +# Set up the sed scripts for CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "$CONFIG_FILES"; then + +cat >"$tmp/subs-1.sed" <<\CEOF +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +s,@SHELL@,|#_!!_#|/bin/sh,g +s,@PATH_SEPARATOR@,|#_!!_#|:,g +s,@PACKAGE_NAME@,|#_!!_#|xcalibrateproto,g +s,@PACKAGE_TARNAME@,|#_!!_#|xcalibrateproto,g +s,@PACKAGE_VERSION@,|#_!!_#|0.1.0,g +s,@PACKAGE_STRING@,|#_!!_#|xcalibrateproto 0.1.0,g +s,@PACKAGE_BUGREPORT@,|#_!!_#|pb@|#_!!_#|nexus.co.uk,g +s,@exec_prefix@,|#_!!_#|${prefix},g +s,@prefix@,|#_!!_#|/usr/local,g +s,@program_transform_name@,|#_!!_#|s\,x\,x\,,g +s,@bindir@,|#_!!_#|${exec_prefix}/bin,g +s,@sbindir@,|#_!!_#|${exec_prefix}/sbin,g +s,@libexecdir@,|#_!!_#|${exec_prefix}/libexec,g +s,@datarootdir@,|#_!!_#|${prefix}/share,g +s,@datadir@,|#_!!_#|${datarootdir},g +s,@sysconfdir@,|#_!!_#|${prefix}/etc,g +s,@sharedstatedir@,|#_!!_#|${prefix}/com,g +s,@localstatedir@,|#_!!_#|${prefix}/var,g +s,@includedir@,|#_!!_#|${prefix}/include,g +s,@oldincludedir@,|#_!!_#|/usr/include,g +s,@docdir@,|#_!!_#|${datarootdir}/doc/${PACKAGE_TARNAME},g +s,@infodir@,|#_!!_#|${datarootdir}/info,g +s,@htmldir@,|#_!!_#|${docdir},g +s,@dvidir@,|#_!!_#|${docdir},g +s,@pdfdir@,|#_!!_#|${docdir},g +s,@psdir@,|#_!!_#|${docdir},g +s,@libdir@,|#_!!_#|${exec_prefix}/lib,g +s,@localedir@,|#_!!_#|${datarootdir}/locale,g +s,@mandir@,|#_!!_#|${datarootdir}/man,g +s,@DEFS@,|#_!!_#|-DPACKAGE_NAME=\\"xcalibrateproto\\" -DPACKAGE_TARNAME=\\"xcalibrateproto\\" -DPACKAGE_VERSION=\\"0.1.0\\" -DPACKAGE_STRING=\\"xcalibrateproto\\ 0.1.0\\" -DPACKAGE_BUGREPORT=\\"pb@|#_!!_#|nexus.co.uk\\" -DPACKAGE=\\"xcalibrateproto\\" -DVERSION=\\"0.1.0\\",g +s,@ECHO_C@,|#_!!_#|,g +s,@ECHO_N@,|#_!!_#|-n,g +s,@ECHO_T@,|#_!!_#|,g +s,@LIBS@,|#_!!_#|,g +s,@build_alias@,|#_!!_#|,g +s,@host_alias@,|#_!!_#|,g +s,@target_alias@,|#_!!_#|,g +s,@INSTALL_PROGRAM@,|#_!!_#|${INSTALL},g +s,@INSTALL_SCRIPT@,|#_!!_#|${INSTALL},g +s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g +s,@am__isrc@,|#_!!_#|,g +s,@CYGPATH_W@,|#_!!_#|echo,g +s,@PACKAGE@,|#_!!_#|xcalibrateproto,g +s,@VERSION@,|#_!!_#|0.1.0,g +s,@ACLOCAL@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run aclocal-1.10,g +s,@AUTOCONF@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoconf,g +s,@AUTOMAKE@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run automake-1.10,g +s,@AUTOHEADER@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run autoheader,g +s,@MAKEINFO@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run makeinfo,g +s,@install_sh@,|#_!!_#|$(SHELL) /var/src/owrt-X/build_dir/i386/calibrateproto-git/install-sh,g +s,@STRIP@,|#_!!_#|,g +s,@INSTALL_STRIP_PROGRAM@,|#_!!_#|$(install_sh) -c -s,g +s,@mkdir_p@,|#_!!_#|/bin/mkdir -p,g +s,@AWK@,|#_!!_#|gawk,g +s,@SET_MAKE@,|#_!!_#|,g +s,@am__leading_dot@,|#_!!_#|.,g +s,@AMTAR@,|#_!!_#|${SHELL} /var/src/owrt-X/build_dir/i386/calibrateproto-git/missing --run tar,g +s,@am__tar@,|#_!!_#|${AMTAR} chof - "$$tardir",g +s,@am__untar@,|#_!!_#|${AMTAR} xf -,g +s,@LIBOBJS@,|#_!!_#|,g +s,@LTLIBOBJS@,|#_!!_#|,g +:end +s/|#_!!_#|//g +CEOF +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} + ac_datarootdir_hack=' + s&@datadir@&${datarootdir}&g + s&@docdir@&${datarootdir}/doc/${PACKAGE_TARNAME}&g + s&@infodir@&${datarootdir}/info&g + s&@localedir@&${datarootdir}/locale&g + s&@mandir@&${datarootdir}/man&g + s&\${datarootdir}&${prefix}/share&g' ;; +esac + sed "/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +} + +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac + ;; + + + + esac + +done # for ac_tag + + +{ (exit 0); exit 0; } diff --git a/Xorg/xorg/proto/calibrateproto/src/configure b/Xorg/xorg/proto/calibrateproto/src/configure new file mode 100755 index 0000000000..d1f2c773c9 --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/configure @@ -0,0 +1,3163 @@ +#! /bin/sh +# Guess values for system-dependent variables and create Makefiles. +# Generated by GNU Autoconf 2.61 for xcalibrateproto 0.1.0. +# +# Report bugs to . +# +# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# This configure script is free software; the Free Software Foundation +# gives unlimited permission to copy, distribute and modify it. +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + +if test "x$CONFIG_SHELL" = x; then + if (eval ":") 2>/dev/null; then + as_have_required=yes +else + as_have_required=no +fi + + if test $as_have_required = yes && (eval ": +(as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=\$LINENO + as_lineno_2=\$LINENO + test \"x\$as_lineno_1\" != \"x\$as_lineno_2\" && + test \"x\`expr \$as_lineno_1 + 1\`\" = \"x\$as_lineno_2\") || { (exit 1); exit 1; } +") 2> /dev/null; then + : +else + as_candidate_shells= + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + case $as_dir in + /*) + for as_base in sh bash ksh sh5; do + as_candidate_shells="$as_candidate_shells $as_dir/$as_base" + done;; + esac +done +IFS=$as_save_IFS + + + for as_shell in $as_candidate_shells $SHELL; do + # Try only shells that exist, to save several forks. + if { test -f "$as_shell" || test -f "$as_shell.exe"; } && + { ("$as_shell") 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +_ASEOF +}; then + CONFIG_SHELL=$as_shell + as_have_required=yes + if { "$as_shell" 2> /dev/null <<\_ASEOF +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + +: +(as_func_return () { + (exit $1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = "$1" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test $exitcode = 0) || { (exit 1); exit 1; } + +( + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2") || { (exit 1); exit 1; } + +_ASEOF +}; then + break +fi + +fi + + done + + if test "x$CONFIG_SHELL" != x; then + for as_var in BASH_ENV ENV + do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + done + export CONFIG_SHELL + exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"} +fi + + + if test $as_have_required = no; then + echo This script requires a shell more modern than all the + echo shells that I found on your system. Please install a + echo modern shell, or manually run the script under such a + echo shell if you do have one. + { (exit 1); exit 1; } +fi + + +fi + +fi + + + +(eval "as_func_return () { + (exit \$1) +} +as_func_success () { + as_func_return 0 +} +as_func_failure () { + as_func_return 1 +} +as_func_ret_success () { + return 0 +} +as_func_ret_failure () { + return 1 +} + +exitcode=0 +if as_func_success; then + : +else + exitcode=1 + echo as_func_success failed. +fi + +if as_func_failure; then + exitcode=1 + echo as_func_failure succeeded. +fi + +if as_func_ret_success; then + : +else + exitcode=1 + echo as_func_ret_success failed. +fi + +if as_func_ret_failure; then + exitcode=1 + echo as_func_ret_failure succeeded. +fi + +if ( set x; as_func_ret_success y && test x = \"\$1\" ); then + : +else + exitcode=1 + echo positional parameters were not saved. +fi + +test \$exitcode = 0") || { + echo No shell found that supports shell functions. + echo Please tell autoconf@gnu.org about your system, + echo including any error possibly output before this + echo message +} + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + + +exec 7<&0 &1 + +# Name of the host. +# hostname on some systems (SVR3.2, Linux) returns a bogus exit status, +# so uname gets run too. +ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q` + +# +# Initializations. +# +ac_default_prefix=/usr/local +ac_clean_files= +ac_config_libobj_dir=. +LIBOBJS= +cross_compiling=no +subdirs= +MFLAGS= +MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} + +# Identity of this package. +PACKAGE_NAME='xcalibrateproto' +PACKAGE_TARNAME='xcalibrateproto' +PACKAGE_VERSION='0.1.0' +PACKAGE_STRING='xcalibrateproto 0.1.0' +PACKAGE_BUGREPORT='pb@nexus.co.uk' + +ac_subst_vars='SHELL +PATH_SEPARATOR +PACKAGE_NAME +PACKAGE_TARNAME +PACKAGE_VERSION +PACKAGE_STRING +PACKAGE_BUGREPORT +exec_prefix +prefix +program_transform_name +bindir +sbindir +libexecdir +datarootdir +datadir +sysconfdir +sharedstatedir +localstatedir +includedir +oldincludedir +docdir +infodir +htmldir +dvidir +pdfdir +psdir +libdir +localedir +mandir +DEFS +ECHO_C +ECHO_N +ECHO_T +LIBS +build_alias +host_alias +target_alias +INSTALL_PROGRAM +INSTALL_SCRIPT +INSTALL_DATA +am__isrc +CYGPATH_W +PACKAGE +VERSION +ACLOCAL +AUTOCONF +AUTOMAKE +AUTOHEADER +MAKEINFO +install_sh +STRIP +INSTALL_STRIP_PROGRAM +mkdir_p +AWK +SET_MAKE +am__leading_dot +AMTAR +am__tar +am__untar +LIBOBJS +LTLIBOBJS' +ac_subst_files='' + ac_precious_vars='build_alias +host_alias +target_alias' + + +# Initialize some variables set by options. +ac_init_help= +ac_init_version=false +# The variables have the same names as the options, with +# dashes changed to underlines. +cache_file=/dev/null +exec_prefix=NONE +no_create= +no_recursion= +prefix=NONE +program_prefix=NONE +program_suffix=NONE +program_transform_name=s,x,x, +silent= +site= +srcdir= +verbose= +x_includes=NONE +x_libraries=NONE + +# Installation directory options. +# These are left unexpanded so users can "make install exec_prefix=/foo" +# and all the variables that are supposed to be based on exec_prefix +# by default will actually change. +# Use braces instead of parens because sh, perl, etc. also accept them. +# (The list follows the same order as the GNU Coding Standards.) +bindir='${exec_prefix}/bin' +sbindir='${exec_prefix}/sbin' +libexecdir='${exec_prefix}/libexec' +datarootdir='${prefix}/share' +datadir='${datarootdir}' +sysconfdir='${prefix}/etc' +sharedstatedir='${prefix}/com' +localstatedir='${prefix}/var' +includedir='${prefix}/include' +oldincludedir='/usr/include' +docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' +infodir='${datarootdir}/info' +htmldir='${docdir}' +dvidir='${docdir}' +pdfdir='${docdir}' +psdir='${docdir}' +libdir='${exec_prefix}/lib' +localedir='${datarootdir}/locale' +mandir='${datarootdir}/man' + +ac_prev= +ac_dashdash= +for ac_option +do + # If the previous option needs an argument, assign it. + if test -n "$ac_prev"; then + eval $ac_prev=\$ac_option + ac_prev= + continue + fi + + case $ac_option in + *=*) ac_optarg=`expr "X$ac_option" : '[^=]*=\(.*\)'` ;; + *) ac_optarg=yes ;; + esac + + # Accept the important Cygnus configure options, so we can diagnose typos. + + case $ac_dashdash$ac_option in + --) + ac_dashdash=yes ;; + + -bindir | --bindir | --bindi | --bind | --bin | --bi) + ac_prev=bindir ;; + -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*) + bindir=$ac_optarg ;; + + -build | --build | --buil | --bui | --bu) + ac_prev=build_alias ;; + -build=* | --build=* | --buil=* | --bui=* | --bu=*) + build_alias=$ac_optarg ;; + + -cache-file | --cache-file | --cache-fil | --cache-fi \ + | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c) + ac_prev=cache_file ;; + -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \ + | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*) + cache_file=$ac_optarg ;; + + --config-cache | -C) + cache_file=config.cache ;; + + -datadir | --datadir | --datadi | --datad) + ac_prev=datadir ;; + -datadir=* | --datadir=* | --datadi=* | --datad=*) + datadir=$ac_optarg ;; + + -datarootdir | --datarootdir | --datarootdi | --datarootd | --dataroot \ + | --dataroo | --dataro | --datar) + ac_prev=datarootdir ;; + -datarootdir=* | --datarootdir=* | --datarootdi=* | --datarootd=* \ + | --dataroot=* | --dataroo=* | --dataro=* | --datar=*) + datarootdir=$ac_optarg ;; + + -disable-* | --disable-*) + ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=no ;; + + -docdir | --docdir | --docdi | --doc | --do) + ac_prev=docdir ;; + -docdir=* | --docdir=* | --docdi=* | --doc=* | --do=*) + docdir=$ac_optarg ;; + + -dvidir | --dvidir | --dvidi | --dvid | --dvi | --dv) + ac_prev=dvidir ;; + -dvidir=* | --dvidir=* | --dvidi=* | --dvid=* | --dvi=* | --dv=*) + dvidir=$ac_optarg ;; + + -enable-* | --enable-*) + ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid feature name: $ac_feature" >&2 + { (exit 1); exit 1; }; } + ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'` + eval enable_$ac_feature=\$ac_optarg ;; + + -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \ + | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \ + | --exec | --exe | --ex) + ac_prev=exec_prefix ;; + -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \ + | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \ + | --exec=* | --exe=* | --ex=*) + exec_prefix=$ac_optarg ;; + + -gas | --gas | --ga | --g) + # Obsolete; use --with-gas. + with_gas=yes ;; + + -help | --help | --hel | --he | -h) + ac_init_help=long ;; + -help=r* | --help=r* | --hel=r* | --he=r* | -hr*) + ac_init_help=recursive ;; + -help=s* | --help=s* | --hel=s* | --he=s* | -hs*) + ac_init_help=short ;; + + -host | --host | --hos | --ho) + ac_prev=host_alias ;; + -host=* | --host=* | --hos=* | --ho=*) + host_alias=$ac_optarg ;; + + -htmldir | --htmldir | --htmldi | --htmld | --html | --htm | --ht) + ac_prev=htmldir ;; + -htmldir=* | --htmldir=* | --htmldi=* | --htmld=* | --html=* | --htm=* \ + | --ht=*) + htmldir=$ac_optarg ;; + + -includedir | --includedir | --includedi | --included | --include \ + | --includ | --inclu | --incl | --inc) + ac_prev=includedir ;; + -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \ + | --includ=* | --inclu=* | --incl=* | --inc=*) + includedir=$ac_optarg ;; + + -infodir | --infodir | --infodi | --infod | --info | --inf) + ac_prev=infodir ;; + -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*) + infodir=$ac_optarg ;; + + -libdir | --libdir | --libdi | --libd) + ac_prev=libdir ;; + -libdir=* | --libdir=* | --libdi=* | --libd=*) + libdir=$ac_optarg ;; + + -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \ + | --libexe | --libex | --libe) + ac_prev=libexecdir ;; + -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \ + | --libexe=* | --libex=* | --libe=*) + libexecdir=$ac_optarg ;; + + -localedir | --localedir | --localedi | --localed | --locale) + ac_prev=localedir ;; + -localedir=* | --localedir=* | --localedi=* | --localed=* | --locale=*) + localedir=$ac_optarg ;; + + -localstatedir | --localstatedir | --localstatedi | --localstated \ + | --localstate | --localstat | --localsta | --localst | --locals) + ac_prev=localstatedir ;; + -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \ + | --localstate=* | --localstat=* | --localsta=* | --localst=* | --locals=*) + localstatedir=$ac_optarg ;; + + -mandir | --mandir | --mandi | --mand | --man | --ma | --m) + ac_prev=mandir ;; + -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*) + mandir=$ac_optarg ;; + + -nfp | --nfp | --nf) + # Obsolete; use --without-fp. + with_fp=no ;; + + -no-create | --no-create | --no-creat | --no-crea | --no-cre \ + | --no-cr | --no-c | -n) + no_create=yes ;; + + -no-recursion | --no-recursion | --no-recursio | --no-recursi \ + | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r) + no_recursion=yes ;; + + -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \ + | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \ + | --oldin | --oldi | --old | --ol | --o) + ac_prev=oldincludedir ;; + -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \ + | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \ + | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*) + oldincludedir=$ac_optarg ;; + + -prefix | --prefix | --prefi | --pref | --pre | --pr | --p) + ac_prev=prefix ;; + -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*) + prefix=$ac_optarg ;; + + -program-prefix | --program-prefix | --program-prefi | --program-pref \ + | --program-pre | --program-pr | --program-p) + ac_prev=program_prefix ;; + -program-prefix=* | --program-prefix=* | --program-prefi=* \ + | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*) + program_prefix=$ac_optarg ;; + + -program-suffix | --program-suffix | --program-suffi | --program-suff \ + | --program-suf | --program-su | --program-s) + ac_prev=program_suffix ;; + -program-suffix=* | --program-suffix=* | --program-suffi=* \ + | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*) + program_suffix=$ac_optarg ;; + + -program-transform-name | --program-transform-name \ + | --program-transform-nam | --program-transform-na \ + | --program-transform-n | --program-transform- \ + | --program-transform | --program-transfor \ + | --program-transfo | --program-transf \ + | --program-trans | --program-tran \ + | --progr-tra | --program-tr | --program-t) + ac_prev=program_transform_name ;; + -program-transform-name=* | --program-transform-name=* \ + | --program-transform-nam=* | --program-transform-na=* \ + | --program-transform-n=* | --program-transform-=* \ + | --program-transform=* | --program-transfor=* \ + | --program-transfo=* | --program-transf=* \ + | --program-trans=* | --program-tran=* \ + | --progr-tra=* | --program-tr=* | --program-t=*) + program_transform_name=$ac_optarg ;; + + -pdfdir | --pdfdir | --pdfdi | --pdfd | --pdf | --pd) + ac_prev=pdfdir ;; + -pdfdir=* | --pdfdir=* | --pdfdi=* | --pdfd=* | --pdf=* | --pd=*) + pdfdir=$ac_optarg ;; + + -psdir | --psdir | --psdi | --psd | --ps) + ac_prev=psdir ;; + -psdir=* | --psdir=* | --psdi=* | --psd=* | --ps=*) + psdir=$ac_optarg ;; + + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + silent=yes ;; + + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) + ac_prev=sbindir ;; + -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ + | --sbi=* | --sb=*) + sbindir=$ac_optarg ;; + + -sharedstatedir | --sharedstatedir | --sharedstatedi \ + | --sharedstated | --sharedstate | --sharedstat | --sharedsta \ + | --sharedst | --shareds | --shared | --share | --shar \ + | --sha | --sh) + ac_prev=sharedstatedir ;; + -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \ + | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \ + | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \ + | --sha=* | --sh=*) + sharedstatedir=$ac_optarg ;; + + -site | --site | --sit) + ac_prev=site ;; + -site=* | --site=* | --sit=*) + site=$ac_optarg ;; + + -srcdir | --srcdir | --srcdi | --srcd | --src | --sr) + ac_prev=srcdir ;; + -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*) + srcdir=$ac_optarg ;; + + -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \ + | --syscon | --sysco | --sysc | --sys | --sy) + ac_prev=sysconfdir ;; + -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \ + | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*) + sysconfdir=$ac_optarg ;; + + -target | --target | --targe | --targ | --tar | --ta | --t) + ac_prev=target_alias ;; + -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*) + target_alias=$ac_optarg ;; + + -v | -verbose | --verbose | --verbos | --verbo | --verb) + verbose=yes ;; + + -version | --version | --versio | --versi | --vers | -V) + ac_init_version=: ;; + + -with-* | --with-*) + ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=\$ac_optarg ;; + + -without-* | --without-*) + ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'` + # Reject names that are not valid shell variable names. + expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid package name: $ac_package" >&2 + { (exit 1); exit 1; }; } + ac_package=`echo $ac_package | sed 's/[-.]/_/g'` + eval with_$ac_package=no ;; + + --x) + # Obsolete; use --with-x. + with_x=yes ;; + + -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \ + | --x-incl | --x-inc | --x-in | --x-i) + ac_prev=x_includes ;; + -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \ + | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*) + x_includes=$ac_optarg ;; + + -x-libraries | --x-libraries | --x-librarie | --x-librari \ + | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l) + ac_prev=x_libraries ;; + -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \ + | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*) + x_libraries=$ac_optarg ;; + + -*) { echo "$as_me: error: unrecognized option: $ac_option +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } + ;; + + *=*) + ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='` + # Reject names that are not valid shell variable names. + expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null && + { echo "$as_me: error: invalid variable name: $ac_envvar" >&2 + { (exit 1); exit 1; }; } + eval $ac_envvar=\$ac_optarg + export $ac_envvar ;; + + *) + # FIXME: should be removed in autoconf 3.0. + echo "$as_me: WARNING: you should use --build, --host, --target" >&2 + expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null && + echo "$as_me: WARNING: invalid host type: $ac_option" >&2 + : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option} + ;; + + esac +done + +if test -n "$ac_prev"; then + ac_option=--`echo $ac_prev | sed 's/_/-/g'` + { echo "$as_me: error: missing argument to $ac_option" >&2 + { (exit 1); exit 1; }; } +fi + +# Be sure to have absolute directory names. +for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ + datadir sysconfdir sharedstatedir localstatedir includedir \ + oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ + libdir localedir mandir +do + eval ac_val=\$$ac_var + case $ac_val in + [\\/$]* | ?:[\\/]* ) continue;; + NONE | '' ) case $ac_var in *prefix ) continue;; esac;; + esac + { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2 + { (exit 1); exit 1; }; } +done + +# There might be people who depend on the old broken behavior: `$host' +# used to hold the argument of --host etc. +# FIXME: To remove some day. +build=$build_alias +host=$host_alias +target=$target_alias + +# FIXME: To remove some day. +if test "x$host_alias" != x; then + if test "x$build_alias" = x; then + cross_compiling=maybe + echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host. + If a cross compiler is detected then cross compile mode will be used." >&2 + elif test "x$build_alias" != "x$host_alias"; then + cross_compiling=yes + fi +fi + +ac_tool_prefix= +test -n "$host_alias" && ac_tool_prefix=$host_alias- + +test "$silent" = yes && exec 6>/dev/null + + +ac_pwd=`pwd` && test -n "$ac_pwd" && +ac_ls_di=`ls -di .` && +ac_pwd_ls_di=`cd "$ac_pwd" && ls -di .` || + { echo "$as_me: error: Working directory cannot be determined" >&2 + { (exit 1); exit 1; }; } +test "X$ac_ls_di" = "X$ac_pwd_ls_di" || + { echo "$as_me: error: pwd does not report name of working directory" >&2 + { (exit 1); exit 1; }; } + + +# Find the source files, if location was not specified. +if test -z "$srcdir"; then + ac_srcdir_defaulted=yes + # Try the directory containing this script, then the parent directory. + ac_confdir=`$as_dirname -- "$0" || +$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$0" : 'X\(//\)[^/]' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X"$0" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + srcdir=$ac_confdir + if test ! -r "$srcdir/$ac_unique_file"; then + srcdir=.. + fi +else + ac_srcdir_defaulted=no +fi +if test ! -r "$srcdir/$ac_unique_file"; then + test "$ac_srcdir_defaulted" = yes && srcdir="$ac_confdir or .." + { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2 + { (exit 1); exit 1; }; } +fi +ac_msg="sources are in $srcdir, but \`cd $srcdir' does not work" +ac_abs_confdir=`( + cd "$srcdir" && test -r "./$ac_unique_file" || { echo "$as_me: error: $ac_msg" >&2 + { (exit 1); exit 1; }; } + pwd)` +# When building in place, set srcdir=. +if test "$ac_abs_confdir" = "$ac_pwd"; then + srcdir=. +fi +# Remove unnecessary trailing slashes from srcdir. +# Double slashes in file names in object file debugging info +# mess up M-x gdb in Emacs. +case $srcdir in +*/) srcdir=`expr "X$srcdir" : 'X\(.*[^/]\)' \| "X$srcdir" : 'X\(.*\)'`;; +esac +for ac_var in $ac_precious_vars; do + eval ac_env_${ac_var}_set=\${${ac_var}+set} + eval ac_env_${ac_var}_value=\$${ac_var} + eval ac_cv_env_${ac_var}_set=\${${ac_var}+set} + eval ac_cv_env_${ac_var}_value=\$${ac_var} +done + +# +# Report the --help message. +# +if test "$ac_init_help" = "long"; then + # Omit some internal or obsolete options to make the list less imposing. + # This message is too long to be a string in the A/UX 3.1 sh. + cat <<_ACEOF +\`configure' configures xcalibrateproto 0.1.0 to adapt to many kinds of systems. + +Usage: $0 [OPTION]... [VAR=VALUE]... + +To assign environment variables (e.g., CC, CFLAGS...), specify them as +VAR=VALUE. See below for descriptions of some of the useful variables. + +Defaults for the options are specified in brackets. + +Configuration: + -h, --help display this help and exit + --help=short display options specific to this package + --help=recursive display the short help of all the included packages + -V, --version display version information and exit + -q, --quiet, --silent do not print \`checking...' messages + --cache-file=FILE cache test results in FILE [disabled] + -C, --config-cache alias for \`--cache-file=config.cache' + -n, --no-create do not create output files + --srcdir=DIR find the sources in DIR [configure dir or \`..'] + +Installation directories: + --prefix=PREFIX install architecture-independent files in PREFIX + [$ac_default_prefix] + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX + [PREFIX] + +By default, \`make install' will install all the files in +\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc. You can specify +an installation prefix other than \`$ac_default_prefix' using \`--prefix', +for instance \`--prefix=\$HOME'. + +For better control, use the options below. + +Fine tuning of the installation directories: + --bindir=DIR user executables [EPREFIX/bin] + --sbindir=DIR system admin executables [EPREFIX/sbin] + --libexecdir=DIR program executables [EPREFIX/libexec] + --sysconfdir=DIR read-only single-machine data [PREFIX/etc] + --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] + --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --libdir=DIR object code libraries [EPREFIX/lib] + --includedir=DIR C header files [PREFIX/include] + --oldincludedir=DIR C header files for non-gcc [/usr/include] + --datarootdir=DIR read-only arch.-independent data root [PREFIX/share] + --datadir=DIR read-only architecture-independent data [DATAROOTDIR] + --infodir=DIR info documentation [DATAROOTDIR/info] + --localedir=DIR locale-dependent data [DATAROOTDIR/locale] + --mandir=DIR man documentation [DATAROOTDIR/man] + --docdir=DIR documentation root [DATAROOTDIR/doc/xcalibrateproto] + --htmldir=DIR html documentation [DOCDIR] + --dvidir=DIR dvi documentation [DOCDIR] + --pdfdir=DIR pdf documentation [DOCDIR] + --psdir=DIR ps documentation [DOCDIR] +_ACEOF + + cat <<\_ACEOF + +Program names: + --program-prefix=PREFIX prepend PREFIX to installed program names + --program-suffix=SUFFIX append SUFFIX to installed program names + --program-transform-name=PROGRAM run sed PROGRAM on installed program names +_ACEOF +fi + +if test -n "$ac_init_help"; then + case $ac_init_help in + short | recursive ) echo "Configuration of xcalibrateproto 0.1.0:";; + esac + cat <<\_ACEOF + +Report bugs to . +_ACEOF +ac_status=$? +fi + +if test "$ac_init_help" = "recursive"; then + # If there are subdirs, report their specific --help. + for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue + test -d "$ac_dir" || continue + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + cd "$ac_dir" || { ac_status=$?; continue; } + # Check for guested configure. + if test -f "$ac_srcdir/configure.gnu"; then + echo && + $SHELL "$ac_srcdir/configure.gnu" --help=recursive + elif test -f "$ac_srcdir/configure"; then + echo && + $SHELL "$ac_srcdir/configure" --help=recursive + else + echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2 + fi || ac_status=$? + cd "$ac_pwd" || { ac_status=$?; break; } + done +fi + +test -n "$ac_init_help" && exit $ac_status +if $ac_init_version; then + cat <<\_ACEOF +xcalibrateproto configure 0.1.0 +generated by GNU Autoconf 2.61 + +Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, +2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +This configure script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it. +_ACEOF + exit +fi +cat >config.log <<_ACEOF +This file contains any messages produced by compilers while +running configure, to aid debugging if configure makes a mistake. + +It was created by xcalibrateproto $as_me 0.1.0, which was +generated by GNU Autoconf 2.61. Invocation command line was + + $ $0 $@ + +_ACEOF +exec 5>>config.log +{ +cat <<_ASUNAME +## --------- ## +## Platform. ## +## --------- ## + +hostname = `(hostname || uname -n) 2>/dev/null | sed 1q` +uname -m = `(uname -m) 2>/dev/null || echo unknown` +uname -r = `(uname -r) 2>/dev/null || echo unknown` +uname -s = `(uname -s) 2>/dev/null || echo unknown` +uname -v = `(uname -v) 2>/dev/null || echo unknown` + +/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown` +/bin/uname -X = `(/bin/uname -X) 2>/dev/null || echo unknown` + +/bin/arch = `(/bin/arch) 2>/dev/null || echo unknown` +/usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null || echo unknown` +/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown` +/usr/bin/hostinfo = `(/usr/bin/hostinfo) 2>/dev/null || echo unknown` +/bin/machine = `(/bin/machine) 2>/dev/null || echo unknown` +/usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null || echo unknown` +/bin/universe = `(/bin/universe) 2>/dev/null || echo unknown` + +_ASUNAME + +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + echo "PATH: $as_dir" +done +IFS=$as_save_IFS + +} >&5 + +cat >&5 <<_ACEOF + + +## ----------- ## +## Core tests. ## +## ----------- ## + +_ACEOF + + +# Keep a trace of the command line. +# Strip out --no-create and --no-recursion so they do not pile up. +# Strip out --silent because we don't want to record it for future runs. +# Also quote any args containing shell meta-characters. +# Make two passes to allow for proper duplicate-argument suppression. +ac_configure_args= +ac_configure_args0= +ac_configure_args1= +ac_must_keep_next=false +for ac_pass in 1 2 +do + for ac_arg + do + case $ac_arg in + -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil) + continue ;; + *\'*) + ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;; + esac + case $ac_pass in + 1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;; + 2) + ac_configure_args1="$ac_configure_args1 '$ac_arg'" + if test $ac_must_keep_next = true; then + ac_must_keep_next=false # Got value, back to normal. + else + case $ac_arg in + *=* | --config-cache | -C | -disable-* | --disable-* \ + | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \ + | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \ + | -with-* | --with-* | -without-* | --without-* | --x) + case "$ac_configure_args0 " in + "$ac_configure_args1"*" '$ac_arg' "* ) continue ;; + esac + ;; + -* ) ac_must_keep_next=true ;; + esac + fi + ac_configure_args="$ac_configure_args '$ac_arg'" + ;; + esac + done +done +$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; } +$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; } + +# When interrupted or exit'd, cleanup temporary files, and complete +# config.log. We remove comments because anyway the quotes in there +# would cause problems or look ugly. +# WARNING: Use '\'' to represent an apostrophe within the trap. +# WARNING: Do not start the trap code with a newline, due to a FreeBSD 4.0 bug. +trap 'exit_status=$? + # Save into config.log some information that might help in debugging. + { + echo + + cat <<\_ASBOX +## ---------------- ## +## Cache variables. ## +## ---------------- ## +_ASBOX + echo + # The following way of writing the cache mishandles newlines in values, +( + for ac_var in `(set) 2>&1 | sed -n '\''s/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'\''`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + (set) 2>&1 | + case $as_nl`(ac_space='\'' '\''; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + sed -n \ + "s/'\''/'\''\\\\'\'''\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\''\\2'\''/p" + ;; #( + *) + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) + echo + + cat <<\_ASBOX +## ----------------- ## +## Output variables. ## +## ----------------- ## +_ASBOX + echo + for ac_var in $ac_subst_vars + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" + done | sort + echo + + if test -n "$ac_subst_files"; then + cat <<\_ASBOX +## ------------------- ## +## File substitutions. ## +## ------------------- ## +_ASBOX + echo + for ac_var in $ac_subst_files + do + eval ac_val=\$$ac_var + case $ac_val in + *\'\''*) ac_val=`echo "$ac_val" | sed "s/'\''/'\''\\\\\\\\'\'''\''/g"`;; + esac + echo "$ac_var='\''$ac_val'\''" + done | sort + echo + fi + + if test -s confdefs.h; then + cat <<\_ASBOX +## ----------- ## +## confdefs.h. ## +## ----------- ## +_ASBOX + echo + cat confdefs.h + echo + fi + test "$ac_signal" != 0 && + echo "$as_me: caught signal $ac_signal" + echo "$as_me: exit $exit_status" + } >&5 + rm -f core *.core core.conftest.* && + rm -f -r conftest* confdefs* conf$$* $ac_clean_files && + exit $exit_status +' 0 +for ac_signal in 1 2 13 15; do + trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal +done +ac_signal=0 + +# confdefs.h avoids OS command line length limits that DEFS can exceed. +rm -f -r conftest* confdefs.h + +# Predefined preprocessor variables. + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_NAME "$PACKAGE_NAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_TARNAME "$PACKAGE_TARNAME" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_VERSION "$PACKAGE_VERSION" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_STRING "$PACKAGE_STRING" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" +_ACEOF + + +# Let the site file select an alternate cache file if it wants to. +# Prefer explicitly selected file to automatically selected ones. +if test -n "$CONFIG_SITE"; then + set x "$CONFIG_SITE" +elif test "x$prefix" != xNONE; then + set x "$prefix/share/config.site" "$prefix/etc/config.site" +else + set x "$ac_default_prefix/share/config.site" \ + "$ac_default_prefix/etc/config.site" +fi +shift +for ac_site_file +do + if test -r "$ac_site_file"; then + { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5 +echo "$as_me: loading site script $ac_site_file" >&6;} + sed 's/^/| /' "$ac_site_file" >&5 + . "$ac_site_file" + fi +done + +if test -r "$cache_file"; then + # Some versions of bash will fail to source /dev/null (special + # files actually), so we avoid doing that. + if test -f "$cache_file"; then + { echo "$as_me:$LINENO: loading cache $cache_file" >&5 +echo "$as_me: loading cache $cache_file" >&6;} + case $cache_file in + [\\/]* | ?:[\\/]* ) . "$cache_file";; + *) . "./$cache_file";; + esac + fi +else + { echo "$as_me:$LINENO: creating cache $cache_file" >&5 +echo "$as_me: creating cache $cache_file" >&6;} + >$cache_file +fi + +# Check that the precious variables saved in the cache have kept the same +# value. +ac_cache_corrupted=false +for ac_var in $ac_precious_vars; do + eval ac_old_set=\$ac_cv_env_${ac_var}_set + eval ac_new_set=\$ac_env_${ac_var}_set + eval ac_old_val=\$ac_cv_env_${ac_var}_value + eval ac_new_val=\$ac_env_${ac_var}_value + case $ac_old_set,$ac_new_set in + set,) + { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,set) + { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5 +echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;} + ac_cache_corrupted=: ;; + ,);; + *) + if test "x$ac_old_val" != "x$ac_new_val"; then + { echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5 +echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;} + { echo "$as_me:$LINENO: former value: $ac_old_val" >&5 +echo "$as_me: former value: $ac_old_val" >&2;} + { echo "$as_me:$LINENO: current value: $ac_new_val" >&5 +echo "$as_me: current value: $ac_new_val" >&2;} + ac_cache_corrupted=: + fi;; + esac + # Pass precious variables to config.status. + if test "$ac_new_set" = set; then + case $ac_new_val in + *\'*) ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;; + *) ac_arg=$ac_var=$ac_new_val ;; + esac + case " $ac_configure_args " in + *" '$ac_arg' "*) ;; # Avoid dups. Use of quotes ensures accuracy. + *) ac_configure_args="$ac_configure_args '$ac_arg'" ;; + esac + fi +done +if $ac_cache_corrupted; then + { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5 +echo "$as_me: error: changes in the environment can compromise the build" >&2;} + { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5 +echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;} + { (exit 1); exit 1; }; } +fi + + + + + + + + + + + + + + + + + + + + + + + + + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + + +am__api_version='1.10' + +ac_aux_dir= +for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do + if test -f "$ac_dir/install-sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f "$ac_dir/install.sh"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + elif test -f "$ac_dir/shtool"; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/shtool install -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&5 +echo "$as_me: error: cannot find install-sh or install.sh in \"$srcdir\" \"$srcdir/..\" \"$srcdir/../..\"" >&2;} + { (exit 1); exit 1; }; } +fi + +# These three variables are undocumented and unsupported, +# and are intended to be withdrawn in a future Autoconf release. +# They can cause serious problems if a builder's source tree is in a directory +# whose full name contains unusual characters. +ac_config_guess="$SHELL $ac_aux_dir/config.guess" # Please don't use this var. +ac_config_sub="$SHELL $ac_aux_dir/config.sub" # Please don't use this var. +ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. + + +# Find a good install program. We prefer a C program (faster), +# so one script is as good as another. But avoid the broken or +# incompatible versions: +# SysV /etc/install, /usr/sbin/install +# SunOS /usr/etc/install +# IRIX /sbin/install +# AIX /bin/install +# AmigaOS /C/install, which installs bootblocks on floppy discs +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag +# AFS /usr/afsws/bin/install, which mishandles nonexistent args +# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" +# OS/2's system install, which has a completely different semantic +# ./install, which can be erroneously created by make from ./install.sh. +{ echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5 +echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6; } +if test -z "$INSTALL"; then +if test "${ac_cv_path_install+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + # Account for people who put trailing slashes in PATH elements. +case $as_dir/ in + ./ | .// | /cC/* | \ + /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \ + ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \ + /usr/ucb/* ) ;; + *) + # OSF1 and SCO ODT 3.0 have their own names for install. + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then + if test $ac_prog = install && + grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # AIX install. It has an incompatible calling convention. + : + elif test $ac_prog = install && + grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then + # program-specific install script used by HP pwplus--don't use. + : + else + ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c" + break 3 + fi + fi + done + done + ;; +esac +done +IFS=$as_save_IFS + + +fi + if test "${ac_cv_path_install+set}" = set; then + INSTALL=$ac_cv_path_install + else + # As a last resort, use the slow shell script. Don't cache a + # value for INSTALL within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + INSTALL=$ac_install_sh + fi +fi +{ echo "$as_me:$LINENO: result: $INSTALL" >&5 +echo "${ECHO_T}$INSTALL" >&6; } + +# Use test -z because SunOS4 sh mishandles braces in ${var-val}. +# It thinks the first close brace ends the variable substitution. +test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' + +test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + +{ echo "$as_me:$LINENO: checking whether build environment is sane" >&5 +echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6; } +# Just in case +sleep 1 +echo timestamp > conftest.file +# Do `set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$*" = "X"; then + # -L didn't work. + set X `ls -t $srcdir/configure conftest.file` + fi + rm -f conftest.file + if test "$*" != "X $srcdir/configure conftest.file" \ + && test "$*" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + { { echo "$as_me:$LINENO: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&5 +echo "$as_me: error: ls -t appears to fail. Make sure there is not a broken +alias in your environment" >&2;} + { (exit 1); exit 1; }; } + fi + + test "$2" = conftest.file + ) +then + # Ok. + : +else + { { echo "$as_me:$LINENO: error: newly created file is older than distributed files! +Check your system clock" >&5 +echo "$as_me: error: newly created file is older than distributed files! +Check your system clock" >&2;} + { (exit 1); exit 1; }; } +fi +{ echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } +test "$program_prefix" != NONE && + program_transform_name="s&^&$program_prefix&;$program_transform_name" +# Use a double $ so make ignores it. +test "$program_suffix" != NONE && + program_transform_name="s&\$&$program_suffix&;$program_transform_name" +# Double any \ or $. echo might interpret backslashes. +# By default was `s,x,x', remove it if useless. +cat <<\_ACEOF >conftest.sed +s/[\\$]/&&/g;s/;s,x,x,$// +_ACEOF +program_transform_name=`echo $program_transform_name | sed -f conftest.sed` +rm -f conftest.sed + +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` + +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " +else + am_missing_run= + { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5 +echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} +fi + +{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5 +echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; } +if test -z "$MKDIR_P"; then + if test "${ac_cv_path_mkdir+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_prog in mkdir gmkdir; do + for ac_exec_ext in '' $ac_executable_extensions; do + { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue + case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #( + 'mkdir (GNU coreutils) '* | \ + 'mkdir (coreutils) '* | \ + 'mkdir (fileutils) '4.1*) + ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext + break 3;; + esac + done + done +done +IFS=$as_save_IFS + +fi + + if test "${ac_cv_path_mkdir+set}" = set; then + MKDIR_P="$ac_cv_path_mkdir -p" + else + # As a last resort, use the slow shell script. Don't cache a + # value for MKDIR_P within a source directory, because that will + # break other packages using the cache if that directory is + # removed, or if the value is a relative name. + test -d ./--version && rmdir ./--version + MKDIR_P="$ac_install_sh -d" + fi +fi +{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5 +echo "${ECHO_T}$MKDIR_P" >&6; } + +mkdir_p="$MKDIR_P" +case $mkdir_p in + [\\/$]* | ?:[\\/]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac + +for ac_prog in gawk mawk nawk awk +do + # Extract the first word of "$ac_prog", so it can be a program name with args. +set dummy $ac_prog; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_AWK+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$AWK"; then + ac_cv_prog_AWK="$AWK" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_AWK="$ac_prog" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +AWK=$ac_cv_prog_AWK +if test -n "$AWK"; then + { echo "$as_me:$LINENO: result: $AWK" >&5 +echo "${ECHO_T}$AWK" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + + test -n "$AWK" && break +done + +{ echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5 +echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6; } +set x ${MAKE-make}; ac_make=`echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'` +if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.make <<\_ACEOF +SHELL = /bin/sh +all: + @echo '@@@%%%=$(MAKE)=@@@%%%' +_ACEOF +# GNU make sometimes prints "make[1]: Entering...", which would confuse us. +case `${MAKE-make} -f conftest.make 2>/dev/null` in + *@@@%%%=?*=@@@%%%*) + eval ac_cv_prog_make_${ac_make}_set=yes;; + *) + eval ac_cv_prog_make_${ac_make}_set=no;; +esac +rm -f conftest.make +fi +if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + SET_MAKE= +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + SET_MAKE="MAKE=${MAKE-make}" +fi + +rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null + +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + am__isrc=' -I$(srcdir)' + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5 +echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;} + { (exit 1); exit 1; }; } + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi + + +# Define the identity of the package. + PACKAGE='xcalibrateproto' + VERSION='0.1.0' + + +cat >>confdefs.h <<_ACEOF +#define PACKAGE "$PACKAGE" +_ACEOF + + +cat >>confdefs.h <<_ACEOF +#define VERSION "$VERSION" +_ACEOF + +# Some tools Automake needs. + +ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} + + +AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"} + + +AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"} + + +AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} + + +MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"} + +install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"} + +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +if test "$cross_compiling" != no; then + if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. +set dummy ${ac_tool_prefix}strip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$STRIP"; then + ac_cv_prog_STRIP="$STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_STRIP="${ac_tool_prefix}strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +STRIP=$ac_cv_prog_STRIP +if test -n "$STRIP"; then + { echo "$as_me:$LINENO: result: $STRIP" >&5 +echo "${ECHO_T}$STRIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_STRIP"; then + ac_ct_STRIP=$STRIP + # Extract the first word of "strip", so it can be a program name with args. +set dummy strip; ac_word=$2 +{ echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; } +if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + if test -n "$ac_ct_STRIP"; then + ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_ac_ct_STRIP="strip" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + +fi +fi +ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP +if test -n "$ac_ct_STRIP"; then + { echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5 +echo "${ECHO_T}$ac_ct_STRIP" >&6; } +else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } +fi + + if test "x$ac_ct_STRIP" = x; then + STRIP=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&5 +echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools +whose name does not start with the host triplet. If you think this +configuration is useful to you, please write to autoconf@gnu.org." >&2;} +ac_tool_warned=yes ;; +esac + STRIP=$ac_ct_STRIP + fi +else + STRIP="$ac_cv_prog_STRIP" +fi + +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" + +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +# Always define AMTAR for backward compatibility. + +AMTAR=${AMTAR-"${am_missing_run}tar"} + +am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -' + + + + + + +ac_config_files="$ac_config_files Makefile xcalibrateproto.pc" + +cat >confcache <<\_ACEOF +# This file is a shell script that caches the results of configure +# tests run on this system so they can be shared between configure +# scripts and configure runs, see configure's option --config-cache. +# It is not useful on other systems. If it contains results you don't +# want to keep, you may remove or edit it. +# +# config.status only pays attention to the cache file if you give it +# the --recheck option to rerun configure. +# +# `ac_cv_env_foo' variables (set or unset) will be overridden when +# loading this file, other *unset* `ac_cv_foo' will be assigned the +# following values. + +_ACEOF + +# The following way of writing the cache mishandles newlines in values, +# but we know of no workaround that is simple, portable, and efficient. +# So, we kill variables containing newlines. +# Ultrix sh set writes to stderr and can't be redirected directly, +# and sets the high bit in the cache file unless we assign to the vars. +( + for ac_var in `(set) 2>&1 | sed -n 's/^\([a-zA-Z_][a-zA-Z0-9_]*\)=.*/\1/p'`; do + eval ac_val=\$$ac_var + case $ac_val in #( + *${as_nl}*) + case $ac_var in #( + *_cv_*) { echo "$as_me:$LINENO: WARNING: Cache variable $ac_var contains a newline." >&5 +echo "$as_me: WARNING: Cache variable $ac_var contains a newline." >&2;} ;; + esac + case $ac_var in #( + _ | IFS | as_nl) ;; #( + *) $as_unset $ac_var ;; + esac ;; + esac + done + + (set) 2>&1 | + case $as_nl`(ac_space=' '; set) 2>&1` in #( + *${as_nl}ac_space=\ *) + # `set' does not quote correctly, so add quotes (double-quote + # substitution turns \\\\ into \\, and sed turns \\ into \). + sed -n \ + "s/'/'\\\\''/g; + s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p" + ;; #( + *) + # `set' quotes correctly as required by POSIX, so do not add quotes. + sed -n "/^[_$as_cr_alnum]*_cv_[_$as_cr_alnum]*=/p" + ;; + esac | + sort +) | + sed ' + /^ac_cv_env_/b end + t clear + :clear + s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/ + t end + s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/ + :end' >>confcache +if diff "$cache_file" confcache >/dev/null 2>&1; then :; else + if test -w "$cache_file"; then + test "x$cache_file" != "x/dev/null" && + { echo "$as_me:$LINENO: updating cache $cache_file" >&5 +echo "$as_me: updating cache $cache_file" >&6;} + cat confcache >$cache_file + else + { echo "$as_me:$LINENO: not updating unwritable cache $cache_file" >&5 +echo "$as_me: not updating unwritable cache $cache_file" >&6;} + fi +fi +rm -f confcache + +test "x$prefix" = xNONE && prefix=$ac_default_prefix +# Let make expand exec_prefix. +test "x$exec_prefix" = xNONE && exec_prefix='${prefix}' + +# Transform confdefs.h into DEFS. +# Protect against shell expansion while executing Makefile rules. +# Protect against Makefile macro expansion. +# +# If the first sed substitution is executed (which looks for macros that +# take arguments), then branch to the quote section. Otherwise, +# look for a macro that doesn't take arguments. +ac_script=' +t clear +:clear +s/^[ ]*#[ ]*define[ ][ ]*\([^ (][^ (]*([^)]*)\)[ ]*\(.*\)/-D\1=\2/g +t quote +s/^[ ]*#[ ]*define[ ][ ]*\([^ ][^ ]*\)[ ]*\(.*\)/-D\1=\2/g +t quote +b any +:quote +s/[ `~#$^&*(){}\\|;'\''"<>?]/\\&/g +s/\[/\\&/g +s/\]/\\&/g +s/\$/$$/g +H +:any +${ + g + s/^\n// + s/\n/ /g + p +} +' +DEFS=`sed -n "$ac_script" confdefs.h` + + +ac_libobjs= +ac_ltlibobjs= +for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue + # 1. Remove the extension, and $U if already installed. + ac_script='s/\$U\././;s/\.o$//;s/\.obj$//' + ac_i=`echo "$ac_i" | sed "$ac_script"` + # 2. Prepend LIBOBJDIR. When used with automake>=1.10 LIBOBJDIR + # will be set to the directory where LIBOBJS objects are built. + ac_libobjs="$ac_libobjs \${LIBOBJDIR}$ac_i\$U.$ac_objext" + ac_ltlibobjs="$ac_ltlibobjs \${LIBOBJDIR}$ac_i"'$U.lo' +done +LIBOBJS=$ac_libobjs + +LTLIBOBJS=$ac_ltlibobjs + + + +: ${CONFIG_STATUS=./config.status} +ac_clean_files_save=$ac_clean_files +ac_clean_files="$ac_clean_files $CONFIG_STATUS" +{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5 +echo "$as_me: creating $CONFIG_STATUS" >&6;} +cat >$CONFIG_STATUS <<_ACEOF +#! $SHELL +# Generated by $as_me. +# Run this file to recreate the current configuration. +# Compiler output produced by configure, useful for debugging +# configure, is in config.log if it exists. + +debug=false +ac_cs_recheck=false +ac_cs_silent=false +SHELL=\${CONFIG_SHELL-$SHELL} +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +## --------------------- ## +## M4sh Initialization. ## +## --------------------- ## + +# Be more Bourne compatible +DUALCASE=1; export DUALCASE # for MKS sh +if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then + emulate sh + NULLCMD=: + # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which + # is contrary to our usage. Disable this feature. + alias -g '${1+"$@"}'='"$@"' + setopt NO_GLOB_SUBST +else + case `(set -o) 2>/dev/null` in + *posix*) set -o posix ;; +esac + +fi + + + + +# PATH needs CR +# Avoid depending upon Character Ranges. +as_cr_letters='abcdefghijklmnopqrstuvwxyz' +as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ' +as_cr_Letters=$as_cr_letters$as_cr_LETTERS +as_cr_digits='0123456789' +as_cr_alnum=$as_cr_Letters$as_cr_digits + +# The user is always right. +if test "${PATH_SEPARATOR+set}" != set; then + echo "#! /bin/sh" >conf$$.sh + echo "exit 0" >>conf$$.sh + chmod +x conf$$.sh + if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then + PATH_SEPARATOR=';' + else + PATH_SEPARATOR=: + fi + rm -f conf$$.sh +fi + +# Support unset when possible. +if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then + as_unset=unset +else + as_unset=false +fi + + +# IFS +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent editors from complaining about space-tab. +# (If _AS_PATH_WALK were called with IFS unset, it would disable word +# splitting by setting IFS to empty value.) +as_nl=' +' +IFS=" "" $as_nl" + +# Find who we are. Look in the path if we contain no directory separator. +case $0 in + *[\\/]* ) as_myself=$0 ;; + *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break +done +IFS=$as_save_IFS + + ;; +esac +# We did not find ourselves, most probably we were run as `sh COMMAND' +# in which case we are not to be found in the path. +if test "x$as_myself" = x; then + as_myself=$0 +fi +if test ! -f "$as_myself"; then + echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2 + { (exit 1); exit 1; } +fi + +# Work around bugs in pre-3.0 UWIN ksh. +for as_var in ENV MAIL MAILPATH +do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var +done +PS1='$ ' +PS2='> ' +PS4='+ ' + +# NLS nuisances. +for as_var in \ + LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \ + LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \ + LC_TELEPHONE LC_TIME +do + if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then + eval $as_var=C; export $as_var + else + ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var + fi +done + +# Required to use basename. +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then + as_basename=basename +else + as_basename=false +fi + + +# Name of the executable. +as_me=`$as_basename -- "$0" || +$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \ + X"$0" : 'X\(//\)$' \| \ + X"$0" : 'X\(/\)' \| . 2>/dev/null || +echo X/"$0" | + sed '/^.*\/\([^/][^/]*\)\/*$/{ + s//\1/ + q + } + /^X\/\(\/\/\)$/{ + s//\1/ + q + } + /^X\/\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + +# CDPATH. +$as_unset CDPATH + + + + as_lineno_1=$LINENO + as_lineno_2=$LINENO + test "x$as_lineno_1" != "x$as_lineno_2" && + test "x`expr $as_lineno_1 + 1`" = "x$as_lineno_2" || { + + # Create $as_me.lineno as a copy of $as_myself, but with $LINENO + # uniformly replaced by the line number. The first 'sed' inserts a + # line-number line after each line using $LINENO; the second 'sed' + # does the real work. The second script uses 'N' to pair each + # line-number line with the line containing $LINENO, and appends + # trailing '-' during substitution so that $LINENO is not a special + # case at line end. + # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the + # scripts with optimization help from Paolo Bonzini. Blame Lee + # E. McMahon (1931-1989) for sed's syntax. :-) + sed -n ' + p + /[$]LINENO/= + ' <$as_myself | + sed ' + s/[$]LINENO.*/&-/ + t lineno + b + :lineno + N + :loop + s/[$]LINENO\([^'$as_cr_alnum'_].*\n\)\(.*\)/\2\1\2/ + t loop + s/-\n.*// + ' >$as_me.lineno && + chmod +x "$as_me.lineno" || + { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2 + { (exit 1); exit 1; }; } + + # Don't try to exec as it changes $[0], causing all sort of problems + # (the dirname of $[0] is not the place where we might find the + # original and so on. Autoconf is especially sensitive to this). + . "./$as_me.lineno" + # Exit status is that of the last command. + exit +} + + +if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then + as_dirname=dirname +else + as_dirname=false +fi + +ECHO_C= ECHO_N= ECHO_T= +case `echo -n x` in +-n*) + case `echo 'x\c'` in + *c*) ECHO_T=' ';; # ECHO_T is single tab character. + *) ECHO_C='\c';; + esac;; +*) + ECHO_N='-n';; +esac + +if expr a : '\(a\)' >/dev/null 2>&1 && + test "X`expr 00001 : '.*\(...\)'`" = X001; then + as_expr=expr +else + as_expr=false +fi + +rm -f conf$$ conf$$.exe conf$$.file +if test -d conf$$.dir; then + rm -f conf$$.dir/conf$$.file +else + rm -f conf$$.dir + mkdir conf$$.dir +fi +echo >conf$$.file +if ln -s conf$$.file conf$$ 2>/dev/null; then + as_ln_s='ln -s' + # ... but there are two gotchas: + # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail. + # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable. + # In both cases, we have to default to `cp -p'. + ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe || + as_ln_s='cp -p' +elif ln conf$$.file conf$$ 2>/dev/null; then + as_ln_s=ln +else + as_ln_s='cp -p' +fi +rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file +rmdir conf$$.dir 2>/dev/null + +if mkdir -p . 2>/dev/null; then + as_mkdir_p=: +else + test -d ./-p && rmdir ./-p + as_mkdir_p=false +fi + +if test -x / >/dev/null 2>&1; then + as_test_x='test -x' +else + if ls -dL / >/dev/null 2>&1; then + as_ls_L_option=L + else + as_ls_L_option= + fi + as_test_x=' + eval sh -c '\'' + if test -d "$1"; then + test -d "$1/."; + else + case $1 in + -*)set "./$1";; + esac; + case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in + ???[sx]*):;;*)false;;esac;fi + '\'' sh + ' +fi +as_executable_p=$as_test_x + +# Sed expression to map a string onto a valid CPP name. +as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'" + +# Sed expression to map a string onto a valid variable name. +as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'" + + +exec 6>&1 + +# Save the log message, to keep $[0] and so on meaningful, and to +# report actual input values of CONFIG_FILES etc. instead of their +# values after options handling. +ac_log=" +This file was extended by xcalibrateproto $as_me 0.1.0, which was +generated by GNU Autoconf 2.61. Invocation command line was + + CONFIG_FILES = $CONFIG_FILES + CONFIG_HEADERS = $CONFIG_HEADERS + CONFIG_LINKS = $CONFIG_LINKS + CONFIG_COMMANDS = $CONFIG_COMMANDS + $ $0 $@ + +on `(hostname || uname -n) 2>/dev/null | sed 1q` +" + +_ACEOF + +cat >>$CONFIG_STATUS <<_ACEOF +# Files that config.status was made for. +config_files="$ac_config_files" + +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +ac_cs_usage="\ +\`$as_me' instantiates files from templates according to the +current configuration. + +Usage: $0 [OPTIONS] [FILE]... + + -h, --help print this help, then exit + -V, --version print version number and configuration settings, then exit + -q, --quiet do not print progress messages + -d, --debug don't remove temporary files + --recheck update $as_me by reconfiguring in the same conditions + --file=FILE[:TEMPLATE] + instantiate the configuration file FILE + +Configuration files: +$config_files + +Report bugs to ." + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +ac_cs_version="\\ +xcalibrateproto config.status 0.1.0 +configured by $0, generated by GNU Autoconf 2.61, + with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" + +Copyright (C) 2006 Free Software Foundation, Inc. +This config.status script is free software; the Free Software Foundation +gives unlimited permission to copy, distribute and modify it." + +ac_pwd='$ac_pwd' +srcdir='$srcdir' +INSTALL='$INSTALL' +MKDIR_P='$MKDIR_P' +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If no file are specified by the user, then we need to provide default +# value. By we need to know if files were specified by the user. +ac_need_defaults=: +while test $# != 0 +do + case $1 in + --*=*) + ac_option=`expr "X$1" : 'X\([^=]*\)='` + ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'` + ac_shift=: + ;; + *) + ac_option=$1 + ac_optarg=$2 + ac_shift=shift + ;; + esac + + case $ac_option in + # Handling of the options. + -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r) + ac_cs_recheck=: ;; + --version | --versio | --versi | --vers | --ver | --ve | --v | -V ) + echo "$ac_cs_version"; exit ;; + --debug | --debu | --deb | --de | --d | -d ) + debug=: ;; + --file | --fil | --fi | --f ) + $ac_shift + CONFIG_FILES="$CONFIG_FILES $ac_optarg" + ac_need_defaults=false;; + --he | --h | --help | --hel | -h ) + echo "$ac_cs_usage"; exit ;; + -q | -quiet | --quiet | --quie | --qui | --qu | --q \ + | -silent | --silent | --silen | --sile | --sil | --si | --s) + ac_cs_silent=: ;; + + # This is an error. + -*) { echo "$as_me: error: unrecognized option: $1 +Try \`$0 --help' for more information." >&2 + { (exit 1); exit 1; }; } ;; + + *) ac_config_targets="$ac_config_targets $1" + ac_need_defaults=false ;; + + esac + shift +done + +ac_configure_extra_args= + +if $ac_cs_silent; then + exec 6>/dev/null + ac_configure_extra_args="$ac_configure_extra_args --silent" +fi + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +if \$ac_cs_recheck; then + echo "running CONFIG_SHELL=$SHELL $SHELL $0 "$ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6 + CONFIG_SHELL=$SHELL + export CONFIG_SHELL + exec $SHELL "$0"$ac_configure_args \$ac_configure_extra_args --no-create --no-recursion +fi + +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +exec 5>>config.log +{ + echo + sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX +## Running $as_me. ## +_ASBOX + echo "$ac_log" +} >&5 + +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF + +# Handling of arguments. +for ac_config_target in $ac_config_targets +do + case $ac_config_target in + "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; + "xcalibrateproto.pc") CONFIG_FILES="$CONFIG_FILES xcalibrateproto.pc" ;; + + *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 +echo "$as_me: error: invalid argument: $ac_config_target" >&2;} + { (exit 1); exit 1; }; };; + esac +done + + +# If the user did not use the arguments to specify the items to instantiate, +# then the envvar interface is used. Set only those that are not. +# We use the long form for the default assignment because of an extremely +# bizarre bug on SunOS 4.1.3. +if $ac_need_defaults; then + test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files +fi + +# Have a temporary directory for convenience. Make it in the build tree +# simply because there is no reason against having it here, and in addition, +# creating and moving files from /tmp can sometimes cause problems. +# Hook for its removal unless debugging. +# Note that there is a small window in which the directory will not be cleaned: +# after its creation but before its name has been assigned to `$tmp'. +$debug || +{ + tmp= + trap 'exit_status=$? + { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status +' 0 + trap '{ (exit 1); exit 1; }' 1 2 13 15 +} +# Create a (secure) tmp directory for tmp files. + +{ + tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` && + test -n "$tmp" && test -d "$tmp" +} || +{ + tmp=./conf$$-$RANDOM + (umask 077 && mkdir "$tmp") +} || +{ + echo "$me: cannot create a temporary directory in ." >&2 + { (exit 1); exit 1; } +} + +# +# Set up the sed scripts for CONFIG_FILES section. +# + +# No need to generate the scripts if there are no CONFIG_FILES. +# This happens for instance when ./config.status config.h +if test -n "$CONFIG_FILES"; then + +_ACEOF + + + +ac_delim='%!_!# ' +for ac_last_try in false false false false false :; do + cat >conf$$subs.sed <<_ACEOF +SHELL!$SHELL$ac_delim +PATH_SEPARATOR!$PATH_SEPARATOR$ac_delim +PACKAGE_NAME!$PACKAGE_NAME$ac_delim +PACKAGE_TARNAME!$PACKAGE_TARNAME$ac_delim +PACKAGE_VERSION!$PACKAGE_VERSION$ac_delim +PACKAGE_STRING!$PACKAGE_STRING$ac_delim +PACKAGE_BUGREPORT!$PACKAGE_BUGREPORT$ac_delim +exec_prefix!$exec_prefix$ac_delim +prefix!$prefix$ac_delim +program_transform_name!$program_transform_name$ac_delim +bindir!$bindir$ac_delim +sbindir!$sbindir$ac_delim +libexecdir!$libexecdir$ac_delim +datarootdir!$datarootdir$ac_delim +datadir!$datadir$ac_delim +sysconfdir!$sysconfdir$ac_delim +sharedstatedir!$sharedstatedir$ac_delim +localstatedir!$localstatedir$ac_delim +includedir!$includedir$ac_delim +oldincludedir!$oldincludedir$ac_delim +docdir!$docdir$ac_delim +infodir!$infodir$ac_delim +htmldir!$htmldir$ac_delim +dvidir!$dvidir$ac_delim +pdfdir!$pdfdir$ac_delim +psdir!$psdir$ac_delim +libdir!$libdir$ac_delim +localedir!$localedir$ac_delim +mandir!$mandir$ac_delim +DEFS!$DEFS$ac_delim +ECHO_C!$ECHO_C$ac_delim +ECHO_N!$ECHO_N$ac_delim +ECHO_T!$ECHO_T$ac_delim +LIBS!$LIBS$ac_delim +build_alias!$build_alias$ac_delim +host_alias!$host_alias$ac_delim +target_alias!$target_alias$ac_delim +INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim +INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim +INSTALL_DATA!$INSTALL_DATA$ac_delim +am__isrc!$am__isrc$ac_delim +CYGPATH_W!$CYGPATH_W$ac_delim +PACKAGE!$PACKAGE$ac_delim +VERSION!$VERSION$ac_delim +ACLOCAL!$ACLOCAL$ac_delim +AUTOCONF!$AUTOCONF$ac_delim +AUTOMAKE!$AUTOMAKE$ac_delim +AUTOHEADER!$AUTOHEADER$ac_delim +MAKEINFO!$MAKEINFO$ac_delim +install_sh!$install_sh$ac_delim +STRIP!$STRIP$ac_delim +INSTALL_STRIP_PROGRAM!$INSTALL_STRIP_PROGRAM$ac_delim +mkdir_p!$mkdir_p$ac_delim +AWK!$AWK$ac_delim +SET_MAKE!$SET_MAKE$ac_delim +am__leading_dot!$am__leading_dot$ac_delim +AMTAR!$AMTAR$ac_delim +am__tar!$am__tar$ac_delim +am__untar!$am__untar$ac_delim +LIBOBJS!$LIBOBJS$ac_delim +LTLIBOBJS!$LTLIBOBJS$ac_delim +_ACEOF + + if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 61; then + break + elif $ac_last_try; then + { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5 +echo "$as_me: error: could not make $CONFIG_STATUS" >&2;} + { (exit 1); exit 1; }; } + else + ac_delim="$ac_delim!$ac_delim _$ac_delim!! " + fi +done + +ac_eof=`sed -n '/^CEOF[0-9]*$/s/CEOF/0/p' conf$$subs.sed` +if test -n "$ac_eof"; then + ac_eof=`echo "$ac_eof" | sort -nru | sed 1q` + ac_eof=`expr $ac_eof + 1` +fi + +cat >>$CONFIG_STATUS <<_ACEOF +cat >"\$tmp/subs-1.sed" <<\CEOF$ac_eof +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b end +_ACEOF +sed ' +s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g +s/^/s,@/; s/!/@,|#_!!_#|/ +:n +t n +s/'"$ac_delim"'$/,g/; t +s/$/\\/; p +N; s/^.*\n//; s/[,\\&]/\\&/g; s/@/@|#_!!_#|/g; b n +' >>$CONFIG_STATUS >$CONFIG_STATUS <<_ACEOF +:end +s/|#_!!_#|//g +CEOF$ac_eof +_ACEOF + + +# VPATH may cause trouble with some makes, so we remove $(srcdir), +# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and +# trailing colons and then remove the whole line if VPATH becomes empty +# (actually we leave an empty line to preserve line numbers). +if test "x$srcdir" = x.; then + ac_vpsub='/^[ ]*VPATH[ ]*=/{ +s/:*\$(srcdir):*/:/ +s/:*\${srcdir}:*/:/ +s/:*@srcdir@:*/:/ +s/^\([^=]*=[ ]*\):*/\1/ +s/:*$// +s/^[^=]*=[ ]*$// +}' +fi + +cat >>$CONFIG_STATUS <<\_ACEOF +fi # test -n "$CONFIG_FILES" + + +for ac_tag in :F $CONFIG_FILES +do + case $ac_tag in + :[FHLC]) ac_mode=$ac_tag; continue;; + esac + case $ac_mode$ac_tag in + :[FHL]*:*);; + :L* | :C*:*) { { echo "$as_me:$LINENO: error: Invalid tag $ac_tag." >&5 +echo "$as_me: error: Invalid tag $ac_tag." >&2;} + { (exit 1); exit 1; }; };; + :[FH]-) ac_tag=-:-;; + :[FH]*) ac_tag=$ac_tag:$ac_tag.in;; + esac + ac_save_IFS=$IFS + IFS=: + set x $ac_tag + IFS=$ac_save_IFS + shift + ac_file=$1 + shift + + case $ac_mode in + :L) ac_source=$1;; + :[FH]) + ac_file_inputs= + for ac_f + do + case $ac_f in + -) ac_f="$tmp/stdin";; + *) # Look for the file first in the build tree, then in the source tree + # (if the path is not absolute). The absolute path cannot be DOS-style, + # because $ac_f cannot contain `:'. + test -f "$ac_f" || + case $ac_f in + [\\/$]*) false;; + *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";; + esac || + { { echo "$as_me:$LINENO: error: cannot find input file: $ac_f" >&5 +echo "$as_me: error: cannot find input file: $ac_f" >&2;} + { (exit 1); exit 1; }; };; + esac + ac_file_inputs="$ac_file_inputs $ac_f" + done + + # Let's still pretend it is `configure' which instantiates (i.e., don't + # use $as_me), people would be surprised to read: + # /* config.h. Generated by config.status. */ + configure_input="Generated from "`IFS=: + echo $* | sed 's|^[^:]*/||;s|:[^:]*/|, |g'`" by configure." + if test x"$ac_file" != x-; then + configure_input="$ac_file. $configure_input" + { echo "$as_me:$LINENO: creating $ac_file" >&5 +echo "$as_me: creating $ac_file" >&6;} + fi + + case $ac_tag in + *:-:* | *:-) cat >"$tmp/stdin";; + esac + ;; + esac + + ac_dir=`$as_dirname -- "$ac_file" || +$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$ac_file" : 'X\(//\)[^/]' \| \ + X"$ac_file" : 'X\(//\)$' \| \ + X"$ac_file" : 'X\(/\)' \| . 2>/dev/null || +echo X"$ac_file" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + { as_dir="$ac_dir" + case $as_dir in #( + -*) as_dir=./$as_dir;; + esac + test -d "$as_dir" || { $as_mkdir_p && mkdir -p "$as_dir"; } || { + as_dirs= + while :; do + case $as_dir in #( + *\'*) as_qdir=`echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #( + *) as_qdir=$as_dir;; + esac + as_dirs="'$as_qdir' $as_dirs" + as_dir=`$as_dirname -- "$as_dir" || +$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$as_dir" : 'X\(//\)[^/]' \| \ + X"$as_dir" : 'X\(//\)$' \| \ + X"$as_dir" : 'X\(/\)' \| . 2>/dev/null || +echo X"$as_dir" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q'` + test -d "$as_dir" && break + done + test -z "$as_dirs" || eval "mkdir $as_dirs" + } || test -d "$as_dir" || { { echo "$as_me:$LINENO: error: cannot create directory $as_dir" >&5 +echo "$as_me: error: cannot create directory $as_dir" >&2;} + { (exit 1); exit 1; }; }; } + ac_builddir=. + +case "$ac_dir" in +.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;; +*) + ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'` + # A ".." for each directory in $ac_dir_suffix. + ac_top_builddir_sub=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,/..,g;s,/,,'` + case $ac_top_builddir_sub in + "") ac_top_builddir_sub=. ac_top_build_prefix= ;; + *) ac_top_build_prefix=$ac_top_builddir_sub/ ;; + esac ;; +esac +ac_abs_top_builddir=$ac_pwd +ac_abs_builddir=$ac_pwd$ac_dir_suffix +# for backward compatibility: +ac_top_builddir=$ac_top_build_prefix + +case $srcdir in + .) # We are building in place. + ac_srcdir=. + ac_top_srcdir=$ac_top_builddir_sub + ac_abs_top_srcdir=$ac_pwd ;; + [\\/]* | ?:[\\/]* ) # Absolute name. + ac_srcdir=$srcdir$ac_dir_suffix; + ac_top_srcdir=$srcdir + ac_abs_top_srcdir=$srcdir ;; + *) # Relative name. + ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix + ac_top_srcdir=$ac_top_build_prefix$srcdir + ac_abs_top_srcdir=$ac_pwd/$srcdir ;; +esac +ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix + + + case $ac_mode in + :F) + # + # CONFIG_FILE + # + + case $INSTALL in + [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;; + *) ac_INSTALL=$ac_top_build_prefix$INSTALL ;; + esac + ac_MKDIR_P=$MKDIR_P + case $MKDIR_P in + [\\/$]* | ?:[\\/]* ) ;; + */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;; + esac +_ACEOF + +cat >>$CONFIG_STATUS <<\_ACEOF +# If the template does not know about datarootdir, expand it. +# FIXME: This hack should be removed a few years after 2.60. +ac_datarootdir_hack=; ac_datarootdir_seen= + +case `sed -n '/datarootdir/ { + p + q +} +/@datadir@/p +/@docdir@/p +/@infodir@/p +/@localedir@/p +/@mandir@/p +' $ac_file_inputs` in +*datarootdir*) ac_datarootdir_seen=yes;; +*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*) + { echo "$as_me:$LINENO: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5 +echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;} +_ACEOF +cat >>$CONFIG_STATUS <<_ACEOF + ac_datarootdir_hack=' + s&@datadir@&$datadir&g + s&@docdir@&$docdir&g + s&@infodir@&$infodir&g + s&@localedir@&$localedir&g + s&@mandir@&$mandir&g + s&\\\${datarootdir}&$datarootdir&g' ;; +esac +_ACEOF + +# Neutralize VPATH when `$srcdir' = `.'. +# Shell code in configure.ac might set extrasub. +# FIXME: do we really want to maintain this feature? +cat >>$CONFIG_STATUS <<_ACEOF + sed "$ac_vpsub +$extrasub +_ACEOF +cat >>$CONFIG_STATUS <<\_ACEOF +:t +/@[a-zA-Z_][a-zA-Z_0-9]*@/!b +s&@configure_input@&$configure_input&;t t +s&@top_builddir@&$ac_top_builddir_sub&;t t +s&@srcdir@&$ac_srcdir&;t t +s&@abs_srcdir@&$ac_abs_srcdir&;t t +s&@top_srcdir@&$ac_top_srcdir&;t t +s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t +s&@builddir@&$ac_builddir&;t t +s&@abs_builddir@&$ac_abs_builddir&;t t +s&@abs_top_builddir@&$ac_abs_top_builddir&;t t +s&@INSTALL@&$ac_INSTALL&;t t +s&@MKDIR_P@&$ac_MKDIR_P&;t t +$ac_datarootdir_hack +" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out + +test -z "$ac_datarootdir_hack$ac_datarootdir_seen" && + { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } && + { ac_out=`sed -n '/^[ ]*datarootdir[ ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } && + { echo "$as_me:$LINENO: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&5 +echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir' +which seems to be undefined. Please make sure it is defined." >&2;} + + rm -f "$tmp/stdin" + case $ac_file in + -) cat "$tmp/out"; rm -f "$tmp/out";; + *) rm -f "$ac_file"; mv "$tmp/out" $ac_file;; + esac + ;; + + + + esac + +done # for ac_tag + + +{ (exit 0); exit 0; } +_ACEOF +chmod +x $CONFIG_STATUS +ac_clean_files=$ac_clean_files_save + + +# configure is writing to config.log, and then calls config.status. +# config.status does its own redirection, appending to config.log. +# Unfortunately, on DOS this fails, as config.log is still kept open +# by configure, so config.status won't be able to write to it; its +# output is simply discarded. So we exec the FD to /dev/null, +# effectively closing config.log, so it can be properly (re)opened and +# appended to by config.status. When coming back to configure, we +# need to make the FD available again. +if test "$no_create" != yes; then + ac_cs_success=: + ac_config_status_args= + test "$silent" = yes && + ac_config_status_args="$ac_config_status_args --quiet" + exec 5>/dev/null + $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false + exec 5>>config.log + # Use ||, not &&, to avoid exiting from the if with $? = 1, which + # would make configure fail if this is the last instruction. + $ac_cs_success || { (exit 1); exit 1; } +fi + diff --git a/Xorg/xorg/proto/calibrateproto/src/configure.ac b/Xorg/xorg/proto/calibrateproto/src/configure.ac new file mode 100644 index 0000000000..eb410726d9 --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/configure.ac @@ -0,0 +1,6 @@ +AC_PREREQ([2.59]) +AC_INIT([xcalibrateproto], [0.1.0], [pb@nexus.co.uk]) +AM_INIT_AUTOMAKE([foreign dist-bzip2]) + +AC_OUTPUT([Makefile + xcalibrateproto.pc]) diff --git a/Xorg/xorg/proto/calibrateproto/src/install-sh b/Xorg/xorg/proto/calibrateproto/src/install-sh new file mode 100755 index 0000000000..4fbbae7b7f --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/install-sh @@ -0,0 +1,507 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2006-10-14.15 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. + +nl=' +' +IFS=" "" $nl" + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" +if test -z "$doit"; then + doit_exec=exec +else + doit_exec=$doit +fi + +# Put in absolute file names if you don't have them in your path; +# or use environment vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +posix_glob= +posix_mkdir= + +# Desired mode of installed file. +mode=0755 + +chmodcmd=$chmodprog +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test $# -ne 0; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) mode=$2 + shift + shift + case $mode in + *' '* | *' '* | *' +'* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + --) shift + break;; + + -*) echo "$0: invalid option: $1" >&2 + exit 1;; + + *) break;; + esac +done + +if test $# -ne 0 && test -z "$dir_arg$dstarg"; then + # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done +fi + +if test $# -eq 0; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +if test -z "$dir_arg"; then + trap '(exit $?); exit' 1 2 13 15 + + # Set umask so as not to create temps with too-generous modes. + # However, 'strip' requires both read and write access to temps. + case $mode in + # Optimize common cases. + *644) cp_umask=133;; + *755) cp_umask=22;; + + *[0-7]) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw='% 200' + fi + cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; + *) + if test -z "$stripcmd"; then + u_plus_rw= + else + u_plus_rw=,u+rw + fi + cp_umask=$mode$u_plus_rw;; + esac +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + dstdir=$dst + test -d "$dstdir" + dstdir_status=$? + else + + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dstdir=$dst + dst=$dstdir/`basename "$src"` + dstdir_status=0 + else + # Prefer dirname, but fall back on a substitute if dirname fails. + dstdir=` + (dirname "$dst") 2>/dev/null || + expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ + X"$dst" : 'X\(//\)[^/]' \| \ + X"$dst" : 'X\(//\)$' \| \ + X"$dst" : 'X\(/\)' \| . 2>/dev/null || + echo X"$dst" | + sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ + s//\1/ + q + } + /^X\(\/\/\)[^/].*/{ + s//\1/ + q + } + /^X\(\/\/\)$/{ + s//\1/ + q + } + /^X\(\/\).*/{ + s//\1/ + q + } + s/.*/./; q' + ` + + test -d "$dstdir" + dstdir_status=$? + fi + fi + + obsolete_mkdir_used=false + + if test $dstdir_status != 0; then + case $posix_mkdir in + '') + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writeable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; + esac + + if + $posix_mkdir && ( + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + ) + then : + else + + # The umask is ridiculous, or mkdir does not conform to POSIX, + # or it failed possibly due to a race condition. Create the + # directory the slow way, step by step, checking for races as we go. + + case $dstdir in + /*) prefix=/ ;; + -*) prefix=./ ;; + *) prefix= ;; + esac + + case $posix_glob in + '') + if (set -f) 2>/dev/null; then + posix_glob=true + else + posix_glob=false + fi ;; + esac + + oIFS=$IFS + IFS=/ + $posix_glob && set -f + set fnord $dstdir + shift + $posix_glob && set +f + IFS=$oIFS + + prefixes= + + for d + do + test -z "$d" && continue + + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ + done + + if test -n "$prefixes"; then + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true + fi + fi + fi + + if test -n "$dir_arg"; then + { test -z "$chowncmd" || $doit $chowncmd "$dst"; } && + { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } && + { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false || + test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1 + else + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + + # Copy the file name to the temp name. + (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dst"; then + $doit $rmcmd -f "$dst" 2>/dev/null \ + || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \ + && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\ + || { + echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" + } + } || exit 1 + + trap '' 0 + fi +done + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/Xorg/xorg/proto/calibrateproto/src/missing b/Xorg/xorg/proto/calibrateproto/src/missing new file mode 100755 index 0000000000..1c8ff7049d --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/missing @@ -0,0 +1,367 @@ +#! /bin/sh +# Common stub for a few missing GNU programs while installing. + +scriptversion=2006-05-10.23 + +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 +# Free Software Foundation, Inc. +# Originally by Fran,cois Pinard , 1996. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301, USA. + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +if test $# -eq 0; then + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 +fi + +run=: +sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p' +sed_minuso='s/.* -o \([^ ]*\).*/\1/p' + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +msg="missing on your system" + +case $1 in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + # Exit code 63 means version mismatch. This often happens + # when the user try to use an ancient version of a tool on + # a file that requires a minimum version. In this case we + # we should proceed has if the program had been absent, or + # if --run hadn't been passed. + if test $? = 63; then + run=: + msg="probably too old" + fi + ;; + + -h|--h|--he|--hel|--help) + echo "\ +$0 [OPTION]... PROGRAM [ARGUMENT]... + +Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an +error status if there is no known handling for PROGRAM. + +Options: + -h, --help display this help and exit + -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails + +Supported PROGRAM values: + aclocal touch file \`aclocal.m4' + autoconf touch file \`configure' + autoheader touch file \`config.h.in' + autom4te touch the output file, or create a stub one + automake touch all \`Makefile.in' files + bison create \`y.tab.[ch]', if possible, from existing .[ch] + flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file + lex create \`lex.yy.c', if possible, from existing .c + makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags + yacc create \`y.tab.[ch]', if possible, from existing .[ch] + +Send bug reports to ." + exit $? + ;; + + -v|--v|--ve|--ver|--vers|--versi|--versio|--version) + echo "missing $scriptversion (GNU Automake)" + exit $? + ;; + + -*) + echo 1>&2 "$0: Unknown \`$1' option" + echo 1>&2 "Try \`$0 --help' for more information" + exit 1 + ;; + +esac + +# Now exit if we have it, but it failed. Also exit now if we +# don't have it and --version was passed (most likely to detect +# the program). +case $1 in + lex|yacc) + # Not GNU programs, they don't have --version. + ;; + + tar) + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + exit 1 + fi + ;; + + *) + if test -z "$run" && ($1 --version) > /dev/null 2>&1; then + # We have it, but it failed. + exit 1 + elif test "x$2" = "x--version" || test "x$2" = "x--help"; then + # Could not run --version or --help. This is probably someone + # running `$TOOL --version' or `$TOOL --help' to check whether + # $TOOL exists and not knowing $TOOL uses missing. + exit 1 + fi + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. +case $1 in + aclocal*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acinclude.m4' or \`${configure_ac}'. You might want + to install the \`Automake' and \`Perl' packages. Grab them from + any GNU archive site." + touch aclocal.m4 + ;; + + autoconf) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`${configure_ac}'. You might want to install the + \`Autoconf' and \`GNU m4' packages. Grab them from any GNU + archive site." + touch configure + ;; + + autoheader) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`acconfig.h' or \`${configure_ac}'. You might want + to install the \`Autoconf' and \`GNU m4' packages. Grab them + from any GNU archive site." + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` + test -z "$files" && files="config.h" + touch_files= + for f in $files; do + case $f in + *:*) touch_files="$touch_files "`echo "$f" | + sed -e 's/^[^:]*://' -e 's/:.*//'`;; + *) touch_files="$touch_files $f.in";; + esac + done + touch $touch_files + ;; + + automake*) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. + You might want to install the \`Automake' and \`Perl' packages. + Grab them from any GNU archive site." + find . -type f -name Makefile.am -print | + sed 's/\.am$/.in/' | + while read f; do touch "$f"; done + ;; + + autom4te) + echo 1>&2 "\ +WARNING: \`$1' is needed, but is $msg. + You might have modified some files without having the + proper tools for further handling them. + You can get \`$1' as part of \`Autoconf' from any GNU + archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo "#! /bin/sh" + echo "# Created by GNU Automake missing as a replacement of" + echo "# $ $@" + echo "exit 0" + chmod +x $file + exit 1 + fi + ;; + + bison|yacc) + echo 1>&2 "\ +WARNING: \`$1' $msg. You should only need it if + you modified a \`.y' file. You may need the \`Bison' package + in order for those modifications to take effect. You can get + \`Bison' from any GNU archive site." + rm -f y.tab.c y.tab.h + if test $# -ne 1; then + eval LASTARG="\${$#}" + case $LASTARG in + *.y) + SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.c + fi + SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" y.tab.h + fi + ;; + esac + fi + if test ! -f y.tab.h; then + echo >y.tab.h + fi + if test ! -f y.tab.c; then + echo 'main() { return 0; }' >y.tab.c + fi + ;; + + lex|flex) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.l' file. You may need the \`Flex' package + in order for those modifications to take effect. You can get + \`Flex' from any GNU archive site." + rm -f lex.yy.c + if test $# -ne 1; then + eval LASTARG="\${$#}" + case $LASTARG in + *.l) + SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'` + if test -f "$SRCFILE"; then + cp "$SRCFILE" lex.yy.c + fi + ;; + esac + fi + if test ! -f lex.yy.c; then + echo 'main() { return 0; }' >lex.yy.c + fi + ;; + + help2man) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -f "$file"; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + + makeinfo) + echo 1>&2 "\ +WARNING: \`$1' is $msg. You should only need it if + you modified a \`.texi' or \`.texinfo' file, or any other file + indirectly affecting the aspect of the manual. The spurious + call might also be the consequence of using a buggy \`make' (AIX, + DU, IRIX). You might want to install the \`Texinfo' package or + the \`GNU make' package. Grab either from any GNU archive site." + # The file to touch is that specified with -o ... + file=`echo "$*" | sed -n "$sed_output"` + test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"` + if test -z "$file"; then + # ... or it is the one specified with @setfilename ... + infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'` + file=`sed -n ' + /^@setfilename/{ + s/.* \([^ ]*\) *$/\1/ + p + q + }' $infile` + # ... or it is derived from the source name (dir/f.texi becomes f.info) + test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info + fi + # If the file does not exist, the user really needs makeinfo; + # let's fail without touching anything. + test -f $file || exit 1 + touch $file + ;; + + tar) + shift + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar "$@" && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar "$@" && exit 0 + fi + firstarg="$1" + if shift; then + case $firstarg in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + case $firstarg in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" "$@" && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + + *) + echo 1>&2 "\ +WARNING: \`$1' is needed, and is $msg. + You might have modified some files without having the + proper tools for further handling them. Check the \`README' file, + it often tells you about the needed prerequisites for installing + this package. You may also peek at any GNU archive site, in case + some other package would contain this missing \`$1' program." + exit 1 + ;; +esac + +exit 0 + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: diff --git a/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.h b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.h new file mode 100644 index 0000000000..9a174a4c4c --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.h @@ -0,0 +1,95 @@ +/* + * $Id: xcalibrateproto.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $ + * + * Copyright © 2003 Philip Blundell + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Philip Blundell not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Philip Blundell makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef XCALIBRATEPROTO_H +#define XCALIBRATEPROTO_H + +/* + * requests and replies + */ +typedef struct { + CARD8 reqType; + CARD8 xCalibrateReqType; + CARD16 length B16; + CARD32 majorVersion B32; + CARD32 minorVersion B32; +} xXCalibrateQueryVersionReq; + +#define sz_xXCalibrateQueryVersionReq 12 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 length B32; + CARD32 majorVersion B32; + CARD32 minorVersion B32; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; +} xXCalibrateQueryVersionReply; + +#define sz_xXCalibrateQueryVersionReply 32 + +typedef struct { + CARD8 reqType; + CARD8 xCalibrateReqType; + CARD16 length B16; + CARD16 on B16; + CARD16 pad B16; +} xXCalibrateRawModeReq; + +#define sz_xXCalibrateRawModeReq 8 + +typedef struct { + BYTE type; /* X_Reply */ + BYTE pad1; + CARD16 sequenceNumber B16; + CARD32 status; + CARD32 pad2 B32; + CARD32 pad3 B32; + CARD32 pad4 B32; + CARD32 pad5 B32; + CARD32 pad6 B32; + CARD32 pad7 B32; +} xXCalibrateRawModeReply; + +#define sz_xXCalibrateRawModeReply 32 + +/* Events */ + +typedef struct { + CARD8 type; + CARD8 pad1; + CARD16 sequenceNumber B16; + CARD16 x; + CARD16 y; + CARD16 pressure; + CARD16 pad2; +} xXCalibrateRawTouchscreenEvent; + +#define sz_xXCalibrateRawTouchscreenEvent 12 + +#endif diff --git a/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc new file mode 100644 index 0000000000..5dde3ef6bb --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc @@ -0,0 +1,9 @@ +prefix=/usr/local +exec_prefix=${prefix} +libdir=${exec_prefix}/lib +includedir=${prefix}/include + +Name: XCalibrate +Description: XCalibrate extension headers +Version: 0.1.0 +Cflags: -I${includedir} diff --git a/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc.in b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc.in new file mode 100644 index 0000000000..f17f8d79e3 --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/xcalibrateproto.pc.in @@ -0,0 +1,9 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XCalibrate +Description: XCalibrate extension headers +Version: @PACKAGE_VERSION@ +Cflags: -I${includedir} diff --git a/Xorg/xorg/proto/calibrateproto/src/xcalibratewire.h b/Xorg/xorg/proto/calibrateproto/src/xcalibratewire.h new file mode 100644 index 0000000000..a5b1aeccb9 --- /dev/null +++ b/Xorg/xorg/proto/calibrateproto/src/xcalibratewire.h @@ -0,0 +1,43 @@ +/* + * $Id: xcalibratewire.h,v 1.1.1.1 2004/06/02 19:18:47 pb Exp $ + * + * Copyright © 2003 Philip Blundell + * + * Permission to use, copy, modify, distribute, and sell this software and its + * documentation for any purpose is hereby granted without fee, provided that + * the above copyright notice appear in all copies and that both that + * copyright notice and this permission notice appear in supporting + * documentation, and that the name of Philip Blundell not be used in + * advertising or publicity pertaining to distribution of the software without + * specific, written prior permission. Philip Blundell makes no + * representations about the suitability of this software for any purpose. It + * is provided "as is" without express or implied warranty. + * + * PHILIP BLUNDELL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, + * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO + * EVENT SHALL PHILIP BLUNDELL BE LIABLE FOR ANY SPECIAL, INDIRECT OR + * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, + * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER + * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR + * PERFORMANCE OF THIS SOFTWARE. + */ + +#ifndef XCALIBRATEWIRE_H +#define XCALIBRATEWIRE_H + +#define XCALIBRATE_MAJOR_VERSION 0 +#define XCALIBRATE_MINOR_VERSION 0 +#define XCALIBRATE_NAME "XCALIBRATE" + +#define X_XCalibrateQueryVersion 0 +#define X_XCalibrateRawMode 1 + +#define XCalibrateNumberRequests (X_XCalibrateSetRawMode + 1) + +#define X_XCalibrateRawTouchscreen 0 + +#define XCalibrateNumberEvents (X_XCalibrateRawTouchscreen + 1) + +#define XCalibrateNumberErrors 0 + +#endif diff --git a/Xorg/xorg/proto/compositeproto/Makefile b/Xorg/xorg/proto/compositeproto/Makefile new file mode 100644 index 0000000000..b922b5bc92 --- /dev/null +++ b/Xorg/xorg/proto/compositeproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=compositeproto +PKG_VERSION:=0.4.1 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=3692f3f8b2ea10dff3d2cede8dc65e79 + +include $(INCLUDE_DIR)/package.mk + +define Package/compositeproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=compositeproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,compositeproto)) diff --git a/Xorg/xorg/proto/damageproto/Makefile b/Xorg/xorg/proto/damageproto/Makefile new file mode 100644 index 0000000000..d6cef04779 --- /dev/null +++ b/Xorg/xorg/proto/damageproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=damageproto +PKG_VERSION:=1.2.0 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=434b931b02bd83ed9fc44951df81cdac + +include $(INCLUDE_DIR)/package.mk + +define Package/damageproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=damageproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,damageproto)) diff --git a/Xorg/xorg/proto/dmxproto/Makefile b/Xorg/xorg/proto/dmxproto/Makefile new file mode 100644 index 0000000000..541e50ccb1 --- /dev/null +++ b/Xorg/xorg/proto/dmxproto/Makefile @@ -0,0 +1,38 @@ +# +# Copyright (C) 2006-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dmxproto +PKG_RELEASE:=1 +PKG_VERSION:=2.3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=880a41720b2937e2660dcdc0d34a8791 + +include $(INCLUDE_DIR)/package.mk + +define Package/dmxproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=dmxproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,dmxproto)) diff --git a/Xorg/xorg/proto/dri2proto/Makefile b/Xorg/xorg/proto/dri2proto/Makefile new file mode 100644 index 0000000000..e173ad7314 --- /dev/null +++ b/Xorg/xorg/proto/dri2proto/Makefile @@ -0,0 +1,37 @@ +# +# Copyright (C) 2009-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=dri2proto +PKG_VERSION:=2.1 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=5cb7987d29db068153bdc8f23c767c43 + +include $(INCLUDE_DIR)/package.mk + +define Package/dri2proto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + TITLE:=dri2proto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,dri2proto)) diff --git a/Xorg/xorg/proto/fixesproto/Makefile b/Xorg/xorg/proto/fixesproto/Makefile new file mode 100644 index 0000000000..48c21647e0 --- /dev/null +++ b/Xorg/xorg/proto/fixesproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=fixesproto +PKG_VERSION:=4.1.1 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=4c1cb4f2ed9f34de59f2f04783ca9483 + +include $(INCLUDE_DIR)/package.mk + +define Package/fixesproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=fixesproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,fixesproto)) diff --git a/Xorg/xorg/proto/fontcacheproto/Makefile b/Xorg/xorg/proto/fontcacheproto/Makefile new file mode 100644 index 0000000000..b2921f5426 --- /dev/null +++ b/Xorg/xorg/proto/fontcacheproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=fontcacheproto +PKG_VERSION:=0.1.3 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=a8a50e5e995bfacb0359575faf7f6906 + +include $(INCLUDE_DIR)/package.mk + +define Package/fontcacheproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=fontcacheproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,fontcacheproto)) diff --git a/Xorg/xorg/proto/fontsproto/Makefile b/Xorg/xorg/proto/fontsproto/Makefile new file mode 100644 index 0000000000..6592eec73f --- /dev/null +++ b/Xorg/xorg/proto/fontsproto/Makefile @@ -0,0 +1,38 @@ +# +# Copyright (C) 2006-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=fontsproto +PKG_RELEASE:=1 +PKG_VERSION:=2.1.0 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=f3a857deadca3144fba041af1dbf7603 + +include $(INCLUDE_DIR)/package.mk + +define Package/fontsproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=fontsproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,fontsproto)) diff --git a/Xorg/xorg/proto/glproto/Makefile b/Xorg/xorg/proto/glproto/Makefile new file mode 100644 index 0000000000..8e40489fd2 --- /dev/null +++ b/Xorg/xorg/proto/glproto/Makefile @@ -0,0 +1,38 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_NAME:=glproto +PKG_VERSION:=1.4.10 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=c9f8cebfba72bfab674bc0170551fb8d + +include $(INCLUDE_DIR)/package.mk + +define Package/glproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=glproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,glproto)) diff --git a/Xorg/xorg/proto/inputproto/Makefile b/Xorg/xorg/proto/inputproto/Makefile new file mode 100644 index 0000000000..686c2c6e79 --- /dev/null +++ b/Xorg/xorg/proto/inputproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=inputproto +PKG_VERSION:=2.0 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=0f7acbc14a082f9ae03744396527d23d + +include $(INCLUDE_DIR)/package.mk + +define Package/inputproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=inputproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,inputproto)) diff --git a/Xorg/xorg/proto/kbproto/Makefile b/Xorg/xorg/proto/kbproto/Makefile new file mode 100644 index 0000000000..54c71f8d98 --- /dev/null +++ b/Xorg/xorg/proto/kbproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=kbproto +PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=7f439166a9b2bf81471a33951883019f + +include $(INCLUDE_DIR)/package.mk + +define Package/kbproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=kbproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,kbproto)) diff --git a/Xorg/xorg/proto/printproto/Makefile b/Xorg/xorg/proto/printproto/Makefile new file mode 100644 index 0000000000..f6faa5ed4d --- /dev/null +++ b/Xorg/xorg/proto/printproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=printproto +PKG_VERSION:=1.0.4 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=7321847a60748b4d2f1fa16db4b6ede8 + +include $(INCLUDE_DIR)/package.mk + +define Package/printproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=printproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,printproto)) diff --git a/Xorg/xorg/proto/randrproto/Makefile b/Xorg/xorg/proto/randrproto/Makefile new file mode 100644 index 0000000000..a5a576361c --- /dev/null +++ b/Xorg/xorg/proto/randrproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=randrproto +PKG_VERSION:=1.3.1 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=a5c244c36382b0de39b2828cea4b651d + +include $(INCLUDE_DIR)/package.mk + +define Package/randrproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=randrproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,randrproto)) diff --git a/Xorg/xorg/proto/recordproto/Makefile b/Xorg/xorg/proto/recordproto/Makefile new file mode 100644 index 0000000000..487e0a3f9b --- /dev/null +++ b/Xorg/xorg/proto/recordproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=recordproto +PKG_VERSION:=1.14 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=70f5998c673aa510e2acd6d8fb3799de + +include $(INCLUDE_DIR)/package.mk + +define Package/recordproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=recordproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,recordproto)) diff --git a/Xorg/xorg/proto/renderproto/Makefile b/Xorg/xorg/proto/renderproto/Makefile new file mode 100644 index 0000000000..a7be89b876 --- /dev/null +++ b/Xorg/xorg/proto/renderproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=renderproto +PKG_VERSION:=0.11 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=b160a9733fe91b666e74fca284333148 + +include $(INCLUDE_DIR)/package.mk + +define Package/renderproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=renderproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,renderproto)) diff --git a/Xorg/xorg/proto/resourceproto/Makefile b/Xorg/xorg/proto/resourceproto/Makefile new file mode 100644 index 0000000000..ec35485bf3 --- /dev/null +++ b/Xorg/xorg/proto/resourceproto/Makefile @@ -0,0 +1,36 @@ +# +# Copyright (C) 2006-2009 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org +include $(TOPDIR)/rules.mk + +PKG_NAME:=resourceproto +PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ + +include $(INCLUDE_DIR)/package.mk + +define Package/resourceproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=resourceproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,resourceproto)) diff --git a/Xorg/xorg/proto/scrnsaverproto/Makefile b/Xorg/xorg/proto/scrnsaverproto/Makefile new file mode 100644 index 0000000000..545fda7e55 --- /dev/null +++ b/Xorg/xorg/proto/scrnsaverproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=scrnsaverproto +PKG_VERSION:=1.2.0 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=9040c991a56ee9b5976936f8c65d5c8a + +include $(INCLUDE_DIR)/package.mk + +define Package/scrnsaverproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=scrnsaverproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,scrnsaverproto)) diff --git a/Xorg/xorg/proto/videoproto/Makefile b/Xorg/xorg/proto/videoproto/Makefile new file mode 100644 index 0000000000..f934c8c533 --- /dev/null +++ b/Xorg/xorg/proto/videoproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=videoproto +PKG_VERSION:=2.3.0 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=fb762146a18207a1e8bc9f299dfc7ac0 + +include $(INCLUDE_DIR)/package.mk + +define Package/videoproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=videoproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,videoproto)) diff --git a/Xorg/xorg/proto/windowswmproto/Makefile b/Xorg/xorg/proto/windowswmproto/Makefile new file mode 100644 index 0000000000..b028be0f0c --- /dev/null +++ b/Xorg/xorg/proto/windowswmproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=windowswmproto +PKG_RELEASE:=1 +PKG_VERSION:=1.0.4 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=e74b2ff3172a6117f2a62b655ef99064 + +include $(INCLUDE_DIR)/package.mk + +define Package/windowswmproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=windowswmproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,windowswmproto)) diff --git a/Xorg/xorg/proto/xcmiscproto/Makefile b/Xorg/xorg/proto/xcmiscproto/Makefile new file mode 100644 index 0000000000..92b66a690e --- /dev/null +++ b/Xorg/xorg/proto/xcmiscproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xcmiscproto +PKG_VERSION:=1.2.0 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=7b83e4a7e9f4edc9c6cfb0500f4a7196 + +include $(INCLUDE_DIR)/package.mk + +define Package/xcmiscproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=xcmiscproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,xcmiscproto)) diff --git a/Xorg/xorg/proto/xextproto/Makefile b/Xorg/xorg/proto/xextproto/Makefile new file mode 100644 index 0000000000..e4e13f48ad --- /dev/null +++ b/Xorg/xorg/proto/xextproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xextproto +PKG_RELEASE:=1 +PKG_VERSION:=7.1.1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=fb6ccaae76db7a35e49b12aea60ca6ff + +include $(INCLUDE_DIR)/package.mk + +define Package/xextproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=xextproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,xextproto)) diff --git a/Xorg/xorg/proto/xf86bigfontproto/Makefile b/Xorg/xorg/proto/xf86bigfontproto/Makefile new file mode 100644 index 0000000000..008740408a --- /dev/null +++ b/Xorg/xorg/proto/xf86bigfontproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86bigfontproto +PKG_VERSION:=1.2.0 +PKG_RELEASE:=3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=120e226ede5a4687b25dd357cc9b8efe + +include $(INCLUDE_DIR)/package.mk + +define Package/xf86bigfontproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=xf86bigfontproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,xf86bigfontproto)) diff --git a/Xorg/xorg/proto/xf86dgaproto/Makefile b/Xorg/xorg/proto/xf86dgaproto/Makefile new file mode 100644 index 0000000000..443025345e --- /dev/null +++ b/Xorg/xorg/proto/xf86dgaproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86dgaproto +PKG_VERSION:=2.1 +PKG_RELEASE:=3 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=a036dc2fcbf052ec10621fd48b68dbb1 + +include $(INCLUDE_DIR)/package.mk + +define Package/xf86dgaproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=xf86dgaproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,xf86dgaproto)) diff --git a/Xorg/xorg/proto/xf86driproto/Makefile b/Xorg/xorg/proto/xf86driproto/Makefile new file mode 100644 index 0000000000..3fd3f0709f --- /dev/null +++ b/Xorg/xorg/proto/xf86driproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86driproto +PKG_VERSION:=2.1.0 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=309d552732666c3333d7dc63e80d042f + +include $(INCLUDE_DIR)/package.mk + +define Package/xf86driproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=xf86driproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,xf86driproto)) diff --git a/Xorg/xorg/proto/xf86vidmodeproto/Makefile b/Xorg/xorg/proto/xf86vidmodeproto/Makefile new file mode 100644 index 0000000000..cdccb71899 --- /dev/null +++ b/Xorg/xorg/proto/xf86vidmodeproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xf86vidmodeproto +PKG_VERSION:=2.3 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=4434894fc7d4eeb4a22e6b876d56fdaa + +include $(INCLUDE_DIR)/package.mk + +define Package/xf86vidmodeproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=xf86vidmodeproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,xf86vidmodeproto)) diff --git a/Xorg/xorg/proto/xineramaproto/Makefile b/Xorg/xorg/proto/xineramaproto/Makefile new file mode 100644 index 0000000000..d37c6fae1b --- /dev/null +++ b/Xorg/xorg/proto/xineramaproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xineramaproto +PKG_VERSION:=1.2 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=a8aadcb281b9c11a91303e24cdea45f5 + +include $(INCLUDE_DIR)/package.mk + +define Package/xineramaproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=xineramaproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,xineramaproto)) diff --git a/Xorg/xorg/proto/xproto/Makefile b/Xorg/xorg/proto/xproto/Makefile new file mode 100644 index 0000000000..fb974989c0 --- /dev/null +++ b/Xorg/xorg/proto/xproto/Makefile @@ -0,0 +1,39 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xproto +PKG_VERSION:=7.0.16 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/proto/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_MD5SUM:=75c9edff1f3823e5ab6bb9e66821a901 + +include $(INCLUDE_DIR)/package.mk + +define Package/xproto + SECTION:=xorg-proto + CATEGORY:=Xorg + SUBMENU:=proto + DEPENDS:= + TITLE:=xproto + URL:=http://xorg.freedesktop.org/ +endef + +define Build/InstallDev + DESTDIR="$(1)" $(MAKE) -C $(PKG_BUILD_DIR)/ $(MAKE_FLAGS) install +endef + +define Build/Compile + true +endef + +$(eval $(call BuildPackage,xproto)) diff --git a/Xorg/xorg/xserver/xorg-kdrive/Config.in b/Xorg/xorg/xserver/xorg-kdrive/Config.in new file mode 100644 index 0000000000..1644e0602a --- /dev/null +++ b/Xorg/xorg/xserver/xorg-kdrive/Config.in @@ -0,0 +1,28 @@ +menu "kdrive library support" +depends on PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev || PACKAGE_xserver-kdrive-xglamo || PACKAGE_xserver-kdrive-xephyr + + config X_TSLIB + bool + prompt "enable support for tslib" + +# config X_XCALIBRATE +# bool +# prompt "enable support for xcalibrate" + +# config X_DRI +# bool +# prompt "enable support for DRI" + + config X_COMPOSITE + bool + prompt "enable support for composite" + + config X_XINERAMA + bool + prompt "enable support for xinerama" + +# config X_GLX +# bool +# prompt "enable support for GLX" + +endmenu diff --git a/Xorg/xorg/xserver/xorg-kdrive/Makefile b/Xorg/xorg/xserver/xorg-kdrive/Makefile new file mode 100644 index 0000000000..2712d482ee --- /dev/null +++ b/Xorg/xorg/xserver/xorg-kdrive/Makefile @@ -0,0 +1,150 @@ +# +# Copyright (C) 2009-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xserver-kdrive +PKG_VERSION:=1.7.1 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/xserver/ +PKG_SOURCE:=xorg-server-$(PKG_VERSION).tar.bz2 +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)/xorg-server-$(PKG_VERSION)/ +PKG_MD5SUM:=dda7842467cda6018fdc87e6002e4db1 + +PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \ + xextproto xproto bigreqsproto resourceproto \ + fontsproto inputproto kbproto videoproto resourceproto \ + xf86dgaproto xtrans xf86driproto calibrateproto \ + compositeproto xineramaproto + +PKG_CONFIG_DEPENDS := \ + CONFIG_PACKAGE-xserver-kdrive-fbdev \ + CONFIG_PACKAGE_xserver-kdrive-xephyr \ + CONFIG_X_TSLIB CONFIG_X_COMPOSITE \ + CONFIG_X_XINERAMA CONFIG_X_XCALIBRATE + +PKG_FIXUP:=libtool +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +include $(INCLUDE_DIR)/package.mk + +define Package/xserver-kdrive/Default + PROVIDES:=xserver + SECTION:=xorg-server + CATEGORY:=Xorg + SUBMENU:=server + URL:=http://xorg.freedesktop.org/ + DEPENDS:=@!avr32 \ + +xserver-common \ + +libpthread \ + +libxkbfile \ + +libXfont \ + +libXau \ + +libXv \ + +libfontenc \ + +pixman \ + +libopenssl \ + +libdrm \ + +xkbcomp \ + +xkbdata \ + @DISPLAY_SUPPORT \ + +X_TSLIB:tslib +endef + +define Package/xserver-kdrive-xfbdev +$(call Package/xserver-kdrive/Default) + TITLE:=Kdrive framebuffer xserver +endef + +define Package/xserver-kdrive-xephyr +$(call Package/xserver-kdrive/Default) + TITLE:=Kdrive ephyr xserver + DEPENDS += @BROKEN +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --enable-kdrive \ + $(if $(CONFIG_PACKAGE_xserver-kdrive-xfbdev), \ + --enable-xfbdev, \ + --disable-xfbdev) \ + $(if $(CONFIG_PACKAGE_xserver-kdrive-xephyr), \ + --enable-xephyr, \ + --disable-xephyr) \ + $(if $(CONFIG_X_TSLIB),--enable-tslib,--disable-tslib) \ + $(if $(CONFIG_X_COMPOSITE),--enable-composite,--disable-composite) \ + $(if $(CONFIG_X_XINERAMA),--enable-xinerama,--disable-xinerama) \ + $(if $(CONFIG_X_XCALIBRATE),--enable-xcalibrate,--disable-xcalibrate) \ + --disable-dependency-tracking \ + --disable-debug \ + --disable-unit-tests \ + --disable-builddocs \ + --disable-glx-tls \ + --disable-shm \ + --disable-xres \ + --disable-record \ + --enable-xv \ + --enable-xvmc \ + --disable-dga \ + --disable-screensaver \ + --disable-xdmcp \ + --disable-xdm-auth-1 \ + --disable-glx \ + --enable-dri \ + --disable-dri2 \ + --disable-xf86vidmode \ + --disable-xace \ + --disable-xselinux \ + --disable-xsecurity \ + --disable-multibuffer \ + --disable-dbe \ + --disable-xf86bigfont \ + --enable-dpms \ + --disable-config-dbus \ + --disable-config-hal \ + --disable-xfree86-utils \ + --disable-xaa \ + --enable-vgahw \ + --disable-vbe \ + --enable-int10-module \ + --disable-xorg \ + --disable-dmx \ + --disable-xvfb \ + --disable-xnest \ + --disable-xquartz \ + --disable-standalone-xpbproxy \ + --disable-xwin \ + --disable-xfake \ + --disable-installsetuid \ + --disable-secure-rpc \ + --enable-silent-rules \ + --disable-shave \ + --disable-xsdl \ + ) +endef + +define Package/xserver-kdrive-xfbdev/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/Xfbdev \ + $(1)/usr/bin/ +endef + +define Package/xserver-kdrive-xephyr/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/Xephyr \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,xserver-kdrive-xfbdev)) +$(eval $(call BuildPackage,xserver-kdrive-xephyr)) diff --git a/Xorg/xorg/xserver/xorg-kdrive/patches/001-tslib.patch b/Xorg/xorg/xserver/xorg-kdrive/patches/001-tslib.patch new file mode 100644 index 0000000000..24414414f9 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-kdrive/patches/001-tslib.patch @@ -0,0 +1,46 @@ +--- tslib-1.0/configure.orig 2008-10-05 14:13:43.000000000 +0200 ++++ tslib-1.0/configure 2008-10-05 14:14:35.000000000 +0200 +@@ -38587,12 +38587,12 @@ + pkg_cv_TSLIB_CFLAGS="$TSLIB_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_TSLIB_CFLAGS=`$PKG_CONFIG --cflags "tslib-0.0" 2>/dev/null` ++ pkg_cv_TSLIB_CFLAGS=`$PKG_CONFIG --cflags "tslib-1.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -38603,12 +38603,12 @@ + pkg_cv_TSLIB_LIBS="$TSLIB_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ +- { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-0.0\"") >&5 +- ($PKG_CONFIG --exists --print-errors "tslib-0.0") 2>&5 ++ { ($as_echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"tslib-1.0\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "tslib-1.0") 2>&5 + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_TSLIB_LIBS=`$PKG_CONFIG --libs "tslib-0.0" 2>/dev/null` ++ pkg_cv_TSLIB_LIBS=`$PKG_CONFIG --libs "tslib-1.0" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -38626,9 +38626,9 @@ + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-0.0" 2>&1` ++ TSLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "tslib-1.0" 2>&1` + else +- TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-0.0" 2>&1` ++ TSLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors "tslib-1.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$TSLIB_PKG_ERRORS" >&5 diff --git a/Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch b/Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch new file mode 100644 index 0000000000..f7b3e02682 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-kdrive/patches/002-add-portrait-modes.patch @@ -0,0 +1,26 @@ +--- xorg-server-1.5.1/hw/kdrive/src/kmode.c.orig 2007-10-23 23:26:50.000000000 +0200 ++++ xorg-server-1.5.1/hw/kdrive/src/kmode.c 2008-10-05 14:55:24.000000000 +0200 +@@ -78,6 +78,12 @@ + 16, 48, 160, KdSyncNegative, /* 31.469 */ + 10, 33, 45, KdSyncNegative, /* 59.940 */ + }, ++ ++ /* 480x640 modes */ ++ { 480, 640, 60, 0, /* VESA */ ++ 0, 0, 0, KdSyncNegative, /* 31.469 */ ++ 0, 0, 0, KdSyncNegative, /* 59.940 */ ++ }, + + /* 800x600 modes */ + { 800, 600, 85, 56250, /* VESA */ +@@ -102,6 +108,10 @@ const KdMonitorTiming kdMonitorTimings[] = { + 24, 128, 224, KdSyncPositive, /* 35.156 */ + 1, 22, 25, KdSyncPositive, /* 56.250 */ + }, ++ { 600, 800, 56, 36000, /* VESA */ ++ 24, 128, 224, KdSyncPositive, /* 35.156 */ ++ 1, 22, 25, KdSyncPositive, /* 56.250 */ ++ }, + + /* 1024x768 modes */ + { 1024, 768, 85, 94500, /* VESA */ diff --git a/Xorg/xorg/xserver/xorg-server/Config.in b/Xorg/xorg/xserver/xorg-server/Config.in new file mode 100644 index 0000000000..1644e0602a --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/Config.in @@ -0,0 +1,28 @@ +menu "kdrive library support" +depends on PACKAGE_xserver-kdrive-xvesa || PACKAGE_xserver-kdrive-xfbdev || PACKAGE_xserver-kdrive-xglamo || PACKAGE_xserver-kdrive-xephyr + + config X_TSLIB + bool + prompt "enable support for tslib" + +# config X_XCALIBRATE +# bool +# prompt "enable support for xcalibrate" + +# config X_DRI +# bool +# prompt "enable support for DRI" + + config X_COMPOSITE + bool + prompt "enable support for composite" + + config X_XINERAMA + bool + prompt "enable support for xinerama" + +# config X_GLX +# bool +# prompt "enable support for GLX" + +endmenu diff --git a/Xorg/xorg/xserver/xorg-server/Makefile b/Xorg/xorg/xserver/xorg-server/Makefile new file mode 100644 index 0000000000..4b57d0a8f2 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/Makefile @@ -0,0 +1,193 @@ +# +# Copyright (C) 2006-2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xorg-server +PKG_VERSION:=1.7.1 +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/xserver/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_MD5SUM:=dda7842467cda6018fdc87e6002e4db1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(PKG_VERSION)/ +PKG_BUILD_DEPENDS:=randrproto renderproto fixesproto damageproto xcmiscproto \ + xextproto xproto scrnsaverproto bigreqsproto resourceproto \ + fontsproto inputproto kbproto videoproto resourceproto \ + compositeproto xf86dgaproto xtrans xf86driproto dri2proto + +PKG_INSTALL:=1 +PKG_FIXUP:=libtool +PKG_BUILD_PARALLEL:=1 + +PKG_CONFIG_DEPENDS:=CONFIG_PACKAGE_xserver-xorg CONFIG_PACKAGE_xserver-common + +include $(INCLUDE_DIR)/package.mk + +X_CONFIG=generic +ifeq ($(CONFIG_TARGET_olpc),y) + X_CONFIG=olpc +endif +ifeq ($(CONFIG_TARGET_s3c24xx),y) + X_CONFIG=om_gta02 +endif +ifeq ($(CONFIG_TARGET_omap24xx_n810-gui),y) + X_CONFIG=nokia_n810 +endif + +define Package/xorg/Default + SECTION:=xorg-server + CATEGORY:=Xorg + SUBMENU:=server + DEPENDS:=@!avr32 + URL:=http://xorg.freedesktop.org/ +endef + +define Package/xserver-xorg +$(call Package/xorg/Default) + PROVIDES:=xserver + TITLE:=Xorg xserver + DEPENDS:=+xserver-common \ + +libpthread \ + +xkbcomp \ + +libxkbfile \ + +libXfont \ + +libXau \ + +libXv \ + +libfontenc \ + +pixman \ + +libopenssl \ + +libpciaccess \ + +libdrm \ + +libgl-mesa \ + @DISPLAY_SUPPORT +endef + +define Package/xserver-common +$(call Package/xorg/Default) + TITLE:=meta-package +endef + +EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Build/Configure + $(call Build/Configure/Default, \ + --disable-dependency-tracking \ + --disable-debug \ + --disable-unit-tests \ + --disable-builddocs \ + --disable-glx-tls \ + --disable-composite \ + --disable-shm \ + --disable-xres \ + --disable-record \ + --enable-xv \ + --enable-xvmc \ + --disable-dga \ + --disable-screensaver \ + --disable-xdmcp \ + --disable-xdm-auth-1 \ + --disable-glx \ + --enable-dri \ + --enable-dri2 \ + --disable-xinerama \ + --disable-xf86vidmode \ + --disable-xace \ + --disable-xselinux \ + --disable-xsecurity \ + --disable-xcalibrate \ + --disable-tslib \ + --disable-multibuffer \ + --disable-dbe \ + --disable-xf86bigfont \ + --enable-dpms \ + --disable-config-dbus \ + --disable-config-hal \ + --disable-xfree86-utils \ + --disable-xaa \ + --enable-vgahw \ + --disable-vbe \ + --enable-int10-module \ + --enable-xorg \ + --disable-dmx \ + --disable-xvfb \ + --disable-xnest \ + --disable-xquartz \ + --disable-standalone-xpbproxy \ + --disable-xwin \ + --disable-kdrive \ + --disable-xfake \ + --disable-xfbdev \ + --disable-installsetuid \ + --disable-secure-rpc \ + --enable-silent-rules \ + --disable-shave \ + ) +endef + +define Package/xserver-common/install + $(INSTALL_DIR) $(1)/etc/{init.d,config,X11} + $(INSTALL_BIN) \ + ./files/x.init \ + $(1)/etc/init.d/x11 + $(INSTALL_DATA) ./files/tmp/x11.uci \ + $(1)/etc/config/x11 + test -f ./files/config.xorg/$(X_CONFIG) && \ + $(INSTALL_DATA) \ + ./files/config.xorg/$(X_CONFIG) \ + $(1)/etc/X11/xorg.conf +# test -f ./files/config.uci/$(X_CONFIG) && \ +# $(INSTALL_DATA) \ +# ./files/config.uci/$(X_CONFIG) \ +# $(1)/etc/config/x11 +endef + +define Package/xserver-xorg/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/Xorg \ + $(1)/usr/bin/ + + $(INSTALL_DIR) $(1)/usr/lib/xorg/modules/{extensions,fonts,linux,multimedia} + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/*.so \ + $(1)/usr/lib/xorg/modules/ + + $(foreach d,extensions fonts linux multimedia, \ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/xorg/modules/$(d)/*.so \ + $(1)/usr/lib/xorg/modules/$(d)/; \ + ) +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/share/aclocal/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ + $(1)/usr/share/aclocal/ + + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(if $(CONFIG_PACKAGE_xserver-xorg), \ + $(INSTALL_DIR) $(1)/usr/include/xorg; \ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/xorg/*.h \ + $(1)/usr/include/xorg/; \ + ) + $(INSTALL_DIR) $(1)/mk + $(INSTALL_DATA) \ + ./files/xorg-driver.mk \ + $(1)/mk/ + $(SED) 's,@VERSION@,$(PKG_VERSION),' $(1)/mk/xorg-driver.mk +endef + +$(eval $(call BuildPackage,xserver-common)) +$(eval $(call BuildPackage,xserver-xorg)) diff --git a/Xorg/xorg/xserver/xorg-server/files/config.uci/generic b/Xorg/xorg/xserver/xorg-server/files/config.uci/generic new file mode 100644 index 0000000000..da66f66161 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/config.uci/generic @@ -0,0 +1,17 @@ +# Copyright (C) 2006 OpenWrt.org + +config screen + option resolution 800x600 + option dpi 285 + +config graphic + option device /dev/fb0 + +config input mouse + option device /dev/psaux + option driver mouse + +config input keybd + option driver keyboard + +config 'desktop' diff --git a/Xorg/xorg/xserver/xorg-server/files/config.uci/olpc b/Xorg/xorg/xserver/xorg-server/files/config.uci/olpc new file mode 100644 index 0000000000..49b7f2ddba --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/config.uci/olpc @@ -0,0 +1,14 @@ +# Copyright (C) 2006 OpenWrt.org + +config screen + option resolution 1200x900 + option dpi 285 + +config graphic + option device /dev/fb0 + +config input mouse + option device /dev/event1 + option driver tslib + +config 'desktop' diff --git a/Xorg/xorg/xserver/xorg-server/files/config.uci/om_gta02 b/Xorg/xorg/xserver/xorg-server/files/config.uci/om_gta02 new file mode 100644 index 0000000000..296599f916 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/config.uci/om_gta02 @@ -0,0 +1,14 @@ +# Copyright (C) 2006 OpenWrt.org + +config screen + option resolution 480x640 + option dpi 285 + +config graphic + option device /dev/fb0 + +config input mouse + option device /dev/event1 + option driver tslib + +config 'desktop' diff --git a/Xorg/xorg/xserver/xorg-server/files/config.xorg/generic b/Xorg/xorg/xserver/xorg-server/files/config.xorg/generic new file mode 100644 index 0000000000..d9db82f6f8 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/config.xorg/generic @@ -0,0 +1,64 @@ +# xorg configuration + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Mouse0" "CorePointer" + InputDevice "Mouse1" "CorePointer" + InputDevice "Keyboard0" "CoreKeyboard" +EndSection + +Section "Module" + Load "dbe" + Load "extmod" + Load "fbdevhw" +# Load "glx" + Load "record" + Load "freetype" + Load "type1" +EndSection + +Section "InputDevice" + Identifier "Keyboard0" + Driver "keyboard" +EndSection + +Section "InputDevice" + Identifier "Mouse0" + Driver "mouse" + Option "Protocol" "PS/2" + Option "Device" "/dev/psaux" +EndSection + +Section "InputDevice" + Identifier "Mouse1" + Driver "mouse" + Option "Protocol" "IMPS/2" + Option "Device" "/dev/input/mice" +EndSection + +Section "Monitor" + Identifier "Monitor0" + VendorName "Monitor Vendor" + ModelName "OWRT" + Option "dpms" +EndSection + +Section "Device" + Identifier "Videocard0" + Driver "vesa" + VendorName "Videocard vendor" + BoardName "Vesa driver" +EndSection + +Section "Device" + Identifier "FBDev" + Driver "fbdev" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" +EndSection + diff --git a/Xorg/xorg/xserver/xorg-server/files/config.xorg/nokia_n810 b/Xorg/xorg/xserver/xorg-server/files/config.xorg/nokia_n810 new file mode 100644 index 0000000000..27f24306c5 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/config.xorg/nokia_n810 @@ -0,0 +1,43 @@ +Section "InputDevice" + Identifier "SlideKeyboard" + Driver "kbd" + Option "XkbRules" "evdev" + Option "XkbModel" "pc105" + Option "XkbLayout" "nokia_vndr/rx-44" + Option "XkbVariant" "de" + Option "XkbOptions" "lv3:ralt_switch" +EndSection + +Section "InputDevice" + Identifier "Touchscreen" + Driver "tslib" + Option "CorePointer" "true" + Option "SendCoreEvents" "true" + Option "Device" "/dev/input/event1" + Option "Protocol" "Auto" + Option "Width" "800" + Option "Height" "480" +EndSection + +Section "Monitor" + Identifier "InternalLCD" +EndSection + +Section "Device" + Identifier "FramebufferDevice" + Driver "omapfb" + Option "fb" "/dev/fb0" +EndSection + +Section "Screen" + Identifier "InternalScreen" + Device "FramebufferDevice" + Monitor "InternalLCD" +EndSection + +Section "ServerLayout" + Identifier "DefaultLayout" + Screen "InternalScreen" + InputDevice "Touchscreen" "CorePointer" + InputDevice "SlideKeyboard" "CoreKeyboard" +EndSection diff --git a/Xorg/xorg/xserver/xorg-server/files/config.xorg/olpc b/Xorg/xorg/xserver/xorg-server/files/config.xorg/olpc new file mode 100644 index 0000000000..0bbb1ae670 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/config.xorg/olpc @@ -0,0 +1,78 @@ +# xorg configuration + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Mouse0" "CorePointer" + InputDevice "Keyboard0" "CoreKeyboard" +EndSection + +Section "Files" + FontPath "/usr/lib/X11/fonts/misc" +EndSection + +Section "Module" + Load "dbe" + Load "extmod" + Load "fbdevhw" +# Load "glx" + Load "record" + Load "freetype" + Load "type1" +EndSection + +Section "InputDevice" + Identifier "Keyboard0" + Driver "keyboard" + Option "XkbModel" "pc105" + Option "XkbLayout" "us" +EndSection + +Section "InputDevice" + Identifier "Mouse0" + Driver "mouse" +# Option "Protocol" "PS/2" + Option "Protocol" "IMPS/2" +# Option "Device" "/dev/psaux" + Option "Device" "/dev/mice" +# Option "ZAxisMapping" "4 5" +# Option "Emulate3Buttons" "yes" +EndSection + +Section "Monitor" + Identifier "Monitor0" + HorizSync 30-67 + VertRefresh 48-52 + DisplaySize 152 114 + Mode "1200x900" + DotClock 57.275 + HTimings 1200 1208 1216 1240 + VTimings 900 905 908 912 + Flags "-HSync" "-VSync" + EndMode +EndSection + +Section "Device" + Identifier "Videocard0" + Driver "geode" + Option "PanelGeometry" "1200x900" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" + DefaultDepth 16 + + SubSection "Display" + Depth 16 + Modes "1200x900" + EndSubsection + +EndSection + +Section "DRI" + Group 0 + Mode 0666 +EndSection + diff --git a/Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 b/Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 new file mode 100644 index 0000000000..1e84135f74 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/config.xorg/om_gta02 @@ -0,0 +1,34 @@ +# xorg configuration + +Section "ServerLayout" + Identifier "Default Layout" + Screen 0 "Screen0" 0 0 + InputDevice "Mouse0" "CorePointer" +EndSection + +Section "InputDevice" + Identifier "Mouse0" + Driver "tslib" + Option "Device" "/dev/event1" + Option "Width" "480" + Option "Height" "640" +EndSection + +Section "Monitor" + Identifier "Monitor0" + VendorName "Monitor Vendor" + ModelName "OWRT" + Option "dpms" +EndSection + +Section "Device" + Identifier "Videocard0" + Driver "glamo" +EndSection + +Section "Screen" + Identifier "Screen0" + Device "Videocard0" + Monitor "Monitor0" + DefaultDepth 16 +EndSection diff --git a/Xorg/xorg/xserver/xorg-server/files/tmp/x11.uci b/Xorg/xorg/xserver/xorg-server/files/tmp/x11.uci new file mode 100644 index 0000000000..0fc9fa9dbe --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/tmp/x11.uci @@ -0,0 +1,3 @@ +# Copyright (C) 2006 OpenWrt.org + +config 'desktop' diff --git a/Xorg/xorg/xserver/xorg-server/files/x.init b/Xorg/xorg/xserver/xorg-server/files/x.init new file mode 100755 index 0000000000..2685d0418a --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/x.init @@ -0,0 +1,56 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006 OpenWrt.org +START=99 + +ARGS="-br" + +#screen() { +# local cfg="$1" +# config_get resolution $cfg resolution +# config_get dpi $cfg dpi +# [ -n "$resolution" ] && ARGS="$ARGS -screen $resolution" +# [ -n "$dpi" ] && ARGS="$ARGS -dpi $dpi" +#} +# +#graphic() { +# local cfg="$1" +# config_get device $cfg device +# [ -n "$device" ] && ARGS="$ARGS -fb $device" +#} +# +#input() { +# local cfg="$1" +# config_get device $cfg device +# config_get driver $cfg driver +# #[ -n "$device" ] || return 0 +# [ -n "$driver" ] || return 0 +# ARGS="$ARGS -$cfg $driver,,device=$device" +#} + +desktop() { + local cfg="$1" + config_get autostart $cfg autostart + [ -n "$autostart" ] && eval $autostart & + config_get fdo_compliance $cfg fdo_compliance + [ -n "`echo \"$fdo_compliance\" 2> /dev/null | grep autostart`" ] && exit # in case the environment provides its own functionality to do the autostart stuff exit here +} + +start() { + export DISPLAY=":0" + config_load x11 +# config_foreach screen screen +# config_foreach graphic graphic +# config_foreach input input + Xorg $ARGS & + sleep 1 # give the xserver some time get initialized + config_foreach desktop desktop + test -d /etc/xdg/autostart || exit + sleep 1 # give the first x11 application some time to get present - afterwards we'll start the x11 autostart applications + for elem in `ls /etc/xdg/autostart/`; do + if grep "^Hidden=true" "/etc/xdg/autostart/$elem" > /dev/null; then + continue + fi + exec=`grep "^Exec=" "/etc/xdg/autostart/$elem"` + eval ${exec#*=} & + done +} diff --git a/Xorg/xorg/xserver/xorg-server/files/xorg-driver.mk b/Xorg/xorg/xserver/xorg-server/files/xorg-driver.mk new file mode 100644 index 0000000000..0b12519615 --- /dev/null +++ b/Xorg/xorg/xserver/xorg-server/files/xorg-driver.mk @@ -0,0 +1,3 @@ +XORG_VERSION:=@VERSION@ + +STAMP_CONFIGURED:=$(STAMP_CONFIGURED)$(XORG_VERSION) diff --git a/Xorg/xserver/xglamo/Makefile b/Xorg/xserver/xglamo/Makefile new file mode 100644 index 0000000000..d1c0ac5b77 --- /dev/null +++ b/Xorg/xserver/xglamo/Makefile @@ -0,0 +1,135 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# +# blogic@openwrt.org + +include $(TOPDIR)/rules.mk + +PKG_NAME:=xglamo +PKG_VERSION:=20081205 +PKG_REV:=3f113f5f4dbaf14dee439eac8d510313fff3aafc +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://git.openmoko.org/git/xglamo.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/xserver/$(PKG_NAME)-$(PKG_VERSION)/ + +include $(INCLUDE_DIR)/package.mk + +EXTRA_CFLAGS+= -I${STAGING_DIR}/usr/include/X11/GL -I${STAGING_DIR}/usr/include/X11/dri/ -I${STAGING_DIR}/usr/include/X11/ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +CONFIGURE_ARGS += --disable-dga \ + --disable-xinerama \ + --disable-xf86misc \ + --disable-xf86vidmode \ + --disable-xf86bigfont \ + --disable-xorgcfg \ + --disable-xkb \ + --disable-xnest \ + --disable-xvfb \ + --disable-xevie \ + --disable-xprint \ + --disable-xtrap \ + --disable-dmx \ + --disable-w100 \ + --disable-glx \ + --disable-xv \ + --disable-record \ + --disable-xephyr \ + --disable-xorg \ + --enable-kdrive \ + --enable-tslib \ + --enable-dri \ + --enable-drm \ + --enable-builtin-fonts \ + --with-default-font-path=built-ins \ + +CONFIGURE_VARS+=ac_cv_file__usr_share_sgml_X11_defs_ent=yes + +ifeq ($(CONFIG_TARGET_s3c24xx),y) + X_CONFIG=om_gta02 + TS_POINTERCAL=om_gta02 +endif + +define Package/xglamo + # xineramaproto necessary even when xinerama is disabled due to buggy xglamo + TITLE:=xglamo + SECTION:=xorg-server + SUBMENU:=server + CATEGORY:=Xorg + URL:=http://git.openmoko.org/?p=xglamo.git + DEPENDS:=+tslib \ + +recordproto \ + +glproto \ + +libdrm \ + +xf86driproto \ + +xineramaproto \ + +calibrateproto \ + +compositeproto \ + +libpthread \ + +randrproto \ + +renderproto \ + +fixesproto \ + +damageproto \ + +xcmiscproto \ + +xextproto \ + +xproto \ + +scrnsaverproto \ + +bigreqsproto \ + +resourceproto \ + +fontsproto \ + +inputproto \ + +kbproto \ + +videoproto \ + +resourceproto \ + +xtrans \ + +libxkbfile \ + +libXfont \ + +libXau \ + +libfontenc \ + +pixman \ + +libopenssl \ + @DISPLAY_SUPPORT \ + @arm||armeb \ + @TARGET_s3c24xx +endef + +define Package/xglamo/description + kdrive server with acceleration support for the graphics chip by smedia +endef + +define Build/Configure + (cd $(PKG_BUILD_DIR) && \ + $(CP) $(SCRIPT_DIR)/config.{guess,sub} $(PKG_BUILD_DIR)/ && \ + $(CONFIGURE_VARS) \ + ./autogen.sh \ + $(CONFIGURE_ARGS_XTRA) \ + $(CONFIGURE_ARGS) \ + ); +endef + +define Build/Compile + DESTDIR="$(PKG_INSTALL_DIR)" $(MAKE) -C $(PKG_BUILD_DIR) install +endef + +define Package/xglamo/install + $(INSTALL_DIR) $(1)/usr/bin $(1)/usr/lib $(1)/etc/init.d $(1)/etc/config $(1)/etc/uci-defaults + $(CP) $(PKG_INSTALL_DIR)/usr/bin/Xglamo $(1)/usr/bin/ + $(CP) ./files/x.init $(1)/etc/init.d/x11 + $(if $(TS_POINTERCAL),$(CP) ./files/pointercal.$(TS_POINTERCAL) $(1)/etc/pointercal) + $(if $(X_CONFIG),$(CP) ./files/config/x11.$(X_CONFIG) $(1)/etc/config/x11) + $(CP) $(PKG_INSTALL_DIR)/usr/lib/* $(1)/usr/lib/ +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1) + $(CP) $(PKG_INSTALL_DIR)/* $(1)/ +endef + +$(eval $(call BuildPackage,xglamo)) diff --git a/Xorg/xserver/xglamo/files/config/x11.om_gta02 b/Xorg/xserver/xglamo/files/config/x11.om_gta02 new file mode 100644 index 0000000000..705107ca3f --- /dev/null +++ b/Xorg/xserver/xglamo/files/config/x11.om_gta02 @@ -0,0 +1,7 @@ +# Copyright (C) 2006 OpenWrt.org + +config 'screen' + option 'resolution' '480x640' + option 'dpi' '285' + +config 'desktop' diff --git a/Xorg/xserver/xglamo/files/pointercal.om_gta02 b/Xorg/xserver/xglamo/files/pointercal.om_gta02 new file mode 100644 index 0000000000000000000000000000000000000000..841ec7fab2e8e37afeb8c3afa1626a62d8fd1543 GIT binary patch literal 46 ucmV~$u>k-e3<5A`uiya(XrcQ5VcS<-WN1%w#i;F_+%Gw{#l?a0X literal 0 HcmV?d00001 diff --git a/Xorg/xserver/xglamo/files/x.init b/Xorg/xserver/xglamo/files/x.init new file mode 100755 index 0000000000..ddefa1254e --- /dev/null +++ b/Xorg/xserver/xglamo/files/x.init @@ -0,0 +1,39 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2006 OpenWrt.org +START=99 + +ARGS="" + +screen() { + local cfg="$1" + config_get resolution $cfg resolution + config_get dpi $cfg dpi + [ -n "$resolution" ] && ARGS="$ARGS -screen $resolution" + [ -n "$dpi" ] && ARGS="$ARGS -dpi $dpi" +} + +desktop() { + local cfg="$1" + config_get autostart $cfg autostart + [ -n "$autostart" ] && eval $autostart & + config_get fdo_compliance $cfg fdo_compliance + [ -n "`echo \"$fdo_compliance\" 2> /dev/null | grep autostart`" ] && exit # in case the environment provides its own functionality to do the autostart stuff exit here +} + +start() { + export DISPLAY=":0" + config_load x11 + config_foreach screen screen + TSLIB_TSDEVICE="/dev/event1" Xglamo $ARGS & + sleep 1 # give the xserver some time get initialized + config_foreach desktop desktop + test -d /etc/xdg/autostart || exit + sleep 1 # give the first x11 application some time to get present - afterwars we'll start the x11 autostart applications + for elem in `ls /etc/xdg/autostart/`; do + if grep "^Hidden=true" "/etc/xdg/autostart/$elem" > /dev/null; then + continue + fi + exec=`grep "^Exec=" "/etc/xdg/autostart/$elem"` + eval ${exec#*=} & + done +} diff --git a/Xorg/xserver/xglamo/patches/001-fix-aclocal.patch b/Xorg/xserver/xglamo/patches/001-fix-aclocal.patch new file mode 100644 index 0000000000..8af158fdac --- /dev/null +++ b/Xorg/xserver/xglamo/patches/001-fix-aclocal.patch @@ -0,0 +1,14 @@ +diff -ruN git/configure.ac xglamo/git/configure.ac +--- git.orig/configure.ac 2008-11-18 23:42:32.000000000 +0100 ++++ git/configure.ac 2008-11-18 23:51:31.000000000 +0100 +@@ -1688,7 +1688,9 @@ + DIX_CFLAGS="-DHAVE_DIX_CONFIG_H" + AC_SUBST([DIX_CFLAGS]) + +-AC_SUBST([libdir exec_prefix prefix]) ++AC_SUBST([libdir]) ++AC_SUBST([exec_prefix]) ++AC_SUBST([prefix]) + + # Man page sections - used in config utils & generating man pages + XORG_MANPAGE_SECTIONS diff --git a/admin/htop/Makefile b/admin/htop/Makefile index da14404641..9a33d11479 100644 --- a/admin/htop/Makefile +++ b/admin/htop/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2012 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=htop -PKG_VERSION:=1.0 -PKG_RELEASE:=2 +PKG_VERSION:=0.9 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) -PKG_MD5SUM:=325112ca7947ea1f6d6441f631e00384 +PKG_MD5SUM:=7c5507f35f363f3f40183a2ba3c561f8 PKG_FIXUP:=autoreconf PKG_INSTALL:=1 @@ -34,11 +34,6 @@ define Package/htop/description see all processes and their full command lines. endef -CONFIGURE_ARGS += \ - --disable-native-affinity \ - --disable-unicode \ - --enable-hwloc - CONFIGURE_VARS += \ ac_cv_file__proc_stat=yes \ ac_cv_file__proc_meminfo=yes \ diff --git a/admin/htop/patches/001-uClibc-friendly.patch b/admin/htop/patches/001-uClibc-friendly.patch new file mode 100644 index 0000000000..ff9b5b1397 --- /dev/null +++ b/admin/htop/patches/001-uClibc-friendly.patch @@ -0,0 +1,52 @@ +--- a/CRT.c ++++ b/CRT.c +@@ -11,7 +11,9 @@ in the source distribution for its full + #include + #include + #include ++#ifdef HAVE_EXECINFO_H + #include ++#endif + + #include "String.h" + +@@ -125,12 +127,14 @@ static void CRT_handleSIGSEGV(int sgn) { + CRT_done(); + #if __linux + fprintf(stderr, "\n\nhtop " VERSION " aborting. Please report bug at http://htop.sf.net\n"); +- #else +- fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n"); +- #endif ++ #ifdef HAVE_EXECINFO_H + size_t size = backtrace(backtraceArray, sizeof(backtraceArray)); + fprintf(stderr, "Backtrace: \n"); + backtrace_symbols_fd(backtraceArray, size, 2); ++ #endif ++ #else ++ fprintf(stderr, "\n\nhtop " VERSION " aborting. Unsupported platform.\n"); ++ #endif + abort(); + } + +--- a/CRT.h ++++ b/CRT.h +@@ -14,7 +14,9 @@ in the source distribution for its full + #include + #include + #include ++#ifdef HAVE_EXECINFO_H + #include ++#endif + + #include "String.h" + +--- a/configure.ac ++++ b/configure.ac +@@ -25,6 +25,7 @@ AC_HEADER_STDC + AC_CHECK_HEADERS([stdlib.h string.h strings.h sys/param.h sys/time.h unistd.h curses.h],[:],[ + missing_headers="$missing_headers $ac_header" + ]) ++AC_CHECK_HEADERS([execinfo.h],[:],[:]) + + # Checks for typedefs, structures, and compiler characteristics. + AC_HEADER_STDBOOL diff --git a/admin/monit/Makefile b/admin/monit/Makefile index ef40bd9163..57d7adae17 100644 --- a/admin/monit/Makefile +++ b/admin/monit/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=monit PKG_VERSION:=5.2.5 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://mmonit.com/monit/dist diff --git a/admin/monit/files/monit.init b/admin/monit/files/monit.init index af31d898fb..6a3e5c0813 100644 --- a/admin/monit/files/monit.init +++ b/admin/monit/files/monit.init @@ -1,16 +1,19 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org START=60 - -SERVICE_USE_PID=1 +BIN=monit +DEFAULT=/etc/default/$BIN +RUN_D=/var/run +PID_F=$RUN_D/$BIN.pid start() { - [ -f /etc/monitrc ] || return 1 - [ "$(stat -c "%a" /etc/monitrc)" = "0700" ] || chmod 0700 /etc/monitrc - service_start /usr/bin/monit -d 60 + [ -f $DEFAULT ] && . $DEFAULT + mkdir -p $RUN_D + $BIN $OPTIONS } stop() { - service_stop /usr/bin/monit + [ -f $PID_F ] && kill $(cat $PID_F) } + diff --git a/admin/muninlite/Makefile b/admin/muninlite/Makefile index a55d3de523..1a27cd050a 100644 --- a/admin/muninlite/Makefile +++ b/admin/muninlite/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=muninlite PKG_VERSION:=1.0.4 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -44,10 +44,6 @@ define Package/muninlite/install $(INSTALL_DATA) ./files/etc/xinetd.d/munin $(1)/etc/xinetd.d/ endef -define Package/muninlite/conffiles -/etc/xinetd.d/munin -endef - define Build/Configure endef diff --git a/admin/nagios/Makefile b/admin/nagios/Makefile index 68981eb206..fc9cb8715f 100644 --- a/admin/nagios/Makefile +++ b/admin/nagios/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nagios PKG_VERSION:=2.10 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/nagios @@ -58,12 +58,4 @@ define Package/nagios/install $(CP) $(PKG_INSTALL_DIR)/usr/share/* $(1)/usr/share/ endef -define Package/nagios/conffiles -/etc/nagios/cgi.cfg -/etc/nagios/commands.cfg -/etc/nagios/localhost.cfg -/etc/nagios/nagios.cfg -/etc/nagios/resource.cfg -endef - $(eval $(call BuildPackage,nagios)) diff --git a/admin/nrpe/Makefile b/admin/nrpe/Makefile index 9495885dd9..3835b14436 100644 --- a/admin/nrpe/Makefile +++ b/admin/nrpe/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nrpe PKG_VERSION:=2.12 -PKG_RELEASE:=4 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/nagios @@ -34,6 +34,42 @@ define Package/nrpe/description the remote Linux/Unix machines. endef +define Package/nrpe/postinst +#!/bin/sh + +id=50 +name=nagios +home=/var/run/nagios +shell=/bin/false + +# do not change below +# check if we are on real system +if [ -z "$${IPKG_INSTROOT}" ]; then + # create copies of passwd and group, if we use squashfs + rootfs=`mount |awk '/root/ { print $$5 }'` + if [ "$$rootfs" = "squashfs" ]; then + if [ -h /etc/group ]; then + rm /etc/group + cp -p /rom/etc/group /etc/group + fi + if [ -h /etc/passwd ]; then + rm /etc/passwd + cp -p /rom/etc/passwd /etc/passwd + fi + fi +fi + +echo "" +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then + echo "adding group $$name to /etc/group" + echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group +fi +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then + echo "adding user $$name to /etc/passwd" + echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd +fi +endef + CONFIGURE_ARGS += \ --with-ssl="$(STAGING_DIR)/usr" \ --with-ssl-lib="$(STAGING_DIR)/usr/lib" @@ -47,10 +83,6 @@ define Package/nrpe/install $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) endef -define Package/nrpe/conffiles -/etc/nrpe.cfg -endef - $(eval $(call RequireCommand,openssl, \ $(PKG_NAME) requires openssl installed on the host-system. \ )) diff --git a/admin/nrpe/files/nrpe.init b/admin/nrpe/files/nrpe.init index 4632ac1fa1..e1ccf8ad96 100644 --- a/admin/nrpe/files/nrpe.init +++ b/admin/nrpe/files/nrpe.init @@ -1,20 +1,12 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org START=70 -SERVICE_USE_PID=1 - start() { - user_exists nagios 50 || user_add nagios 50 - group_exists nagios 50 || group_add nagios 50 - [ -d /var/run/nagios ] || { - mkdir -m 0755 -p /var/run/nagios - chown nagios:nagios /var/run/nagios - } - service_start /usr/sbin/nrpe -c /etc/nrpe.cfg -d + /usr/sbin/nrpe -c /etc/nrpe.cfg -d } stop() { - service_stop /usr/sbin/nrpe + killall nrpe } diff --git a/admin/osiris/Makefile b/admin/osiris/Makefile index 898d920028..e2c6165dd6 100644 --- a/admin/osiris/Makefile +++ b/admin/osiris/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=osiris PKG_VERSION:=4.2.3 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://osiris.shmoo.com/data/ diff --git a/admin/osiris/files/osirisd.init b/admin/osiris/files/osirisd.init index 1ce739b227..9916567b87 100644 --- a/admin/osiris/files/osirisd.init +++ b/admin/osiris/files/osirisd.init @@ -1,15 +1,20 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -SERVICE_USE_PID=1 +BIN=osirisd +DEFAULT=/etc/default/$BIN +LIB_D=/var/lib/osiris +RUN_D=/var/run +PID_F=$RUN_D/$BIN.pid start() { - mkdir -0755 -p /var/lib/osiris - service_start /usr/sbin/osirisd + [ -f $DEFAULT ] && . $DEFAULT + mkdir -p $LIB_D + mkdir -p $RUN_D + $BIN $OPTIONS } - stop() { - service_stop /usr/sbin/osirisd + [ -f $PID_F ] && kill $(cat $PID_F) } + diff --git a/admin/pmacct/Makefile b/admin/pmacct/Makefile index 638fa637d2..dcc64ee0ca 100644 --- a/admin/pmacct/Makefile +++ b/admin/pmacct/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pmacct PKG_VERSION:=0.12.5 -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pmacct.net/ @@ -17,11 +17,6 @@ PKG_MD5SUM:=3d10f9301a17f034a0f221490a99a5d0 PKG_BUILD_DEPENDS:=libpcap -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - -PKG_CONFIG_DEPENDS:= \ - CONFIG_IPV6 \ - include $(INCLUDE_DIR)/package.mk define Package/pmacct/Default @@ -31,27 +26,59 @@ define Package/pmacct/Default URL:=http://www.pmacct.net/ endef -define Package/pmacct-client - $(call Package/pmacct/Default) - TITLE:=Command-line client to gather data from the IMT plugin - VARIANT:=basic -endef - define Package/nfacctd/Default $(call Package/pmacct/Default) TITLE:=NetFlow accounting daemon endef +define Package/nfacctd + $(call Package/nfacctd/Default) +endef + +define Package/nfacctd-mysql + $(call Package/nfacctd/Default) + TITLE+= with MySQL support + DEPENDS+= +libmysqlclient +endef + +define Package/nfacctd-pgsql + $(call Package/nfacctd/Default) + TITLE+= with PostreSQL support + DEPENDS+= +libpq +endef + +define Package/nfacctd-sqlite + $(call Package/nfacctd/Default) + TITLE+= with SQLite support + DEPENDS+= +libsqlite3 +endef + define Package/pmacctd/Default $(call Package/pmacct/Default) DEPENDS+= +libpcap TITLE:=IP pcap-based accounting daemon endef -define Package/sfacctd/Default - $(call Package/pmacct/Default) - DEPENDS+= +libpcap - TITLE:=sFlow accounting daemon +define Package/pmacctd + $(call Package/pmacctd/Default) +endef + +define Package/pmacctd-mysql + $(call Package/pmacctd/Default) + TITLE+= with MySQL support + DEPENDS+= +libmysqlclient +endef + +define Package/pmacctd-pgsql + $(call Package/pmacctd/Default) + TITLE+= with PostreSQL support + DEPENDS+= +libpq +endef + +define Package/pmacctd-sqlite + $(call Package/pmacctd/Default) + TITLE+= with SQLite support + DEPENDS+= +libsqlite3 endef define Package/uacctd/Default @@ -60,125 +87,155 @@ define Package/uacctd/Default TITLE:=ulog accounting daemon endef +define Package/uacctd + $(call Package/pmacctd/Default) +endef + +define Package/uacctd-mysql + $(call Package/pmacctd/Default) + TITLE+= with MySQL support + DEPENDS+= +libmysqlclient +endef + +define Package/uacctd-pgsql + $(call Package/pmacctd/Default) + TITLE+= with PostreSQL support + DEPENDS+= +libpq +endef + +define Package/uacctd-sqlite + $(call Package/pmacctd/Default) + TITLE+= with SQLite support + DEPENDS+= +libsqlite3 +endef + +define Package/pmacct-client + $(call Package/pmacct/Default) + TITLE:=Command-line client to gather data from the IMT plugin +endef + +define Compile/Template + +$(PKG_BUILD_DIR)/nfacctd$(1) $(PKG_BUILD_DIR)/pmacctd$(1) $(PKG_BUILD_DIR)/uacctd$(1): $(STAMP_CONFIGURED) + -$(MAKE) -C $(PKG_BUILD_DIR) distclean + $(call Build/Configure/Default, \ + --with-pcap-includes="$(STAGING_DIR)/usr/include" \ + --with-pcap-libs="$(STAGING_DIR)/usr/lib" \ + --enable-ulog \ + $(2) \ + ,\ + LIBS="-lz" \ + ,,\ + ); + $(MAKE) -C $(PKG_BUILD_DIR) \ + all + mv -f $(PKG_BUILD_DIR)/src/nfacctd $(PKG_BUILD_DIR)/nfacctd$(1) + mv -f $(PKG_BUILD_DIR)/src/pmacctd $(PKG_BUILD_DIR)/pmacctd$(1) + mv -f $(PKG_BUILD_DIR)/src/uacctd $(PKG_BUILD_DIR)/uacctd$(1) + +$(PKG_BUILD_DIR)/.built: $(PKG_BUILD_DIR)/nfacctd$(1) $(PKG_BUILD_DIR)/pmacctd$(1) $(PKG_BUILD_DIR)/uacctd$(1) -CONFIGURE_ARGS+= \ - $(call autoconf_bool,CONFIG_IPV6,ipv6) \ - --with-pcap-includes="$(STAGING_DIR)/usr/include" \ - --with-pcap-libs="$(STAGING_DIR)/usr/lib" \ - --enable-ulog \ +endef -ifeq ($(BUILD_VARIANT),basic) - CONFIGURE_ARGS += \ +define Install/Template + +define Package/$(1)$(2)/conffiles +/etc/default/$(1) +/etc/$(1).conf +endef + +define Package/$(1)$(2)/install + $(INSTALL_DIR) $$(1)/usr/sbin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/$(1)$(2) $$(1)/usr/sbin/$(1) + $(INSTALL_DIR) $$(1)/etc + $(INSTALL_DATA) ./files/$(1).conf $$(1)/etc/ + $(INSTALL_DIR) $$(1)/etc/default + $(INSTALL_DATA) ./files/$(1).default $$(1)/etc/default/$(1) + $(INSTALL_DIR) $$(1)/etc/init.d + $(INSTALL_BIN) ./files/$(1).init $$(1)/etc/init.d/$(1) +endef + +endef + +ifneq ($(SDK)$(CONFIG_PACKAGE_nfacctd)$(CONFIG_PACKAGE_pmacctd)$(CONFIG_PACKAGE_uacctd),) + define Compile/pmacct/basic + $(call Compile/Template,, \ --disable-mysql \ --disable-pgsql \ --disable-sqlite3 \ - + ) + $(call Install/Template,nfacctd,) + $(call Install/Template,pmacctd,) + $(call Install/Template,uacctd,) + endef endif +$(eval $(Compile/pmacct/basic)) -ifeq ($(BUILD_VARIANT),mysql) - - CONFIGURE_ARGS += \ +ifneq ($(SDK)$(CONFIG_PACKAGE_nfacctd-mysql)$(CONFIG_PACKAGE_pmacctd-mysql)$(CONFIG_PACKAGE_uacctd-mysql),) + define Compile/pmacct/mysql + $(call Compile/Template,-mysql, \ --enable-mysql \ --with-mysql-includes="$(STAGING_DIR)/usr/include" \ --with-mysql-libs="$(STAGING_DIR)/usr/lib/mysql" \ - --disable-pgsql \ - --disable-sqlite3 \ - - CONFIGURE_VARS+= \ - LIBS="-lz" \ - + ) + $(call Install/Template,nfacctd,-mysql) + $(call Install/Template,pmacctd,-mysql) + $(call Install/Template,uacctd,-mysql) + endef endif +$(eval $(Compile/pmacct/mysql)) -ifeq ($(BUILD_VARIANT),pgsql) - - CONFIGURE_ARGS += \ - --disable-mysql \ +ifneq ($(SDK)$(CONFIG_PACKAGE_nfacctd-pgsql)$(CONFIG_PACKAGE_pmacctd-pgsql)$(CONFIG_PACKAGE_uacctd-pgsql),) + define Compile/pmacct/pgsql + $(call Compile/Template,-pgsql, \ --enable-pgsql \ --with-pgsql-includes="$(STAGING_DIR)/usr/include" \ --with-pgsql-libs="$(STAGING_DIR)/usr/lib" \ - --disable-sqlite3 \ - + ) + $(call Install/Template,nfacctd,-pgsql) + $(call Install/Template,pmacctd,-pgsql) + $(call Install/Template,uacctd,-pgsql) + endef endif +$(eval $(Compile/pmacct/pgsql)) -ifeq ($(BUILD_VARIANT),sqlite) - - CONFIGURE_ARGS += \ - --disable-mysql \ - --disable-pgsql \ +ifneq ($(SDK)$(CONFIG_PACKAGE_nfacctd-sqlite)$(CONFIG_PACKAGE_pmacctd-sqlite)$(CONFIG_PACKAGE_uacctd-sqlite),) + define Compile/pmacct/sqlite + $(call Compile/Template,-sqlite, \ --enable-sqlite3 \ --with-sqlite3-includes="$(STAGING_DIR)/usr/include" \ --with-sqlite3-libs="$(STAGING_DIR)/usr/lib" \ - + ) + $(call Install/Template,nfacctd,-sqlite) + $(call Install/Template,pmacctd,-sqlite) + $(call Install/Template,uacctd,-sqlite) + endef endif +$(eval $(Compile/pmacct/sqlite)) +define Build/Configure +endef define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install endef - define Package/pmacct-client/install $(INSTALL_DIR) $(1)/usr/sbin $(CP) $(PKG_BUILD_DIR)/src/pmacct $(1)/usr/sbin/ endef - -# $(1): build variant {basic,mysql,pgsql,sqlite} -# $(2): package name prefix {nfacctd,pmacctd,sfacctd,uacctd} -# $(3): package name suffix {,-mysql,-pgsql,-sqlite} -# $(4): additional title (with MySQL support, ...) -# $(5): additional dependencies (+libmysqlclient, ...) - -define BuildPackage/Template - - define Package/$(2)$(3) - $(call Package/$(2)/Default) - DEPENDS+= $(5) - TITLE+= $(4) - VARIANT:=$(1) - endef - - define Package/$(2)$(3)/conffiles - /etc/default/$(2) - /etc/$(2).conf - endef - - define Package/$(2)$(3)/install - $(INSTALL_DIR) $$(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/$(2) $$(1)/usr/sbin/ - $(INSTALL_DIR) $$(1)/etc - $(INSTALL_DATA) ./files/$(2).conf $$(1)/etc/ - $(INSTALL_DIR) $$(1)/etc/default - $(INSTALL_DATA) ./files/$(2).default $$(1)/etc/default/$(2) - $(INSTALL_DIR) $$(1)/etc/init.d - $(INSTALL_BIN) ./files/$(2).init $$(1)/etc/init.d/$(2) - endef - - $$(eval $$(call BuildPackage,$(2)$(3))) - -endef - +$(eval $(call BuildPackage,nfacctd)) +$(eval $(call BuildPackage,nfacctd-mysql)) +$(eval $(call BuildPackage,nfacctd-pgsql)) +$(eval $(call BuildPackage,nfacctd-sqlite)) +$(eval $(call BuildPackage,pmacctd)) +$(eval $(call BuildPackage,pmacctd-mysql)) +$(eval $(call BuildPackage,pmacctd-pgsql)) +$(eval $(call BuildPackage,pmacctd-sqlite)) $(eval $(call BuildPackage,pmacct-client)) +$(eval $(call BuildPackage,uacctd)) +$(eval $(call BuildPackage,uacctd-mysql)) +$(eval $(call BuildPackage,uacctd-pgsql)) +$(eval $(call BuildPackage,uacctd-sqlite)) -$(eval $(call BuildPackage/Template,basic,nfacctd,,,)) -$(eval $(call BuildPackage/Template,basic,pmacctd,,,)) -$(eval $(call BuildPackage/Template,basic,sfacctd,,,)) -$(eval $(call BuildPackage/Template,basic,uacctd,,,)) - -$(eval $(call BuildPackage/Template,mysql,nfacctd,-mysql,with MySQL support,+libmysqlclient)) -$(eval $(call BuildPackage/Template,mysql,pmacctd,-mysql,with MySQL support,+libmysqlclient)) -$(eval $(call BuildPackage/Template,mysql,sfacctd,-mysql,with MySQL support,+libmysqlclient)) -$(eval $(call BuildPackage/Template,mysql,uacctd,-mysql,with MySQL support,+libmysqlclient)) - -$(eval $(call BuildPackage/Template,pgsql,nfacctd,-pgsql,with PostgreSQL support,+libpq)) -$(eval $(call BuildPackage/Template,pgsql,pmacctd,-pgsql,with PostgreSQL support,+libpq)) -$(eval $(call BuildPackage/Template,pgsql,sfacctd,-pgsql,with PostgreSQL support,+libpq)) -$(eval $(call BuildPackage/Template,pgsql,uacctd,-pgsql,with PostgreSQL support,+libpq)) - -$(eval $(call BuildPackage/Template,sqlite,nfacctd,-sqlite,with SQLite support,+libsqlite3)) -$(eval $(call BuildPackage/Template,sqlite,pmacctd,-sqlite,with SQLite support,+libsqlite3)) -$(eval $(call BuildPackage/Template,sqlite,sfacctd,-sqlite,with SQLite support,+libsqlite3)) -$(eval $(call BuildPackage/Template,sqlite,uacctd,-sqlite,with SQLite support,+libsqlite3)) diff --git a/admin/pmacct/files/nfacctd.init b/admin/pmacct/files/nfacctd.init index 66b9021919..e1113571c2 100644 --- a/admin/pmacct/files/nfacctd.init +++ b/admin/pmacct/files/nfacctd.init @@ -1,19 +1,18 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -SERVICE_USE_PID=1 - -PROG="nfacctd" -DEFAULT="/etc/default/$PROG" -COMMAND="/usr/sbin/$PROG" +BIN=nfacctd +DEFAULT=/etc/default/$BIN +RUN_D=/var/run +PID_F=$RUN_D/$BIN.pid start() { [ -f $DEFAULT ] && . $DEFAULT - service_start $COMMAND $OPTIONS + mkdir -p $RUN_D + $BIN $OPTIONS } stop() { - service_stop $COMMAND + [ -f $PID_F ] && kill -INT $(cat $PID_F) } diff --git a/admin/pmacct/files/pmacctd.init b/admin/pmacct/files/pmacctd.init index 3d75bcfa93..a57c5817bf 100644 --- a/admin/pmacct/files/pmacctd.init +++ b/admin/pmacct/files/pmacctd.init @@ -1,19 +1,18 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -SERVICE_USE_PID=1 - -PROG="pmacctd" -DEFAULT="/etc/default/$PROG" -COMMAND="/usr/sbin/$PROG" +BIN=pmacctd +DEFAULT=/etc/default/$BIN +RUN_D=/var/run +PID_F=$RUN_D/$BIN.pid start() { [ -f $DEFAULT ] && . $DEFAULT - service_start $COMMAND $OPTIONS + mkdir -p $RUN_D + $BIN $OPTIONS } stop() { - service_stop $COMMAND + [ -f $PID_F ] && kill -INT $(cat $PID_F) } diff --git a/admin/pmacct/files/sfacctd.conf b/admin/pmacct/files/sfacctd.conf deleted file mode 100644 index 3d25e54959..0000000000 --- a/admin/pmacct/files/sfacctd.conf +++ /dev/null @@ -1,27 +0,0 @@ -! -! sfacctd configuration example -! -! debug: true -daemonize: true -pidfile: /var/run/sfacctd.pid -! aggregate_filter[dummy]: src net 192.168.0.0/16 -aggregate: src_host, dst_host -! plugin_buffer_size: 1024 -! sfacctd_port: 5678 -plugins: memory -imt_buckets: 65537 -imt_mem_pools_size: 65536 -! imt_mem_pools_number: 0 -! plugins: mysql -! plugins: pgsql -! plugins: sqlite3 -! sql_db: pmacct -! sql_table: acct -! sql_table_version: 2 -! sql_passwd: arealsmartpwd -! sql_user: pmacct -! sql_refresh_time: 90 -! sql_optimize_clauses: true -! sql_history: 10m -! sql_history_roundoff: mh -! networks_file: ./networks.example diff --git a/admin/pmacct/files/sfacctd.default b/admin/pmacct/files/sfacctd.default deleted file mode 100644 index abd0c34bca..0000000000 --- a/admin/pmacct/files/sfacctd.default +++ /dev/null @@ -1 +0,0 @@ -OPTIONS="-f /etc/sfacctd.conf" diff --git a/admin/pmacct/files/sfacctd.init b/admin/pmacct/files/sfacctd.init deleted file mode 100644 index 16468d478f..0000000000 --- a/admin/pmacct/files/sfacctd.init +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - -START=50 - -SERVICE_USE_PID=1 - -PROG="sfacctd" -DEFAULT="/etc/default/$PROG" -COMMAND="/usr/sbin/$PROG" - -start() { - [ -f $DEFAULT ] && . $DEFAULT - service_start $COMMAND $OPTIONS -} - -stop() { - service_stop $COMMAND -} diff --git a/admin/pmacct/files/uacctd.init b/admin/pmacct/files/uacctd.init index 39b27baf36..a4239ad34c 100644 --- a/admin/pmacct/files/uacctd.init +++ b/admin/pmacct/files/uacctd.init @@ -1,19 +1,18 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -SERVICE_USE_PID=1 - -PROG="uacctd" -DEFAULT="/etc/default/$PROG" -COMMAND="/usr/sbin/$PROG" +BIN=uacctd +DEFAULT=/etc/default/$BIN +RUN_D=/var/run +PID_F=$RUN_D/$BIN.pid start() { [ -f $DEFAULT ] && . $DEFAULT - service_start $COMMAND $OPTIONS + mkdir -p $RUN_D + $BIN $OPTIONS } stop() { - service_stop $COMMAND + [ -f $PID_F ] && kill -INT $(cat $PID_F) } diff --git a/admin/syslog-ng/Makefile b/admin/syslog-ng/Makefile index 2ba6d4bc2d..6db882a0c3 100644 --- a/admin/syslog-ng/Makefile +++ b/admin/syslog-ng/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syslog-ng PKG_VERSION:=1.6.12 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_MD5SUM:=a3cbfdb6e1e5beea181a7349749719f3 PKG_SOURCE_URL:= \ diff --git a/admin/syslog-ng/files/syslog-ng.init b/admin/syslog-ng/files/syslog-ng.init index a8bad3d989..06672e87d8 100644 --- a/admin/syslog-ng/files/syslog-ng.init +++ b/admin/syslog-ng/files/syslog-ng.init @@ -1,19 +1,27 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -SERVICE_USE_PID=1 - start() { - [ -f /etc/syslog-ng.conf ] || return 1 - service_start /usr/sbin/syslog-ng + [ -f /etc/syslog-ng/syslog-ng.conf ] || { + echo "/etc/syslog-ng/syslog-ng.conf does not exist !"; + exit 0; + }; + [ -d /var/run ] || mkdir -p /var/run + [ -x /usr/sbin/syslog-ng ] && /usr/sbin/syslog-ng } stop() { - service_stop /usr/sbin/syslog-ng + killall syslog-ng +} + +restart() { + stop + sleep 1 + start } reload() { - service_reload /usr/sbin/syslog-ng + kill -HUP `cat /var/run/syslog-ng.pid` &>/dev/null } + diff --git a/admin/syslog-ng3/Makefile b/admin/syslog-ng3/Makefile index 0a85fac988..3372377e53 100644 --- a/admin/syslog-ng3/Makefile +++ b/admin/syslog-ng3/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=syslog-ng PKG_VERSION:=3.0.5 -PKG_RELEASE:=5 +PKG_RELEASE:=3 PKG_SOURCE_URL:=http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$(PKG_VERSION)/source/ PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/nls.mk define Package/syslog-ng3 SECTION:=admin CATEGORY:=Administration - DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap +libpthread +librt +zlib + DEPENDS:=+libpcre +glib2 +libeventlog +libopenssl +libwrap +libpthread +zlib TITLE:=A powerful syslog daemon URL:=http://www.balabit.com/network-security/syslog-ng/opensource-logging-system/ endef diff --git a/admin/syslog-ng3/files/syslog-ng.init b/admin/syslog-ng3/files/syslog-ng.init index a8bad3d989..4609f6fab9 100644 --- a/admin/syslog-ng3/files/syslog-ng.init +++ b/admin/syslog-ng3/files/syslog-ng.init @@ -1,19 +1,27 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -SERVICE_USE_PID=1 - start() { - [ -f /etc/syslog-ng.conf ] || return 1 - service_start /usr/sbin/syslog-ng + [ -f /etc/syslog-ng.conf ] || { + echo "/etc/syslog-ng.conf does not exist !"; + exit 0; + }; + [ -d /var/run ] || mkdir -p /var/run + [ -x /usr/sbin/syslog-ng ] && /usr/sbin/syslog-ng } stop() { - service_stop /usr/sbin/syslog-ng + killall syslog-ng +} + +restart() { + stop + sleep 1 + start } reload() { - service_reload /usr/sbin/syslog-ng + kill -HUP `cat /var/run/syslog-ng.pid` &>/dev/null } + diff --git a/admin/zabbix/Makefile b/admin/zabbix/Makefile index 028ded1069..7fd99a5d2f 100644 --- a/admin/zabbix/Makefile +++ b/admin/zabbix/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=zabbix PKG_VERSION:=1.6 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/zabbix @@ -75,6 +75,44 @@ define Package/zabbix-agent/install $(INSTALL_BIN) ./files/zabbix_agentd.init $(1)/etc/init.d/zabbix_agentd endef +define Package/zabbix-agent/postinst +#!/bin/sh + +name=zabbix +id=53 + +# do not change below +# check if we are on real system +if [ -z "$${IPKG_INSTROOT}" ]; then + # create copies of passwd and group, if we use squashfs + rootfs=`mount |awk '/root/ { print $$5 }'` + if [ "$$rootfs" = "squashfs" ]; then + if [ -h /etc/group ]; then + rm /etc/group + cp /rom/etc/group /etc/group + fi + if [ -h /etc/passwd ]; then + rm /etc/passwd + cp /rom/etc/passwd /etc/passwd + fi + fi + + echo "" + if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then + echo "adding group $$name to /etc/group" + echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group + fi + + if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then + echo "adding user $$name to /etc/passwd" + echo "$${name}:x:$${id}:$${id}:$${name}:/tmp/.$${name}:/bin/false" >> $${IPKG_INSTROOT}/etc/passwd + fi + + chown $${name} $${IPKG_INSTROOT}/etc/zabbix/zabbix_agentd.conf +fi + +endef + define Package/zabbix-sender/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/zabbix_sender $(1)/usr/sbin/ diff --git a/admin/zabbix/files/zabbix_agentd.conf b/admin/zabbix/files/zabbix_agentd.conf index 4cc2f518e7..2787ccab8a 100644 --- a/admin/zabbix/files/zabbix_agentd.conf +++ b/admin/zabbix/files/zabbix_agentd.conf @@ -57,12 +57,12 @@ DebugLevel=3 # Name of PID file -PidFile=/var/run/zabbix/zabbix_agentd.pid +PidFile=/tmp/zabbix_agentd.pid # Name of log file. # If not set, syslog will be used -LogFile=/var/log/zabbix/zabbix_agentd.log +LogFile=/tmp/zabbix_agentd.log # Spend no more than Timeout seconds on processing # Must be between 1 and 30 diff --git a/admin/zabbix/files/zabbix_agentd.init b/admin/zabbix/files/zabbix_agentd.init index 3c70009d1a..a132a841a7 100644 --- a/admin/zabbix/files/zabbix_agentd.init +++ b/admin/zabbix/files/zabbix_agentd.init @@ -1,25 +1,21 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2008-2011 OpenWrt.org - +# Copyright (C) 2008 OpenWrt.org START=60 -SERVICE_PID_FILE=/var/run/zabbix/zabbix_agentd.pid - start() { - [ -f /etc/zabbix/zabbix_agentd.conf ] || return 1 - user_exists zabbix 53 || user_add zabbix 53 - group_exists zabbix 53 || group_add zabbix 53 - [ -d /var/log/zabbix ] || { - mkdir -m0755 -p /var/log/zabbix - chown zabbix:zabbix /var/log/zabbix - } - [ -d /var/run/zabbix ] || { - mkdir -m0755 -p /var/run/zabbix - chown zabbix:zabbix /var/run/zabbix - } - service_start /usr/sbin/zabbix_agentd + [ -f /etc/zabbix/zabbix_agentd.conf ] || { + echo "/etc/zabbix/zabbix_agentd.conf does not exist !"; + exit 0; + }; + [ -x /usr/sbin/zabbix_agentd ] && /usr/sbin/zabbix_agentd } stop() { - service_stop /usr/sbin/zabbix_agentd + killall zabbix_agentd +} + +restart() { + stop + sleep 1 + start } diff --git a/devel/binutils/Makefile b/devel/binutils/Makefile index 50580e458d..5925fdd520 100644 --- a/devel/binutils/Makefile +++ b/devel/binutils/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=binutils PKG_VERSION:=$(strip $(subst ",, $(CONFIG_BINUTILS_VERSION))) #")) -PKG_RELEASE:=5 +PKG_RELEASE:=3 PKG_SOURCE_URL:=@GNU/binutils PKG_SOURCE:=binutils-$(PKG_VERSION).tar.bz2 @@ -47,6 +47,7 @@ CONFIGURE_ARGS = \ --target=$(REAL_GNU_TARGET_NAME) \ --host=$(REAL_GNU_TARGET_NAME) \ --build=$(GNU_HOST_NAME) \ + --with-sysroot=$(PKG_INSTALL_DIR) \ --prefix=/usr \ --disable-multilib \ --disable-werror \ @@ -71,7 +72,7 @@ define Build/Configure configure-libiberty \ configure-opcodes \ ) - $(MAKE) CFLAGS="$(TARGET_CFLAGS)" -C $(PKG_BUILD_DIR)/bfd/po Makefile + $(MAKE) CFLAGS="$(TARGET_CFLAGS)"-C $(PKG_BUILD_DIR)/bfd/po Makefile endef define Build/InstallDev @@ -101,9 +102,8 @@ define Package/objdump/install endef define Package/binutils/install - $(INSTALL_DIR) $(1)/usr $(1)/bin + $(INSTALL_DIR) $(1)/usr $(CP) $(PKG_INSTALL_DIR)/usr/bin/ $(1)/usr/ - mv $(1)/usr/bin/strings $(1)/bin/strings rm -f $(1)/usr/bin/objdump endef diff --git a/devel/boost-jam/Makefile b/devel/boost-jam/Makefile new file mode 100644 index 0000000000..13725088d2 --- /dev/null +++ b/devel/boost-jam/Makefile @@ -0,0 +1,41 @@ +# +# Copyright (C) 2006 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=boost-jam +PKG_VERSION:=3.1.17 +PKG_RELEASE:=1 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz +PKG_SOURCE_URL:=@SF/boost +PKG_MD5SUM:=f4afd896788f2327fd35c128ddc6e340 +PKG_HOST_ONLY:=1 + +include $(INCLUDE_DIR)/host-build.mk +include $(INCLUDE_DIR)/package.mk + +define Package/boost-jam + SECTION:=devel + CATEGORY:=Development + TITLE:=Boost JAM + BUILDONLY:=1 + URL:=http://www.boost.org +endef + +define Host/Compile + # bjam does not provide a configure-script nor a Makefile + ( cd $(HOST_BUILD_DIR) ; ./build.sh gcc ) +endef + +define Host/Install + $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin + $(CP) $(HOST_BUILD_DIR)/bin.*/bjam $(STAGING_DIR_HOST)/bin/ +endef + +$(eval $(call HostBuild)) +$(eval $(call BuildPackage,boost-jam)) diff --git a/devel/ksymoops/Makefile b/devel/ksymoops/Makefile index b883bed34c..446fbc27fd 100644 --- a/devel/ksymoops/Makefile +++ b/devel/ksymoops/Makefile @@ -23,7 +23,7 @@ include $(INCLUDE_DIR)/package.mk define Package/ksymoops SECTION:=utils CATEGORY:=Utilities - DEPENDS:=@mips||mipsel||m68k||i386 + DEPENDS:=@!LINUX_2_4 @mips||mipsel||m68k||i386 TITLE:=Interpret oops of the kernel URL:=http://www.kernel.org/pub/linux/utils/kernel/ksymoops/v2.4/ MENU:=1 diff --git a/devel/perf/Makefile b/devel/perf/Makefile deleted file mode 100644 index d14629cf69..0000000000 --- a/devel/perf/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk -include $(INCLUDE_DIR)/kernel.mk - -PKG_NAME:=perf -PKG_RELEASE:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/perf - SECTION:=devel - CATEGORY:=Development - DEPENDS:= +libdw +libelf1 +libpthread +librt @BROKEN - TITLE:=Linux performance monitoring tool - VERSION:=$(LINUX_VERSION)-$(PKG_RELEASE) - URL:=http://www.kernel.org -endef - -define Package/perf/description - perf is the Linux performance monitoring tool -endef - -define Build/Prepare -endef - -define Build/Compile - $(MAKE) -C $(LINUX_DIR)/tools/perf \ - ARCH="$(LINUX_KARCH)" \ - NO_LIBPERL=1 \ - NO_LIBPYTHON=1 \ - NO_NEWT=1 \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - CC="$(TARGET_CC)" \ - LD="$(TARGET_CROSS)ld" \ - CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - V=1 \ - prefix=/usr -endef - -define Package/perf/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(LINUX_DIR)/tools/perf/perf $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,perf)) diff --git a/ipv6/6tunnel/Makefile b/ipv6/6tunnel/Makefile index f864cd9050..3ab60d6037 100644 --- a/ipv6/6tunnel/Makefile +++ b/ipv6/6tunnel/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2012 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=6tunnel PKG_VERSION:=0.11rc2 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_MD5SUM:=74e02d4f0704b3083a01feda66033449 PKG_SOURCE_URL:=http://toxygen.net/6tunnel/ diff --git a/ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch b/ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch deleted file mode 100644 index e84da61b6a..0000000000 --- a/ipv6/6tunnel/patches/100-arm-fix-optc-initialization.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/6tunnel.c -+++ b/6tunnel.c -@@ -508,7 +508,7 @@ int main(int argc, char **argv) - { - int force = 0, lsock, csock, one = 0, jeden = 1, local_port; - int detach = 1, listen6 = 0, sa_len, conn_limit = 0; -- char optc, *username = NULL, *bind_host = NULL; -+ char optc = -1, *username = NULL, *bind_host = NULL; - struct sockaddr *sa; - struct sockaddr_in laddr, caddr; - struct sockaddr_in6 laddr6; diff --git a/ipv6/ahcpd/Makefile b/ipv6/ahcpd/Makefile index 4d41bdf1fa..b417c60147 100644 --- a/ipv6/ahcpd/Makefile +++ b/ipv6/ahcpd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ahcpd -PKG_VERSION:=0.53 -PKG_RELEASE:=1 +PKG_VERSION:=0.51 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ -PKG_MD5SUM:=a1a610bf20965aa522cd766bf3d5829a +PKG_MD5SUM:=86b70d278dfb5a1e33cd1a1ceae9e715 include $(INCLUDE_DIR)/package.mk diff --git a/ipv6/ahcpd/files/ahcp.sh b/ipv6/ahcpd/files/ahcp.sh index 11788e29fa..805013c4c2 100644 --- a/ipv6/ahcpd/files/ahcp.sh +++ b/ipv6/ahcpd/files/ahcp.sh @@ -1,14 +1,91 @@ +append_bool() { + local section="$1" + local option="$2" + local value="$3" + local _loctmp + config_get_bool _loctmp "$section" "$option" 0 + [ "$_loctmp" -gt 0 ] && append args "$value" +} + +append_parm() { + local section="$1" + local option="$2" + local switch="$3" + local _loctmp + config_get _loctmp "$section" "$option" + [ -z "$_loctmp" ] && return 0 + append args "$switch $_loctmp" +} + +append_stmt() { + local name="$1" + local switch="$2" + append args "-C '$switch $name'" +} + +append_opt_stmt() { + local section="$1" + local option="$2" + local switch="$3" + local _loctmp + config_get _loctmp "$section" "$option" + [ -z "$_loctmp" ] && return 0 + append args "-C '$switch $_loctmp'" +} + +ahcp_addif() { + local ifname=$(uci_get_state network "$1" ifname "$1") + append interfaces "$ifname" +} + +ahcp_server() { + local cfg="$1" + + append_opt_stmt "$cfg" 'mode' 'mode' + append_opt_stmt "$cfg" 'lease_dir' 'lease-dir' + config_list_foreach "$cfg" 'prefix' append_stmt 'prefix' + config_list_foreach "$cfg" 'name_server' append_stmt 'name-server' + config_list_foreach "$cfg" 'ntp_server' append_stmt 'ntp-server' + + append_parm "$cfg" 'id_file' '-i' + append_parm "$cfg" 'log_file' '-L' +} + +ahcp_config() { + local cfg="$1" + + config_list_foreach "$cfg" 'interface' ahcp_addif + + append_bool "$cfg" 'ipv4_only' '-4' + append_bool "$cfg" 'ipv6_only' '-6' + append_bool "$cfg" 'no_dns' '-N' + + append_parm "$cfg" 'multicast_address' '-m' + append_parm "$cfg" 'port' '-p' + append_parm "$cfg" 'lease_time' '-t' + append_parm "$cfg" 'debug' '-d' + append_parm "$cfg" 'conf_file' '-c' + append_parm "$cfg" 'script' '-s' +} + setup_interface_ahcp() { local interface="$1" local config="$2" + local pid_file="/var/run/ahcpd-$interface.pid" + local id_file="/var/lib/ahcp-unique-id-$interface" + local log_file="/var/log/ahcpd-$interface.log" + unset args - setup_interface_none "$interface" "$config" + mkdir -p /var/lib + + ahcp_config "$config" + eval "/usr/sbin/ahcpd -D -I $pid_file -i $id_file -L $log_file $args $interface" +} - local mode=$(uci_get_state ahcpd "@ahcpd[0]" mode "client") - if [ "$mode" != "client" ]; then - echo "Warning: ahcp ignored for $interface (mode is $mode, should be client)." - echo "Fix ahcp mode in /etc/config/ahcpd." - else - /etc/init.d/ahcpd restart - fi +stop_interface_ahcp() { + local cfg="$1" + local interface + config_get interface "$cfg" device + local pid_file="/var/run/ahcpd-$interface.pid" + [ -f "$pid_file" ] && kill $(cat "$pid_file") } diff --git a/ipv6/ahcpd/files/ahcpd.config b/ipv6/ahcpd/files/ahcpd.config index 0996251cb2..b2187f2836 100644 --- a/ipv6/ahcpd/files/ahcpd.config +++ b/ipv6/ahcpd/files/ahcpd.config @@ -1,8 +1,11 @@ package ahcpd +# This configuration file is used to set up ahcpd in server or forwarder +# mode. To use ahcpd in client mode, use 'proto' 'ahcp' in +# /etc/config/network (see example below). + config ahcpd - # Choose ahcp mode: client (default), server or forwarder - ## option 'mode' 'client' + option 'mode' 'server' # or 'forwarder' but NOT 'client' # Uncomment the following lines to enable ahcpd on the desired # interfaces. ## list 'interface' 'lan' @@ -30,3 +33,18 @@ config ahcpd # option 'lease_time' '3666' # option 'debug' '1' +# Sample client mode configuration +# THIS MUST BE COPIED IN /etc/config/network. Ahcpd will ignore it +# otherwise. +## config 'interface' 'wlan' +## option 'ifname' 'ath0' +## option 'proto' 'ahcp' +## # The following lines are optional +## option 'multicast_address' 'ff02::cca6:c0f9:e182:5359' +## option 'port' '5359' +## option 'ipv4_only' 'false' +## option 'ipv6_only' 'false' +## option 'no_dns' 'false' +## option 'lease_time' '3666' +## option 'debug' '1' +## option 'script' '/etc/ahcp/ahcp-config.sh' diff --git a/ipv6/ahcpd/files/ahcpd.init b/ipv6/ahcpd/files/ahcpd.init index 6654b00626..38b520891d 100644 --- a/ipv6/ahcpd/files/ahcpd.init +++ b/ipv6/ahcpd/files/ahcpd.init @@ -1,93 +1,11 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2007-2011 OpenWrt.org START=71 - -SERVICE_USE_PID=1 - +PID_F="/var/run/ahcpd.pid" EXTRA_COMMANDS="status" EXTRA_HELP=" status Print ahcpd's status to the log file." -append_bool() { - local section="$1" - local option="$2" - local value="$3" - local _loctmp - config_get_bool _loctmp "$section" "$option" 0 - [ "$_loctmp" -gt 0 ] && append args "$value" -} - -append_parm() { - local section="$1" - local option="$2" - local switch="$3" - local _loctmp - config_get _loctmp "$section" "$option" - [ -z "$_loctmp" ] && return 0 - append args "$switch $_loctmp" -} - -append_stmt() { - local name="$1" - local switch="$2" - append args "-C '$switch $name'" -} - -append_opt_stmt() { - local section="$1" - local option="$2" - local switch="$3" - local _loctmp - config_get _loctmp "$section" "$option" - [ -z "$_loctmp" ] && return 0 - append args "-C '$switch $_loctmp'" -} - -ahcp_addif() { - local ifname=$(uci_get_state network "$1" ifname "$1") - append interfaces "$ifname" -} - -ahcp_server() { - local cfg="$1" - - append_opt_stmt "$cfg" 'mode' 'mode' - append_opt_stmt "$cfg" 'lease_dir' 'lease-dir' - config_list_foreach "$cfg" 'prefix' append_stmt 'prefix' - config_list_foreach "$cfg" 'name_server' append_stmt 'name-server' - config_list_foreach "$cfg" 'ntp_server' append_stmt 'ntp-server' - - append_parm "$cfg" 'id_file' '-i' - append_parm "$cfg" 'log_file' '-L' -} - -ahcp_config() { - local cfg="$1" - local interface - local _loctmp - - config_list_foreach "$cfg" 'interface' ahcp_addif - - # Add interfaces with "option proto ahcp" in /etc/config/network - # (only for client mode) - config_get _loctmp "$cfg" "mode" - if [ -z "$_loctmp" -o "$_loctmp" = "client" ]; then - for interface in $(uci -P /var/state show network|grep proto=ahcp|cut -d. -f2); do - ahcp_addif $interface - done - fi - - append_bool "$cfg" 'ipv4_only' '-4' - append_bool "$cfg" 'ipv6_only' '-6' - append_bool "$cfg" 'no_dns' '-N' - - append_parm "$cfg" 'multicast_address' '-m' - append_parm "$cfg" 'port' '-p' - append_parm "$cfg" 'lease_time' '-t' - append_parm "$cfg" 'debug' '-d' - append_parm "$cfg" 'conf_file' '-c' - append_parm "$cfg" 'script' '-s' -} +. /lib/network/ahcp.sh start() { mkdir -p /var/lib @@ -97,13 +15,13 @@ start() { config_foreach ahcp_config ahcpd config_foreach ahcp_server ahcpd [ -z "$interfaces" ] && return 0 - service_start /usr/sbin/ahcpd -D $args $interfaces + eval "/usr/sbin/ahcpd -D -I $PID_F $args $interfaces" } stop() { - service_stop /usr/sbin/ahcpd + [ -f "$PID_F" ] && kill $(cat "$PID_F") } status() { - SERVICE_SIG="USR1" service_signal /usr/sbin/ahcpd + [ -f $PID_F ] && kill -USR1 $(cat $PID_F) } diff --git a/ipv6/ahcpd/patches/001-autoconf-prefixes.patch b/ipv6/ahcpd/patches/001-autoconf-prefixes.patch new file mode 100644 index 0000000000..e29dcf142c --- /dev/null +++ b/ipv6/ahcpd/patches/001-autoconf-prefixes.patch @@ -0,0 +1,14 @@ +Tue Jul 20 00:25:27 CEST 2010 Juliusz Chroboczek + * Fix typo -- ignore autoconf prefixes for plen > 64. + Thanks to Gabriel Kerneis. +--- old-ahcpd/configure.c 2010-07-20 09:31:19.000000000 +0200 ++++ new-ahcpd/configure.c 2010-07-20 09:31:19.000000000 +0200 +@@ -505,7 +505,7 @@ + if(config->ipv6_address) { + config->our_ipv6_address = copy_prefix_list(config->ipv6_address); + } else if(config->ipv6_prefix && config->ipv6_prefix->n > 0 && +- config->ipv6_prefix->l[0].plen >= 64) { ++ config->ipv6_prefix->l[0].plen <= 64) { + unsigned char address[16]; + int have_address = 0; + diff --git a/ipv6/aiccu/Makefile b/ipv6/aiccu/Makefile index 6dca950c20..496fce4dcd 100644 --- a/ipv6/aiccu/Makefile +++ b/ipv6/aiccu/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aiccu PKG_VERSION:=20070115 -PKG_RELEASE:=9 +PKG_RELEASE:=6 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.sixxs.net/archive/sixxs/aiccu/unix @@ -47,9 +47,11 @@ define Package/aiccu/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/unix-console/$(PKG_NAME) $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/aiccu.config $(1)/etc/config/aiccu + $(INSTALL_CONF) ./files/aiccu.conf $(1)/etc/config/aiccu $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/aiccu.init $(1)/etc/init.d/aiccu + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_DATA) ./files/aiccu.hotplug $(1)/etc/hotplug.d/iface/30-aiccu endef $(eval $(call BuildPackage,aiccu)) diff --git a/ipv6/aiccu/files/aiccu.config b/ipv6/aiccu/files/aiccu.conf similarity index 100% rename from ipv6/aiccu/files/aiccu.config rename to ipv6/aiccu/files/aiccu.conf diff --git a/ipv6/aiccu/files/aiccu.hotplug b/ipv6/aiccu/files/aiccu.hotplug new file mode 100644 index 0000000000..b886976210 --- /dev/null +++ b/ipv6/aiccu/files/aiccu.hotplug @@ -0,0 +1,2 @@ +#!/bin/sh +[ "$ACTION" = "ifup" -a "$INTERFACE" = "wan" ] && /etc/init.d/aiccu enabled && /etc/init.d/aiccu start diff --git a/ipv6/aiccu/files/aiccu.init b/ipv6/aiccu/files/aiccu.init index fae1ae5544..68bac208f4 100644 --- a/ipv6/aiccu/files/aiccu.init +++ b/ipv6/aiccu/files/aiccu.init @@ -1,78 +1,52 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org START=51 -add_config_bool() { - local section="$1" - local option="$2" - local value="$3" - local default="$4" - local _val +config_cb() { + local cfg_type="$1" + local cfg_name="$2" - config_get_bool _val "$section" "$option" "$default" - [ "$_val" -gt 0 ] && _val="true" || _val="false" - append args "$3 $_val" "\n" -} - -add_config() { - local section="$1" - local option="$2" - local value="$3" - local _val - - config_get _val "$section" "$option" - [ -n "$_val" ] && append args "$3 $_val" "\n" -} - -start_instance() { - local cfg="$1" - CFGFILE="/var/etc/aiccu-${cfg}.conf" - PIDFILE="/var/run/aiccu-${cfg}.pid" - args="" - - add_config "$cfg" username username - add_config "$cfg" password password - add_config "$cfg" server server - add_config "$cfg" protocol protocol - add_config "$cfg" interface ipv6_interface - add_config "$cfg" tunnel_id tunnel_id - add_config_bool "$cfg" requiretls requiretls 0 - add_config_bool "$cfg" defaultroute defaultroute 1 - add_config_bool "$cfg" nat behindnat 1 - add_config_bool "$cfg" heartbeat makebeats 1 - append args "daemonize true" "\n" - append args "pidfile $PIDFILE" "\n" - - mkdir -p /var/run /var/etc - echo -e "$args" > "$CFGFILE" - - config_get_bool enabled "$cfg" enabled '1' - [ "$enabled" -gt 0 ] && aiccu start "$CFGFILE" & -} - -stop_instance() { - local cfg="$1" - aiccu stop "/var/etc/aiccu-${cfg}.conf" -} - -restart_instance() { - local cfg="$1" - config_get_bool restart "$cfg" restart 0 - [ "$restart" -eq 1 ] && stop_instance "$cfg" - start_instance "$cfg" + case "$cfg_type" in + aiccu) + append cfgs_sections "$cfg_name" "$N" + ;; + esac } start() { config_load aiccu - config_foreach start_instance aiccu + for cfgs_section in $cfgs_sections; do + config_get username $cfgs_section username + config_get password $cfgs_section password + config_get server $cfgs_section server + config_get protocol $cfgs_section protocol + config_get interface $cfgs_section interface + config_get tunnel_id $cfgs_section tunnel_id + config_get_bool requiretls $cfgs_section requiretls 0 + config_get_bool defaultroute $cfgs_section defaultroute 1 + config_get_bool nat $cfgs_section nat 1 + config_get_bool heartbeat $cfgs_section heartbeat 1 + mkdir -p /tmp/run + echo "username $username" > /tmp/run/aiccu-${cfgs_section}.conf + echo "password $password" >> /tmp/run/aiccu-${cfgs_section}.conf + [ -n "$server" ] && echo "server $server" >> /tmp/run/aiccu-${cfgs_section}.conf + [ -n "$protocol" ] && echo "protocol $protocol" >> /tmp/run/aiccu-${cfgs_section}.conf + [ -n "$interface" ] && echo "ipv6_interface $interface" >> /tmp/run/aiccu-${cfgs_section}.conf + [ -n "$tunnel_id" ] && echo "tunnel_id $tunnel_id" >> /tmp/run/aiccu-${cfgs_section}.conf + [ "$requiretls" = "1" ] && echo "requiretls true" >> /tmp/run/aiccu-${cfgs_section}.conf + [ "$defaultroute" != "1" ] && echo "defaultroute false" >> /tmp/run/aiccu-${cfgs_section}.conf + [ "$nat" = "1" ] && echo "behindnat true" >> /tmp/run/aiccu-${cfgs_section}.conf + [ "$heartbeat" != "1" ] && echo "makebeats false" >> /tmp/run/aiccu-${cfgs_section}.conf + echo 'daemonize true' >> /tmp/run/aiccu-${cfgs_section}.conf + echo "pidfile /var/run/aiccu-${cfgs_section}.pid" >> /tmp/run/aiccu-${cfgs_section}.conf + + aiccu start /tmp/run/aiccu-$cfgs_section.conf + done } stop() { config_load aiccu - config_foreach stop_instance aiccu -} - -restart() { - config_load aiccu - config_foreach restart_instance aiccu + for cfgs_section in $cfgs_sections; do + aiccu stop /tmp/run/aiccu-$cfgs_section.conf + done } diff --git a/ipv6/aiccu/patches/400-retry-on-time-or-network-failure.patch b/ipv6/aiccu/patches/400-retry-on-time-or-network-failure.patch deleted file mode 100644 index 5d9a6f22ad..0000000000 --- a/ipv6/aiccu/patches/400-retry-on-time-or-network-failure.patch +++ /dev/null @@ -1,111 +0,0 @@ ---- a/common/tic.c -+++ b/common/tic.c -@@ -60,7 +60,7 @@ int tic_checktime(time_t epochtime) - return 0; - } - --bool tic_Login(struct TIC_conf *tic, const char *username, const char *password, const char *server) -+bool tic_Login(struct TIC_conf *tic, const char *username, const char *password, const char *server, bool *fatal) - { - char buf[1024], sSignature[33], sChallenge[1024]; - int i; -@@ -74,6 +74,7 @@ bool tic_Login(struct TIC_conf *tic, con - #endif - - D(dolog(LOG_DEBUG, "Trying to connect to TIC server %s\n", server)); -+ *fatal = false; - - /* Connect to the TIC server */ - tic->sock = connect_client(server, TIC_PORT, AF_INET, SOCK_STREAM); -@@ -166,6 +167,7 @@ bool tic_Login(struct TIC_conf *tic, con - if (buf[0] != '2') - { - dolog(LOG_ERR, "Time not available? %s\n", &buf[4]); -+ *fatal = true; - return false; - } - -@@ -199,6 +201,7 @@ bool tic_Login(struct TIC_conf *tic, con - if (g_aiccu->requiretls) - { - dolog(LOG_ERR, "TIC Server does not support TLS and TLS is required\n"); -+ *fatal = true; - return false; - } - if (g_aiccu->verbose) dolog(LOG_WARNING, "TIC Server does not support TLS but TLS is not required, continuing\n"); -@@ -217,6 +220,7 @@ bool tic_Login(struct TIC_conf *tic, con - if (buf[0] != '2') - { - dolog(LOG_ERR, "Username not accepted: %s.\n", &buf[4]); -+ *fatal = true; - return false; - } - -@@ -231,6 +235,7 @@ bool tic_Login(struct TIC_conf *tic, con - if (buf[0] != '2') - { - dolog(LOG_ERR, "Challenge not correct: %s.\n", &buf[4]); -+ *fatal = true; - return false; - } - -@@ -252,6 +257,7 @@ bool tic_Login(struct TIC_conf *tic, con - { - tic_Logout(tic, NULL); - dolog(LOG_ERR, "Response not accepted: %s.\n", &buf[4]); -+ *fatal = true; - return false; - } - ---- a/unix-console/main.c -+++ b/unix-console/main.c -@@ -76,8 +76,9 @@ int list_tunnels(void); - int list_tunnels(void) - { - struct TIC_sTunnel *hsTunnel, *t; -+ bool is_fatal = false; - -- if (!tic_Login(g_aiccu->tic, g_aiccu->username, g_aiccu->password, g_aiccu->server)) return 0; -+ if (!tic_Login(g_aiccu->tic, g_aiccu->username, g_aiccu->password, g_aiccu->server, &is_fatal)) return 0; - - hsTunnel = tic_ListTunnels(g_aiccu->tic); - -@@ -153,9 +154,26 @@ struct TIC_Tunnel *get_tunnel(void) - - struct TIC_sTunnel *hsTunnel, *t; - struct TIC_Tunnel *hTunnel; -+ bool is_fatal = false; -+ int retry_intv = 10; - - /* Login to the TIC Server */ -- if (!tic_Login(g_aiccu->tic, g_aiccu->username, g_aiccu->password, g_aiccu->server)) return NULL; -+ while (!tic_Login(g_aiccu->tic, g_aiccu->username, g_aiccu->password, g_aiccu->server, &is_fatal)) -+ { -+ if (!is_fatal) -+ { -+ dolog(LOG_ERR, "Retrying TIC login in %d seconds...\n", retry_intv); -+ sleep(retry_intv); -+ -+ if (retry_intv < 120) -+ retry_intv += 10; -+ } -+ else -+ { -+ dolog(LOG_ERR, "Fatal error occured during login, aborting\n"); -+ return NULL; -+ } -+ } - - /* - * Don't try to list the tunnels when ---- a/common/tic.h -+++ b/common/tic.h -@@ -120,7 +120,7 @@ struct TIC_conf - **********************************************************/ - - /* Login to/Logout from the TIC Server */ --bool tic_Login(struct TIC_conf *tic, const char *username, const char *password, const char *server); -+bool tic_Login(struct TIC_conf *tic, const char *username, const char *password, const char *server, bool *fatal); - void tic_Logout(struct TIC_conf *tic, const char *quitmsg); - - /* Check if the time is in range */ diff --git a/ipv6/dibbler/Makefile b/ipv6/dibbler/Makefile index 7241bfb6c8..6a2a4431ce 100644 --- a/ipv6/dibbler/Makefile +++ b/ipv6/dibbler/Makefile @@ -24,7 +24,7 @@ include $(INCLUDE_DIR)/package.mk define Package/dibbler/Default SECTION:=ipv6 CATEGORY:=IPv6 - DEPENDS:=+libstdcpp +libpthread + DEPENDS:=+libstdcpp @!LINUX_2_4 +libpthread TITLE:=Dibbler, a portable DHCPv6 implementation URL:=http://klub.com.pl/dhcpv6/ endef diff --git a/ipv6/gw6c/Makefile b/ipv6/gw6c/Makefile index 57beb3232a..cce8e61502 100644 --- a/ipv6/gw6c/Makefile +++ b/ipv6/gw6c/Makefile @@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gw6c PKG_VERSION:=5.1 -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://openwrt.linux-appliance.net/sources @@ -72,8 +72,4 @@ define Package/gw6c/install $(INSTALL_CONF) ./files/gw6c.config $(1)/etc/config/gw6c endef -define Package/gw6c/conffiles -/etc/config/gw6c -endef - $(eval $(call BuildPackage,gw6c)) diff --git a/ipv6/gw6c/files/gw6c.init b/ipv6/gw6c/files/gw6c.init index f311324ec2..abc5d7290e 100755 --- a/ipv6/gw6c/files/gw6c.init +++ b/ipv6/gw6c/files/gw6c.init @@ -1,67 +1,62 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2007-2011 OpenWrt.org -# Copyright (C) 2007 RoadRunner.cx - +#Copyright (C) 2007 RoadRunner.cx START=52 -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 - genconf() { - [ -f /etc/config/gw6c ] || { - echo "You are missing configuration file /etc/config/gw6c" - return 1 - } - - config_load "gw6c" - - config_get DISABLED basic disabled - - [ "$DISABLED" == "1" ] && { - echo "You haven't edited your configuration file. Gateway6 is disabled." - return 1 - } - - config_get USERID basic userid - config_get PASSWORD basic passwd - config_get SERVER basic server - config_get AUTH_METHOD basic auth_method - - config_get HOST_TYPE routing host_type - config_get PREFIX_LEN routing prefixlen - config_get IF_PREFIX routing ifprefix - config_get DNS_SERVER routing dns_server - - config_get GW6C_CONF advanced gw6c_conf - config_get GW6C_DIR advanced gw6c_dir - config_get AUTO_RETRY advanced auto_retry - config_get RETRY_DELAY advanced retry_delay - config_get KEEPALIVE advanced keepalive - config_get KEEPALIVE_INTERVAL advanced interval - config_get TUNNEL_MODE advanced if_tunnel_mode - config_get IF_V6V4 advanced if_v6v4 - config_get IF_V6UDPV4 advanced if_v6udpv4 - config_get IF_V4V6 advanced if_v4v6 - config_get CLIENT_V4 advanced client_v4 - config_get CLIENT_V6 advanced client_v6 - config_get TEMPLATE advanced template - config_get PROXY_CLIENT advanced proxy_client - - config_get BROKER_LIST broker broker_list - config_get LAST_SERVER broker last_server - config_get ALWAYS_SAMESERV broker always_same_serv - - config_get LOG_CONSOLE logging log_console - config_get LOG_STDERR logging log_stderr - config_get LOG_FILE logging log_file - config_get LOG_SYSLOG logging log_syslog - config_get LOG_FILENAME logging log_filename - config_get LOG_ROTATE logging log_rotation - config_get LOG_MAXSIZE logging log_maxsize - config_get SYSLOG_FACILITY logging syslog_facility + [ -f /etc/config/gw6c ] || { + echo "You are missing configuration file /etc/config/gw6c" + return 0 + } - cat >$GW6C_CONF <$GW6C_CONF < /proc/sys/net/ipv6/conf/all/forwarding - } + [ `ps ax|grep -v grep|grep -c gw6c` != "0" ] && { + killall -q gw6c + [ `ps ax|grep -v grep|grep -c radvd` != "0" ] && killall -q radvd + echo 0 > /proc/sys/net/ipv6/conf/all/forwarding + } } diff --git a/ipv6/ipv6calc/Makefile b/ipv6/ipv6calc/Makefile index f1170135cc..2ccd66c72d 100644 --- a/ipv6/ipv6calc/Makefile +++ b/ipv6/ipv6calc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2012 OpenWrt.org +# Copyright (C) 2008-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ipv6calc -PKG_VERSION:=0.92.0 +PKG_VERSION:=0.90.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.bieringer.de/pub/linux/IPv6/ipv6calc -PKG_MD5SUM:=0517e88f7b70d7b1f5c501ebc59e0c1c +PKG_MD5SUM:=c1a654214058fdac5f8c2ba6a196e2b8 PKG_INSTALL:=1 diff --git a/ipv6/miredo/Makefile b/ipv6/miredo/Makefile index fe09448bc2..6fa08cc139 100644 --- a/ipv6/miredo/Makefile +++ b/ipv6/miredo/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miredo -PKG_VERSION:=1.2.4 -PKG_RELEASE:=2 +PKG_VERSION:=1.2.3 +PKG_RELEASE:=1 -PKG_SOURCE_URL:=http://www.remlab.net/files/miredo +PKG_SOURCE_URL:=http://www.remlab.net/files/miredo/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=1281e7e75bddbde244cd778d99fa22d4 +PKG_MD5SUM:=6ba484ad5e331514a8a3452da2b144e7 PKG_FIXUP:=libtool PKG_INSTALL:=1 @@ -30,7 +30,7 @@ endef define Package/miredo-common $(call Package/miredo/Default) TITLE:=Teredo (IPv6 tunneling over UDP through NAT) shared libraries - DEPENDS+= +ip +libpthread +librt +uclibcxx +kmod-ipv6 +kmod-tun + DEPENDS+= +libpthread +uclibcxx +kmod-ipv6 +kmod-tun endef define Package/miredo-server diff --git a/ipv6/miredo/files/miredo-server.init b/ipv6/miredo/files/miredo-server.init index e82820feb0..d18dc19ee1 100644 --- a/ipv6/miredo/files/miredo-server.init +++ b/ipv6/miredo/files/miredo-server.init @@ -1,14 +1,13 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -SERVICE_USE_PID=1 +PID_F=/var/run/miredo-server.pid start() { - service_start /usr/sbin/miredo-server + miredo-server } stop() { - service_stop /usr/sbin/miredo-server + [ -f $PID_F ] && kill $(cat $PID_F) } diff --git a/ipv6/miredo/files/miredo.init b/ipv6/miredo/files/miredo.init index 0a83c96ba7..c44e80151b 100644 --- a/ipv6/miredo/files/miredo.init +++ b/ipv6/miredo/files/miredo.init @@ -1,15 +1,13 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -# XXX: miredo create a pid file but using it doesn't seem to work -#SERVICE_USE_PID=1 +PID_F=/var/run/miredo.pid start() { - service_start /usr/sbin/miredo + miredo } stop() { - service_stop /usr/sbin/miredo + [ -f $PID_F ] && kill $(cat $PID_F) } diff --git a/ipv6/mrd6/Makefile b/ipv6/mrd6/Makefile index dc99a2100b..d71ed345f3 100644 --- a/ipv6/mrd6/Makefile +++ b/ipv6/mrd6/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mrd6 PKG_VERSION:=0.9.6 -PKG_RELEASE:=4 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.de.debian.org/debian/pool/main/m/mrd6/ @@ -25,7 +25,7 @@ define Package/mrd6 CATEGORY:=IPv6 TITLE:=IPv6 multicast routing daemon URL:=http://fivebits.net/proj/mrd6 - DEPENDS:=+kmod-ipv6 +libstdcpp + DEPENDS:=+libstdcpp endef define Package/mrd6/description diff --git a/ipv6/mrd6/files/mrd6.init b/ipv6/mrd6/files/mrd6.init index 24818407f4..70b88fb8e0 100644 --- a/ipv6/mrd6/files/mrd6.init +++ b/ipv6/mrd6/files/mrd6.init @@ -1,13 +1,22 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 start() { - service_start /usr/sbin/mrd6 -f /etc/mrd6.conf -D + /sbin/lsmod | grep ipv6 > /dev/null + if [ "$?" != "0" ]; then + echo -n "IPv6 stack required by mrd6. Loading ipv6 module: " + /sbin/insmod ipv6 + echo "Done." + fi + echo -n "Starting IPv6 multicast router (mrd6): " + /usr/sbin/mrd6 -f /etc/mrd6.conf -D + echo "Done." } stop() { - service_stop /usr/sbin/mrd6 + echo -n "Stopping IPv6 multicast router (mrd6): " + killall mrd6 + echo "Done." } diff --git a/ipv6/ndisc/Makefile b/ipv6/ndisc/Makefile index 249e96ade6..d9d20a8fb4 100644 --- a/ipv6/ndisc/Makefile +++ b/ipv6/ndisc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ndisc6 -PKG_VERSION:=1.0.2 +PKG_VERSION:=1.0.1 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.remlab.net/files/ndisc6 -PKG_MD5SUM:=50cb4c19606cf6ff2b7388e71832f579 +PKG_MD5SUM:=d0b8233a60e29ad78d9aebb8cef0b3f2 PKG_INSTALL:=1 @@ -25,7 +25,6 @@ define Package/ndisc SUBMENU:=IPv6 discovery tools TITLE:=IPv6 discovery tools URL:=http://www.remlab.net/ndisc6/ - DEPENDS:=+libpthread +librt endef define Package/ndisc/description @@ -35,6 +34,7 @@ endef define Package/ndisc6 $(call Package/ndisc) TITLE:=An ICMPv6 neighbour discovery tool + DEPENDS:=+libpthread +librt endef define Package/ndisc6/description @@ -44,24 +44,26 @@ endef define Package/rdisc6 $(call Package/ndisc) TITLE:=An ICMPv6 router discovery tool + DEPENDS:=+libpthread +librt endef define Package/rdisc6/description An ICMPv6 router discovery tool endef -define Package/traceroute6 +define Package/tcptraceroute6 $(call Package/ndisc) - TITLE:=An IPv6-based traceroute implementation + TITLE:=A TCP/IPv6-based traceroute implementation endef -define Package/traceroute6/description -An IPv6-based traceroute implementation +define Package/tcptraceroute6/description +A TCP/IPv6-based traceroute implementation endef define Package/rdnssd $(call Package/ndisc) TITLE:=DNS server discovery daemon + DEPENDS:=+libpthread +librt endef define Package/rdnssd/description @@ -81,10 +83,9 @@ define Package/rdisc6/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/rdisc6 $(1)/usr/bin/ endef -define Package/traceroute6/install +define Package/tcptraceroute6/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{rl,tcp}traceroute6 $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tracert6 $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/tcptraceroute6 $(1)/usr/bin/ endef define Package/rdnssd/install @@ -94,5 +95,5 @@ endef $(eval $(call BuildPackage,ndisc6)) $(eval $(call BuildPackage,rdisc6)) -$(eval $(call BuildPackage,traceroute6)) +$(eval $(call BuildPackage,tcptraceroute6)) $(eval $(call BuildPackage,rdnssd)) diff --git a/ipv6/ndisc/patches/120-ppoll.patch b/ipv6/ndisc/patches/120-ppoll.patch index 6459a1fd28..07b1fca0d9 100644 --- a/ipv6/ndisc/patches/120-ppoll.patch +++ b/ipv6/ndisc/patches/120-ppoll.patch @@ -44,4 +44,4 @@ + const sigset_t *restrict sigset) { sigset_t origset; - int timeout; + int val; diff --git a/ipv6/ndppd/Makefile b/ipv6/ndppd/Makefile deleted file mode 100644 index 08ccc76ec3..0000000000 --- a/ipv6/ndppd/Makefile +++ /dev/null @@ -1,62 +0,0 @@ -# -# Copyright (C) 2007-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ndppd -PKG_VERSION:=0.2.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.priv.nu/projects/ndppd/files/ -PKG_MD5SUM:=9b65a8cccfce8689f0c1c410c20b4790 - -include $(INCLUDE_DIR)/package.mk - -define Package/ndppd - SECTION:=ipv6 - CATEGORY:=IPv6 - TITLE:=NDP Proxy Daemon - URL:=http://www.priv.nu/projects/ndppd/ - MAINTAINER:=Gabriel Kerneis - DEPENDS:=+kmod-ipv6 +confuse +uclibcxx -endef - -define Package/ndppd/description - ndppd, or NDP Proxy Daemon, is a daemon that proxies NDP (Neighbor Discovery - Protocol) messages between interfaces. ndppd currently only supports Neighbor - Solicitation Messages and Neighbor Advertisement Messages. - - The ndp_proxy provided by Linux doesn't support listing proxies, and only hosts - are supported. No subnets. ndppd solves this by listening for Neighbor - Solicitation messages on an interface, then query the internal interfaces for - that target IP before finally sending a Neighbor Advertisement message. -endef - -define Package/ndppd/conffiles -/etc/ndppd.conf -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - CXX="$(TARGET_CXX)" \ - CXXFLAGS="$(TARGET_CPPFLAGS) $(TARGET_CXXFLAGS) -fno-builtin -fno-rtti -nostdinc++ \ - -I$(STAGING_DIR)/usr/include/uClibc++ -I$(LINUX_DIR)/include" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - LIBS="-nodefaultlibs -luClibc++ -lconfuse" \ - ndppd -endef - -define Package/ndppd/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/ndppd $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/ndppd.init $(1)/etc/init.d/ndppd - $(INSTALL_CONF) $(PKG_BUILD_DIR)/ndppd.conf-dist $(1)/etc/ndppd.conf -endef - -$(eval $(call BuildPackage,ndppd)) diff --git a/ipv6/ndppd/files/ndppd.init b/ipv6/ndppd/files/ndppd.init deleted file mode 100644 index 4cf0e8a3ad..0000000000 --- a/ipv6/ndppd/files/ndppd.init +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2007-2011 OpenWrt.org - -START=90 - -SERVICE_USE_PID=1 -SERVICE_PID_FILE=/var/run/ndppd.pid - -start() { - mkdir -p /var/run - service_start /usr/sbin/ndppd -p $SERVICE_PID_FILE -d -} - -stop() { - service_stop /usr/sbin/ndppd -} diff --git a/ipv6/ptrtd/Makefile b/ipv6/ptrtd/Makefile index 4e1aa6503c..d77120700f 100644 --- a/ipv6/ptrtd/Makefile +++ b/ipv6/ptrtd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ptrtd PKG_VERSION:=0.5.2 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://v6web.litech.org/ptrtd/dist/ diff --git a/ipv6/ptrtd/files/ptrtd.init b/ipv6/ptrtd/files/ptrtd.init index 6d7cf68b69..8f4ae24d32 100644 --- a/ipv6/ptrtd/files/ptrtd.init +++ b/ipv6/ptrtd/files/ptrtd.init @@ -1,15 +1,26 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org START=60 +BIN=ptrtd +RUN_D=/var/run +PID_F=$RUN_D/$BIN.pid PREFIX="3ffe:abcd:1234:9876::" LEN=64 + start() { - service_start /usr/sbin/ptrtd -p $PREFIX -l $LEN + mkdir -p $RUN_D + $BIN -p $PREFIX -l $LEN } stop() { - service_stop /usr/sbin/ptrtd + [ -f $PID_F ] && kill $(cat $PID_F) +} + +restart() { + stop + sleep 1 + start } diff --git a/ipv6/radvd/Makefile b/ipv6/radvd/Makefile index 01b1b6d900..bdd0a585c6 100644 --- a/ipv6/radvd/Makefile +++ b/ipv6/radvd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=radvd PKG_VERSION:=1.8.3 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://v6web.litech.org/radvd/dist \ @@ -66,6 +66,8 @@ define Package/radvd/install $(INSTALL_CONF) ./files/radvd.config $(1)/etc/config/radvd $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/radvd.init $(1)/etc/init.d/radvd + $(INSTALL_DIR) $(1)/etc/hotplug.d/iface + $(INSTALL_DATA) ./files/radvd.hotplug $(1)/etc/hotplug.d/iface/05-radvd $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/radvd $(1)/usr/sbin/ endef diff --git a/ipv6/radvd/files/radvd.hotplug b/ipv6/radvd/files/radvd.hotplug new file mode 100644 index 0000000000..10a7ca8f6d --- /dev/null +++ b/ipv6/radvd/files/radvd.hotplug @@ -0,0 +1,5 @@ +#!/bin/sh + +if [ "$ACTION" = ifup ]; then + killall -HUP radvd 2>/dev/null +fi diff --git a/ipv6/radvd/files/radvd.init b/ipv6/radvd/files/radvd.init index 62e184b77b..d513bba294 100644 --- a/ipv6/radvd/files/radvd.init +++ b/ipv6/radvd/files/radvd.init @@ -1,11 +1,7 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2008-2011 OpenWrt.org # Copyright (C) 2008 Alina Friedrichsen - START=50 -SERVICE_USE_PID=1 - RADVD_INTERFACE_STRING_OPTIONS='MaxRtrAdvInterval MinRtrAdvInterval MinDelayBetweenRAs AdvLinkMTU AdvReachableTime AdvRetransTimer AdvCurHopLimit AdvDefaultLifetime AdvDefaultPreference HomeAgentLifetime HomeAgentPreference' RADVD_INTERFACE_BOOLEAN_OPTIONS='IgnoreIfMissing AdvSendAdvert UnicastOnly AdvManagedFlag AdvOtherConfigFlag AdvSourceLLAddress AdvHomeAgentFlag AdvHomeAgentInfo AdvMobRtrSupportFlag AdvIntervalOpt' @@ -429,9 +425,9 @@ start() { sysctl -w net.ipv6.conf.all.forwarding=1 > /dev/null 2> /dev/null - service_start /usr/sbin/radvd -C "$RADVD_CONFIG_FILE" -m stderr_syslog -p /var/run/radvd.pid + radvd -C "$RADVD_CONFIG_FILE" -m stderr_syslog -p /var/run/radvd.pid } stop() { - service_stop /usr/sbin/radvd + killall radvd } diff --git a/ipv6/radvd/patches/100-silent-netlink-config-reload.patch b/ipv6/radvd/patches/100-silent-netlink-config-reload.patch deleted file mode 100644 index 3439a25daa..0000000000 --- a/ipv6/radvd/patches/100-silent-netlink-config-reload.patch +++ /dev/null @@ -1,67 +0,0 @@ ---- a/netlink.c -+++ b/netlink.c -@@ -65,7 +65,7 @@ void process_netlink_msg(int sock) - else { - dlog(LOG_DEBUG, 3, "%s, ifindex %d, flags is *NOT* running", ifname, ifinfo->ifi_index); - } -- reload_config(); -+ reload_config(LOG_DEBUG); - } - } - ---- a/radvd.c -+++ b/radvd.c -@@ -443,7 +443,7 @@ void main_loop(void) - - if (sighup_received) - { -- reload_config(); -+ reload_config(LOG_INFO); - sighup_received = 0; - } - -@@ -551,11 +551,11 @@ stop_adverts(void) - } - } - --void reload_config(void) -+void reload_config(int loglevel) - { - struct Interface *iface; - -- flog(LOG_INFO, "attempting to reread config file"); -+ flog(loglevel, "attempting to reread config file"); - - dlog(LOG_DEBUG, 4, "reopening log"); - if (log_reopen() < 0) { -@@ -631,7 +631,7 @@ void reload_config(void) - config_interface(); - kickoff_adverts(); - -- flog(LOG_INFO, "resuming normal operation"); -+ flog(loglevel, "resuming normal operation"); - } - - void ---- a/radvd.h -+++ b/radvd.h -@@ -186,7 +186,7 @@ int yylex(void); - - /* radvd.c */ - int check_ip6_forwarding(void); --void reload_config(void); -+void reload_config(int); - void reset_prefix_lifetimes(void); - - /* timer.c */ ---- a/send.c -+++ b/send.c -@@ -154,7 +154,7 @@ send_ra(struct Interface *iface, struct - * reload_config() will kick off new timers anyway. This avoids - * timer list corruption. - */ -- reload_config(); -+ reload_config(LOG_INFO); - return -1; - } - } diff --git a/ipv6/shorewall6-lite/Makefile b/ipv6/shorewall6-lite/Makefile index e082b8981a..59afd8b1ab 100644 --- a/ipv6/shorewall6-lite/Makefile +++ b/ipv6/shorewall6-lite/Makefile @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=shorewall6-lite -PKG_VERSION:=4.4.22.2 -PKG_DIRECTORY:=4.4.22 -PKG_RELEASE:=2 +PKG_VERSION:=4.4.5.4 +PKG_DIRECTORY:=4.4.5 +PKG_RELEASE:=1 PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ http://www1.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ @@ -20,17 +20,17 @@ PKG_SOURCE_URL:=http://www.shorewall.net/pub/shorewall/4.4/shorewall-$(PKG_DIREC http://shorewall.infohiiway.com/pub/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ \ http://www.shorewall.com.ar/pub/shorewall/shorewall/4.4/shorewall-$(PKG_DIRECTORY)/ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_MD5SUM:=3ad7ba3790388bb562d3c937ba02fa31 +PKG_MD5SUM:=498f622be657df38beec256876adabb6 include $(INCLUDE_DIR)/package.mk define Package/shorewall6-lite SECTION:=ipv6 CATEGORY:=IPv6 - DEPENDS:=+ip +ip6tables + DEPENDS:=+ip +ip6tables +ip6tables-utils TITLE:=Shorewall6 Lite URL:=http://www.shorewall.net/ - SUBMENU:=Firewall + SUBMENU:=firewall endef define Package/shorewall6-lite/description diff --git a/ipv6/shorewall6-lite/patches/100-hostname.patch b/ipv6/shorewall6-lite/patches/100-hostname.patch new file mode 100644 index 0000000000..f901cb67f2 --- /dev/null +++ b/ipv6/shorewall6-lite/patches/100-hostname.patch @@ -0,0 +1,11 @@ +--- a/shorewall6-lite ++++ b/shorewall6-lite +@@ -153,7 +153,7 @@ + + export VERBOSE + +- [ -n "${HOSTNAME:=$(hostname)}" ] ++ [ -n "${HOSTNAME:=$(${SHAREDIR}/hostname)}" ] + + } + diff --git a/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch b/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch index cb01e8c33e..4f424da20a 100644 --- a/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch +++ b/ipv6/shorewall6-lite/patches/110-MODULESDIR.patch @@ -1,6 +1,6 @@ ---- a/lib.common -+++ b/lib.common -@@ -292,7 +292,7 @@ +--- a/lib.base ++++ b/lib.base +@@ -260,7 +260,7 @@ [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] @@ -9,7 +9,7 @@ MODULES=$(lsmod | cut -d ' ' -f1) for directory in $(split $MODULESDIR); do -@@ -328,7 +328,7 @@ +@@ -296,7 +296,7 @@ [ -n "${MODULE_SUFFIX:=o gz ko o.gz ko.gz}" ] [ -z "$MODULESDIR" ] && \ diff --git a/ipv6/shorewall6-lite/patches/120-LOGFILE.patch b/ipv6/shorewall6-lite/patches/120-LOGFILE.patch index 7fc11cd48d..53db5d7a51 100644 --- a/ipv6/shorewall6-lite/patches/120-LOGFILE.patch +++ b/ipv6/shorewall6-lite/patches/120-LOGFILE.patch @@ -7,4 +7,5 @@ -LOGFILE= +LOGFILE=/dev/null - + LOGFORMAT= + diff --git a/ipv6/shorewall6-lite/patches/130-portability.patch b/ipv6/shorewall6-lite/patches/130-portability.patch new file mode 100644 index 0000000000..87a696b88d --- /dev/null +++ b/ipv6/shorewall6-lite/patches/130-portability.patch @@ -0,0 +1,20 @@ +--- a/install.sh ++++ b/install.sh +@@ -294,13 +294,15 @@ cd manpages + + for f in *.5; do + gzip -c $f > $f.gz +- run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz ++ run_install -d ${PREFIX}/usr/share/man/man5 ++ run_install -m 644 $f.gz ${PREFIX}/usr/share/man/man5/$f.gz + echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man5/$f.gz" + done + + for f in *.8; do + gzip -c $f > $f.gz +- run_install -D -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz ++ run_install -d ${PREFIX}/usr/share/man/man8 ++ run_install -m 644 $f.gz ${PREFIX}/usr/share/man/man8/$f.gz + echo "Man page $f.gz installed to ${PREFIX}/usr/share/man/man8/$f.gz" + done + diff --git a/ipv6/tayga/Makefile b/ipv6/tayga/Makefile deleted file mode 100644 index c109a923fe..0000000000 --- a/ipv6/tayga/Makefile +++ /dev/null @@ -1,39 +0,0 @@ -# $Id: Makefile 5624 2006-11-23 00:29:07Z nbd $ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=tayga -PKG_VERSION:=0.9.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=tayga-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.litech.org/tayga/ -PKG_MD5SUM:=7a7b24165ce008df772f398d86fa280e -PKG_CAT:=bzcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/tayga-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk - -define Package/tayga - SECTION:=ipv6 - CATEGORY:=IPv6 - DEPENDS:=+ip +kmod-ipv6 +kmod-tun - TITLE:=Out-of-kernel stateless NAT64 implementation for Linux - URL:=http://www.litech.org/tayga/ -endef - -define Package/tayga/description - TAYGA is an out-of-kernel stateless NAT64 implementation for - Linux. It uses the TUN driver to exchange packets with the - kernel, which is the same driver used by OpenVPN and QEMU/KVM. -endef - -define Package/tayga/install - $(INSTALL_DIR) $(1)/usr/sbin $(1)/lib/network $(1)/etc/hotplug.d/iface - $(INSTALL_BIN) $(PKG_BUILD_DIR)/tayga $(1)/usr/sbin/ - $(INSTALL_DATA) ./files/tayga.sh $(1)/lib/network/tayga.sh - $(INSTALL_DATA) ./files/tayga.hotplug $(1)/etc/hotplug.d/iface/95-tayga -endef - -$(eval $(call BuildPackage,tayga)) diff --git a/ipv6/tayga/files/tayga.hotplug b/ipv6/tayga/files/tayga.hotplug deleted file mode 100644 index 2539f0930b..0000000000 --- a/ipv6/tayga/files/tayga.hotplug +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -if [ "$ACTION" = ifup ]; then - . /etc/functions.sh - - include /lib/network - scan_interfaces - - update_tunnel() { - local cfg="$1" - - local proto - config_get proto "$cfg" proto - [ "$proto" = tayga ] || return 0 - - local wandev4 - config_get wandev4 "$cfg" wan4_device "$(find_tayga_wanif4)" - - local wandev6 - config_get wandev6 "$cfg" wan6_device "$(find_tayga_wanif6)" - - [ "$wandev4" = "$DEVICE" ] || [ "$wandev6" = "$DEVICE" ] || return 0 - - local wanip4=$(find_tayga_wanip4 "$wandev4") - local wanip6=$(find_tayga_wanip6 "$wandev6") - - [ -n "$wanip4" ] && [ -n "$wanip6" ] && { - uci_set_state network "$cfg" ipv4addr "$wanip4" - uci_set_state network "$cfg" ipv6addr "$wanip6" - - logger -t tayga-update "Re-establishing tayga NAT64 due to change on $INTERFACE ($DEVICE)" - ifup "$cfg" & - } - } - - config_foreach update_tunnel interface -fi diff --git a/ipv6/tayga/files/tayga.sh b/ipv6/tayga/files/tayga.sh deleted file mode 100644 index 9f515c6194..0000000000 --- a/ipv6/tayga/files/tayga.sh +++ /dev/null @@ -1,139 +0,0 @@ -# tayga.sh - NAT64 backend - -find_tayga_wanif4() { - local if=$(ip -4 r l e 0.0.0.0/0); if="${if#default* dev }"; if="${if%% *}" - [ -n "$if" ] && grep -qs "^ *$if:" /proc/net/dev && echo "$if" -} - -find_tayga_wanip4() { - local ip=$(ip -4 a s dev "$1"); ip="${ip#*inet }" - echo "${ip%%[^0-9.]*}" -} - -find_tayga_wanif6() { - local if=$(ip -6 r l e ::/0); if="${if#default* dev }"; if="${if%% *}" - [ -n "$if" ] && grep -qs "^ *$if:" /proc/net/dev && echo "$if" -} - -find_tayga_wanip6() { - local ip=$(ip -6 a s dev "$1"); ip="${ip#*inet6 }" - echo "${ip%%[^0-9A-Fa-f:]*}" -} - -# Hook into scan_interfaces() to synthesize a .device option -# This is needed for /sbin/ifup to properly dispatch control -# to setup_interface_tayga() even if no .ifname is set in -# the configuration. -scan_tayga() { - config_set "$1" device "tayga-$1" -} - -coldplug_interface_tayga() { - setup_interface_tayga "tayga-$1" "$1" -} - -conf_rule_add() { - local cfg="$1" - local tmpconf="$2" - local ipv4_addr ipv6_addr - config_get ipv4_addr "$cfg" ipv4_addr "" - config_get ipv6_addr "$cfg" ipv6_addr "" - [ -n "$ipv4_addr" ] && [ -n "$ipv6_addr" ] && - echo "map $ipv4_addr $ipv6_addr" >>$tmpconf -} - -setup_interface_tayga() { - local iface="$1" - local cfg="$2" - local link="tayga-$cfg" - - local ipv4_addr ipv6_addr prefix dynamic_pool - - config_get ipv4_addr "$cfg" ipv4_addr - config_get ipv6_addr "$cfg" ipv6_addr - config_get prefix "$cfg" prefix - config_get dynamic_pool "$cfg" dynamic_pool - - local args - - include /lib/network - scan_interfaces - - local wanip4=$(uci_get network "$cfg" ipv4addr) - local wanip6=$(uci_get network "$cfg" ipv6addr) - - local wanif4=$(find_tayga_wanif4) - local wanif6=$(find_tayga_wanif6) - - [ -z "$wanip4" ] && { - [ -n "$wanif4" ] && { - wanip4=$(find_tayga_wanip4 "$wanif4") - uci_set_state network "$cfg" wan4_device "$wanif4" - } - } - - [ -z "$wanip6" ] && { - [ -n "$wanif6" ] && { - wanip6=$(find_tayga_wanip6 "$wanif6") - uci_set_state network "$cfg" wan6_device "$wanif6" - } - } - - [ -n "$wanip4" ] && [ -n "$wanip6" ] || { - echo "Cannot determine local IPv4 and IPv6 addressed for tayga NAT64 $cfg - skipping" - return - } - - local tmpconf="/var/etc/tayga-$cfg.conf" - args="-c $tmpconf" - mkdir -p /var/etc - mkdir -p /var/run/tayga/$cfg - - echo "tun-device $link" >$tmpconf - echo "ipv4-addr $ipv4_addr" >>$tmpconf - [ -n "$ipv6_addr" ] && - echo "ipv6-addr $ipv6_addr" >>$tmpconf - [ -n "$prefix" ] && - echo "prefix $prefix" >>$tmpconf - - config_foreach conf_rule_add map_rule "$tmpconf" - - [ -n "$dynamic_pool" ] && - echo "dynamic-pool $dynamic_pool" >>$tmpconf - echo "data-dir /var/run/tayga/$cfg" >>$tmpconf - - # creating the tunnel below will trigger a net subsystem event - # prevent it from touching or iface by disabling .auto here - uci_set_state network "$cfg" ifname $link - uci_set_state network "$cfg" auto 0 - - tayga $args --mktun - ip link set "$link" up - - ip addr add "$wanip4" dev "$link" - ip addr add "$wanip6" dev "$link" - - [ -n "$dynamic_pool" ] && - ip -4 route add "$dynamic_pool" dev "$link" - [ -n "$prefix" ] && - ip -6 route add "$prefix" dev "$link" - - start-stop-daemon -S -x tayga -- $args -p /var/run/$link.pid - - env -i ACTION="ifup" DEVICE="$link" INTERFACE="$cfg" PROTO="tayga" \ - /sbin/hotplug-call iface -} - -stop_interface_tayga() { - local cfg="$1" - local link="tayga-$cfg" - - env -i ACTION="ifdown" DEVICE="$link" INTERFACE="$cfg" PROTO="tayga" \ - /sbin/hotplug-call iface - - service_kill tayga "/var/run/$link.pid" - - ip link set "$link" down - ip addr flush dev "$link" - ip route flush dev "$link" -} diff --git a/ipv6/totd/Makefile b/ipv6/totd/Makefile index e67bc572a5..0d2cf9ff77 100644 --- a/ipv6/totd/Makefile +++ b/ipv6/totd/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2011 OpenWrt.org +# +# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk PKG_NAME:=totd PKG_VERSION:=1.5.1 -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.dillema.net/software/totd +PKG_SOURCE_URL:=ftp://ftp.pasta.cs.uit.no/pub/totd/ PKG_MD5SUM:=7edaedae9f6aca5912dd6c123582cf08 include $(INCLUDE_DIR)/package.mk @@ -22,7 +22,7 @@ define Package/totd CATEGORY:=IPv6 DEPENDS:=+kmod-ipv6 TITLE:=Small DNS proxy that supports IPv6/IPv4 record translation - URL:=http://www.dillema.net/software/totd.html + URL:=http://pasta.cs.uit.no/software/totd.html endef define Package/totd/description @@ -53,8 +53,4 @@ define Package/totd/install $(INSTALL_BIN) ./files/totd.init $(1)/etc/init.d/totd endef -define Package/totd/conffiles -/etc/totd.conf -endef - $(eval $(call BuildPackage,totd)) diff --git a/ipv6/totd/files/totd.init b/ipv6/totd/files/totd.init index 9c2dd74e99..c12cc41cdc 100644 --- a/ipv6/totd/files/totd.init +++ b/ipv6/totd/files/totd.init @@ -1,14 +1,23 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org START=60 +BIN=totd +RUN_D=/var/run +PID_F=$RUN_D/$BIN.pid -SERVICE_USE_PID=1 start() { - service_start /usr/sbin/totd -c /etc/totd.conf + mkdir -p $RUN_D + $BIN -c /etc/totd.conf } stop() { - service_stop /usr/sbin/totd + [ -f $PID_F ] && kill $(cat $PID_F) +} + +restart() { + stop + sleep 1 + start } diff --git a/ipv6/totd/patches/001-no_warning_as_errors.patch b/ipv6/totd/patches/001-no_warning_as_errors.patch index 3f8f3b4431..88fc359dad 100644 --- a/ipv6/totd/patches/001-no_warning_as_errors.patch +++ b/ipv6/totd/patches/001-no_warning_as_errors.patch @@ -1,6 +1,7 @@ ---- a/Makefile.in -+++ b/Makefile.in -@@ -19,7 +19,7 @@ TOT_CONFIG_FILE=@sysconfdir@/totd.conf +diff -urN totd-1.5.1/Makefile.in totd-1.5.1.new/Makefile.in +--- totd-1.5.1/Makefile.in 2005-01-31 12:55:14.000000000 +0100 ++++ totd-1.5.1.new/Makefile.in 2007-02-26 12:12:05.000000000 +0100 +@@ -19,7 +19,7 @@ INSTALL = /usr/bin/install diff --git a/ipv6/tspc/Makefile b/ipv6/tspc/Makefile index 8133f27daf..6e76748e73 100644 --- a/ipv6/tspc/Makefile +++ b/ipv6/tspc/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=tspc PKG_VERSION:=2.1.1 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.fr.debian.org/debian/pool/main/t/tspc/ @@ -45,8 +45,4 @@ define Package/tspc/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/template/checktunnel.sh $(1)/etc/tsp/ endef -define Package/tspc/conffiles -/etc/tsp/tspc.conf -endef - $(eval $(call BuildPackage,tspc)) diff --git a/ipv6/wide-dhcpv6/Makefile b/ipv6/wide-dhcpv6/Makefile index 04f13264da..54950e487f 100644 --- a/ipv6/wide-dhcpv6/Makefile +++ b/ipv6/wide-dhcpv6/Makefile @@ -1,15 +1,9 @@ -# -# Copyright (C) 2010-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# include $(TOPDIR)/rules.mk PKG_NAME:=wide-dhcpv6 PKG_VERSION:=20080615 -PKG_RELEASE:=10 +PKG_RELEASE:=6.3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -100,11 +94,11 @@ define Package/wide-dhcpv6-client/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/dhcp6c $(1)/usr/sbin $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/dhcp6c.config $(1)/etc/config/dhcp6c + $(INSTALL_CONF) ./files/dhcp6c.conf $(1)/etc/config/dhcp6c $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dhcp6c.init $(1)/etc/init.d/dhcp6c $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_DATA) ./files/dhcp6c.hotplug $(1)/etc/hotplug.d/iface/40-dhcp6c + $(INSTALL_DATA) ./files/dhcp6c.hotplug $(1)/etc/hotplug.d/iface/40-dhcp6c $(INSTALL_DIR) $(1)/etc/hotplug.d/dhcp6c $(INSTALL_DATA) ./files/dhcp6c-dnsmasq.hotplug $(1)/etc/hotplug.d/dhcp6c/10-dnsmasq $(INSTALL_DATA) ./files/dhcp6c-radvd.hotplug $(1)/etc/hotplug.d/dhcp6c/20-radvd @@ -122,11 +116,11 @@ define Package/wide-dhcpv6-server/install $(INSTALL_DIR) $(1)/etc $(INSTALL_CONF) $(PKG_BUILD_DIR)/dhcp6s.conf.sample $(1)/etc $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/dhcp6s.config $(1)/etc/config/dhcp6s + $(INSTALL_CONF) ./files/dhcp6s.conf $(1)/etc/config/dhcp6s $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/dhcp6s.init $(1)/etc/init.d/dhcp6s $(INSTALL_DIR) $(1)/etc/hotplug.d/iface - $(INSTALL_DATA) ./files/dhcp6s.hotplug $(1)/etc/hotplug.d/iface/50-dhcp6s + $(INSTALL_DATA) ./files/dhcp6s.hotplug $(1)/etc/hotplug.d/iface/50-dhcp6s endef define Package/wide-dhcpv6-relay/install diff --git a/ipv6/wide-dhcpv6/files/dhcp6c.config b/ipv6/wide-dhcpv6/files/dhcp6c.conf similarity index 100% rename from ipv6/wide-dhcpv6/files/dhcp6c.config rename to ipv6/wide-dhcpv6/files/dhcp6c.conf diff --git a/ipv6/wide-dhcpv6/files/dhcp6s.config b/ipv6/wide-dhcpv6/files/dhcp6s.conf similarity index 100% rename from ipv6/wide-dhcpv6/files/dhcp6s.config rename to ipv6/wide-dhcpv6/files/dhcp6s.conf diff --git a/ipv6/wide-dhcpv6/files/dhcp6s.init b/ipv6/wide-dhcpv6/files/dhcp6s.init index c50765974c..fc0da52e9e 100644 --- a/ipv6/wide-dhcpv6/files/dhcp6s.init +++ b/ipv6/wide-dhcpv6/files/dhcp6s.init @@ -1,7 +1,4 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2010-2011 OpenWrt.org - -SERVICE_USE_PID=1 get_ifname() { local interface=$1 @@ -13,6 +10,7 @@ get_ifname() { } start() { + [ ! -e /etc/dhcp6sctlkey ] && `dd if=/dev/urandom count=1 2> /dev/null | md5sum | cut -d" " -f1 > /etc/dhcp6sctlkey` [ -e /var/run/dhcp6s.pid ] && return 0 @@ -20,27 +18,33 @@ start() { include /lib/network config_load "dhcp6s" - + local enabled config_get_bool enabled basic enabled 0 [ $enabled -eq 0 ] && return 0 - + logger starting dhcp6s - + local server_interface config_get server_interface basic interface local server_ifname=$(get_ifname "$server_interface") - + local config_file config_get config_file basic config_file [ ! -e $config_file ] && return 1 - - service_start /usr/sbin/dhcp6s -c $config_file $server_ifname + + /usr/sbin/dhcp6s -c $config_file $server_ifname + + return 0 + } stop() { + logger stopping dhcp6s - service_stop /usr/sbin/dhcp6s + kill -TERM `cat /var/run/dhcp6s.pid` + return 0 + } diff --git a/lang/distribute/Makefile b/lang/distribute/Makefile index c38d277dc2..d6cd067c2d 100644 --- a/lang/distribute/Makefile +++ b/lang/distribute/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=distribute -PKG_VERSION:=0.6.21 +PKG_VERSION:=0.6.16 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://pypi.python.org/packages/source/d/$(PKG_NAME)/ -PKG_MD5SUM:=f783444754861f9b33e9f4083bd97b60 +PKG_MD5SUM:=19ba112f4916cca1d5a89dbad2b361da PKG_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)/ HOST_BUILD_DEPENDS:=python diff --git a/lang/jamvm/Makefile b/lang/jamvm/Makefile index 77dadeb649..80bf306d37 100644 --- a/lang/jamvm/Makefile +++ b/lang/jamvm/Makefile @@ -8,18 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=jamvm -PKG_VERSION:=1.6.0-git -PKG_RELEASE:=1 +PKG_VERSION:=1.5.4 +PKG_RELEASE:=2 -PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://git.berlios.de/jamvm -PKG_SOURCE_VERSION:=4617da717ecb05654ea5bb9572338061106a414d -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz -PKG_MIRROR_MD5SUM:=fd546a48f9e248d21d879664240892a1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=@SF/jamvm +PKG_MD5SUM:=7654e9657691f5f09c4f481ed4686176 PKG_FIXUP:=libtool -PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk @@ -29,7 +25,7 @@ define Package/jamvm CATEGORY:=Languages TITLE:=A compact Java Virtual Machine URL:=http://sourceforge.net/projects/jamvm - DEPENDS:=+zlib +libpthread +librt +classpath @!avr32 + DEPENDS:=+libffi +zlib +libpthread @!avr32 @!mips endef define Package/jamvm/description @@ -41,27 +37,26 @@ define Package/jamvm/description Native Interface (JNI) and the Reflection API. endef -CONFIGURE_ARGS += \ - --with-java-runtime-library=gnuclasspath \ +CONFIGURE_ARGS+= \ --with-classpath-install-dir=/usr \ - --disable-int-inlining \ - --disable-shared \ - --without-pic - -MAKE_FLAGS += \ - GLIBJ_ZIP=$(STAGING_DIR)/usr/share/classpath/glibj.zip - -define Package/jamvm/install - $(INSTALL_DIR) $(1)/usr - $(CP) \ - $(PKG_INSTALL_DIR)/usr/bin \ - $(PKG_INSTALL_DIR)/usr/share \ - $(1)/usr/ + --disable-tls \ + --enable-ffi \ + --disable-int-threading \ + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + CPPFLAGS="$(TARGET_CPPFLAGS)" \ + all endef -define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ -endef +ifneq ($(ARCH),mips) + define Package/jamvm/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/jamvm $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/share/jamvm + $(INSTALL_DATA) $(PKG_BUILD_DIR)/lib/classes.zip $(1)/usr/share/jamvm/ + endef +endif $(eval $(call BuildPackage,jamvm)) diff --git a/lang/perl-compress-bzip2/Makefile b/lang/perl-compress-bzip2/Makefile index 940749a5f9..de4c4f454d 100644 --- a/lang/perl-compress-bzip2/Makefile +++ b/lang/perl-compress-bzip2/Makefile @@ -3,7 +3,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl-compress-bzip2 PKG_VERSION:=2.09 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_MD5SUM:=1699fde3e86f2a036f135ae606d456bf PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/A/AR/ARJAY @@ -20,7 +20,7 @@ define Package/perl-compress-bzip2 CATEGORY:=Languages TITLE:=Perl interface to bzip2 compression library URL:=http://search.cpan.org/dist/Compress-Bzip2/ - DEPENDS:=perl +libbz2 + DEPENDS:=perl +bzip2 endef define Build/Configure diff --git a/lang/perl-net-telnet/Makefile b/lang/perl-net-telnet/Makefile deleted file mode 100644 index 9b94990c87..0000000000 --- a/lang/perl-net-telnet/Makefile +++ /dev/null @@ -1,44 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=perl-net-telnet -PKG_VERSION:=3.03 -PKG_RELEASE:=1 -PKG_MD5SUM:=2f7d34b09d6117baefe89d44cff9d5fc - -PKG_SOURCE_URL:=http://search.cpan.org/CPAN/authors/id/J/JR/JROGERS -PKG_SOURCE:=Net-Telnet-$(PKG_VERSION).tar.gz - -PKG_BUILD_DIR:=$(BUILD_DIR)/perl/Net-Telnet-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -include ../perl/perlmod.mk - -define Package/perl-net-telnet -SUBMENU:=Perl -SECTION:=lang -CATEGORY:=Languages -TITLE:=Telnet client -URL:=http://search.cpan.org/~jrogers/Net-Telnet-3.03/ -DEPENDS:=perl -endef - -define Build/Configure - $(call perlmod/Configure,,) -endef - -define Build/Compile - $(call perlmod/Compile,,) -endef - -define Package/perl-net-telnet/install - $(call perlmod/Install,$(1),Net auto/Net) -endef - -$(eval $(call BuildPackage,perl-net-telnet)) diff --git a/lang/perl/Makefile b/lang/perl/Makefile index 125cb5a81a..dd0fc06d88 100644 --- a/lang/perl/Makefile +++ b/lang/perl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=perl PKG_VERSION:=5.10.0 -PKG_RELEASE:=7 +PKG_RELEASE:=5 PKG_MD5SUM:=d2c39b002ebfd2c3c5dba589365c5a71 PKG_SOURCE_URL:=ftp://ftp.cpan.org/pub/CPAN/src/5.0 \ @@ -22,18 +22,12 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/perl/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk -ifneq ($(CONFIG_USE_EGLIBC)$(CONFIG_USE_GLIBC),) -EXTRA_LIBS:=bsd -EXTRA_LIBDIRS:=$(STAGING_DIR)/lib -endif - define Package/perl/Default SUBMENU:=Perl SECTION:=lang CATEGORY:=Languages TITLE:=The Perl intepreter URL:=http://www.perl.com/ - DEPENDS:=+USE_EGLIBC:libbsd +USE_GLIBC:libbsd endef define Package/microperl @@ -79,6 +73,7 @@ include perlmod.mk define Package/perl $(call Package/perl/Default) + MAINTAINER:=Peter Colberg endef define Package/perl/description @@ -112,8 +107,6 @@ define Build/perl/Configure -e 's!%%LDFLAGS%%!-rdynamic $(TARGET_LDFLAGS)!g' \ -e 's!%%LIBDIRS%%!$(STAGING_DIR)/lib $(STAGING_DIR)/usr/lib!g' \ -e 's!%%INCDIRS%%!$(STAGING_DIR)/include $(STAGING_DIR)/usr/include!g' \ - -e 's!%%EXTRA_PERLLIBS%%!$(EXTRA_LIBS:%=-l%)!g' \ - -e 's!%%EXTRA_PERLLIBDIRS%%!$(EXTRA_LIBDIRS:%=-L%)!g' \ files/config.sh-$(patsubst i386,i486,$(ARCH)).in \ > $(PKG_BUILD_DIR)/config.sh (cd $(PKG_BUILD_DIR) && ./Configure -S) diff --git a/lang/perl/files/config.sh-arm.in b/lang/perl/files/config.sh-arm.in index a21991faf4..ae87c592a3 100644 --- a/lang/perl/files/config.sh-arm.in +++ b/lang/perl/files/config.sh-arm.in @@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/ ksh='' ld='%%LD%%' lddlflags='-shared %%LDFLAGS%%' -ldflags='%%EXTRA_PERLLIBDIRS%%' +ldflags='' ldflags_uselargefiles='' ldlibpthname='LD_LIBRARY_PATH' less='less' @@ -832,7 +832,7 @@ perl5='' perl='' perl_patchlevel='' perladmin='root@maia.dev.null' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' diff --git a/lang/perl/files/config.sh-armeb.in b/lang/perl/files/config.sh-armeb.in index 81bc555ef3..ced3b72953 100644 --- a/lang/perl/files/config.sh-armeb.in +++ b/lang/perl/files/config.sh-armeb.in @@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/ ksh='' ld='%%LD%%' lddlflags='-shared %%LDFLAGS%%' -ldflags='%%EXTRA_PERLLIBDIRS%%' +ldflags='' ldflags_uselargefiles='' ldlibpthname='LD_LIBRARY_PATH' less='less' @@ -832,7 +832,7 @@ perl5='' perl='' perl_patchlevel='' perladmin='root@maia.dev.null' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' diff --git a/lang/perl/files/config.sh-avr32.in b/lang/perl/files/config.sh-avr32.in index 1108364d54..d7f148dcbf 100644 --- a/lang/perl/files/config.sh-avr32.in +++ b/lang/perl/files/config.sh-avr32.in @@ -737,7 +737,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/ ksh='' ld='%%LD%%' lddlflags='-shared %%LDFLAGS%%' -ldflags='%%EXTRA_PERLLIBDIRS%%' +ldflags='' ldflags_uselargefiles='' ldlibpthname='LD_LIBRARY_PATH' less='less' @@ -834,7 +834,7 @@ perl5='' perl='' perl_patchlevel='' perladmin='root@maia.dev.null' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' diff --git a/lang/perl/files/config.sh-i486.in b/lang/perl/files/config.sh-i486.in index d05fdd0fff..2cb2b52690 100644 --- a/lang/perl/files/config.sh-i486.in +++ b/lang/perl/files/config.sh-i486.in @@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/ ksh='' ld='%%LD%%' lddlflags='-shared %%LDFLAGS%%' -ldflags='%%EXTRA_PERLLIBDIRS%%' +ldflags='' ldflags_uselargefiles='' ldlibpthname='LD_LIBRARY_PATH' less='less' @@ -832,7 +832,7 @@ perl5='' perl='' perl_patchlevel='' perladmin='root@maia.dev.null' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' diff --git a/lang/perl/files/config.sh-mips.in b/lang/perl/files/config.sh-mips.in index 8058cead9d..c261711ee8 100644 --- a/lang/perl/files/config.sh-mips.in +++ b/lang/perl/files/config.sh-mips.in @@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/ ksh='' ld='%%LD%%' lddlflags='-shared %%LDFLAGS%%' -ldflags='%%EXTRA_PERLLIBDIRS%%' +ldflags='' ldflags_uselargefiles='' ldlibpthname='LD_LIBRARY_PATH' less='less' @@ -832,7 +832,7 @@ perl5='' perl='' perl_patchlevel='' perladmin='root@merope.dev.null' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' diff --git a/lang/perl/files/config.sh-mipsel.in b/lang/perl/files/config.sh-mipsel.in index 0c9fd2fc28..f1ecfdc3de 100644 --- a/lang/perl/files/config.sh-mipsel.in +++ b/lang/perl/files/config.sh-mipsel.in @@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/ ksh='' ld='%%LD%%' lddlflags='-shared %%LDFLAGS%%' -ldflags='%%EXTRA_PERLLIBDIRS%%' +ldflags='' ldflags_uselargefiles='' ldlibpthname='LD_LIBRARY_PATH' less='less' @@ -832,7 +832,7 @@ perl5='' perl='' perl_patchlevel='' perladmin='root@merope.dev.null' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' diff --git a/lang/perl/files/config.sh-powerpc.in b/lang/perl/files/config.sh-powerpc.in index e626586b27..da84eeafb3 100644 --- a/lang/perl/files/config.sh-powerpc.in +++ b/lang/perl/files/config.sh-powerpc.in @@ -735,7 +735,7 @@ known_extensions='B Compress/Raw/Zlib Cwd DB_File Data/Dumper Devel/DProf Devel/ ksh='' ld='%%LD%%' lddlflags='-shared %%LDFLAGS%%' -ldflags='%%EXTRA_PERLLIBDIRS%%' +ldflags='' ldflags_uselargefiles='' ldlibpthname='LD_LIBRARY_PATH' less='less' @@ -832,7 +832,7 @@ perl5='' perl='' perl_patchlevel='' perladmin='root@maia.dev.null' -perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc %%EXTRA_PERLLIBS%%' +perllibs='-lnsl -ldl -lm -lcrypt -lutil -lc' perlpath='/usr/bin/perl' pg='pg' phostname='hostname' diff --git a/lang/perl/files/scan-perlbase.sh b/lang/perl/files/scan-perlbase.sh index d9fe80aa4d..ab8963d9d6 100644 --- a/lang/perl/files/scan-perlbase.sh +++ b/lang/perl/files/scan-perlbase.sh @@ -51,6 +51,7 @@ define Package/$$_{package} SECTION:=lang CATEGORY:=Languages URL:=http://www.cpan.org/ +MAINTAINER:=Peter Colberg TITLE:=$$_{module} perl module DEPENDS:=$$_{depends} endef diff --git a/lang/perl/patches/100-static_uudmap.patch b/lang/perl/patches/100-static_uudmap.patch index e0821cc071..698129a2cf 100644 --- a/lang/perl/patches/100-static_uudmap.patch +++ b/lang/perl/patches/100-static_uudmap.patch @@ -35,12 +35,13 @@ -uudmap.h: generate_uudmap\$(EXE_EXT) - \$(RUN) ./generate_uudmap\$(EXE_EXT) >uudmap.h +- +-generate_uudmap\$(EXE_EXT): generate_uudmap\$(OBJ_EXT) +- \$(CC) -o generate_uudmap \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs) +uudmap.h: generate_uudmap + chmod a+x generate_uudmap + \$(RUN) ./generate_uudmap >uudmap.h - --generate_uudmap\$(EXE_EXT): generate_uudmap\$(OBJ_EXT) -- \$(CC) -o generate_uudmap \$(LDFLAGS) generate_uudmap\$(OBJ_EXT) \$(libs) ++ +generate_uudmap: + cp ../generate_uudmap . + touch generate_uudmap diff --git a/lang/perl/perlbase.mk b/lang/perl/perlbase.mk index d1cad978e7..ac6070ce5e 100644 --- a/lang/perl/perlbase.mk +++ b/lang/perl/perlbase.mk @@ -3,6 +3,7 @@ SUBMENU:=Perl SECTION:=lang CATEGORY:=Languages URL:=http://www.cpan.org/ +MAINTAINER:=Peter Colberg DEPENDS:=perl endef diff --git a/lang/php5/Makefile b/lang/php5/Makefile index dee858bc86..4435eb8477 100644 --- a/lang/php5/Makefile +++ b/lang/php5/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=php -PKG_VERSION:=5.3.9 -PKG_RELEASE:=2 +PKG_VERSION:=5.3.6 +PKG_RELEASE:=3.3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.php.net/distributions/ -PKG_MD5SUM:=dd3288ed5c08cd61ac5bf619cb357521 +PKG_MD5SUM:=2286f5a82a6e8397955a0025c1c2ad98 PKG_FIXUP:=libtool no-autoreconf PKG_BUILD_PARALLEL:=1 @@ -22,25 +22,25 @@ PHP5_MODULES = \ apc \ ctype curl \ fileinfo \ - dio dom \ + dom \ exif \ ftp \ gettext gd gmp \ - hash http \ + hash \ iconv \ json \ - ldap libevent \ - mbstring mcrypt mysql mysqli \ + ldap \ + mbstring mcrypt mysql \ openssl \ pcntl pdo pdo-mysql pdo-pgsql pdo-sqlite pgsql \ session simplexml soap sockets sqlite sqlite3 sysvmsg sysvsem sysvshm \ tokenizer \ - xml xmlreader xmlwriter zip \ + xml xmlreader xmlwriter \ PKG_CONFIG_DEPENDS:= \ CONFIG_PACKAGE_php5-cgi CONFIG_PACKAGE_php5-cli \ $(patsubst %,CONFIG_PACKAGE_php5-mod-%,$(PHP5_MODULES)) \ - CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML PHP5_SYSTEMTZDATA + CONFIG_PHP5_FILTER CONFIG_PHP5_LIBXML include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk @@ -68,23 +68,16 @@ define Package/php5/config config PHP5_LIBXML bool "PHP5 LIBXML support" depends on PACKAGE_php5-cli || PACKAGE_php5-cgi - - config PHP5_SYSTEMTZDATA - bool "Use system timezone data instead of php's built-in database" - depends on PACKAGE_php5-cli || PACKAGE_php5-cgi - select PACKAGE_zoneinfo-core - default y - help - Enabling this feature automatically selects the zoneinfo-core package - which contains data for UTC timezone. To use other timezones you have - to install the corresponding zoneinfo-... package(s). endef define Package/php5 $(call Package/php5/Default) DEPENDS:=+libpcre +zlib \ - +PHP5_LIBXML:libxml2 + +PHP5_LIBXML:libxml2 \ + +PACKAGE_php5-mod-apc:librt \ + +(PACKAGE_php5-mod-sqlite3||PACKAGE_php5-mod-pdo-sqlite):libsqlite3 \ + +(PACKAGE_php5-mod-sqlite3||PACKAGE_php5-mod-pdo-sqlite):libpthread endef define Package/php5/description @@ -141,73 +134,85 @@ CONFIGURE_ARGS+= \ --with-pcre-regex="$(STAGING_DIR)/usr" \ --disable-phar -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cli),) +ifneq ($(SDK),) + PKG_BUILD_DEPENDS+=libopenssl zlib libcurl libgd libgmp libopenldap libmysqlclient libpq libsqlite2 libpthread libsqlite3 libpcre libxml2 +# force PKG_CONFIGURE_{LIBS,OPTS} below when built in the SDK + CONFIG_PACKAGE_php5-cli:=m + CONFIG_PACKAGE_php5-cgi:=m + CONFIG_PACKAGE_php5-fastcgi:=m + CONFIG_PACKAGE_php5-mod-curl:=m + CONFIG_PACKAGE_php5-mod-gd:=m + CONFIG_PACKAGE_php5-mod-gmp:=m + CONFIG_PACKAGE_php5-mod-ldap:=m + CONFIG_PACKAGE_php5-mod-mysql:=m + CONFIG_PACKAGE_php5-mod-pgsql:=m + CONFIG_PACKAGE_php5-mod-sqlite:=m + CONFIG_PACKAGE_php5-mod-sqlite3:=m + CONFIG_PACKAGE_php5-mod-xml:=m +endif + +ifneq ($(CONFIG_PACKAGE_php5-cli),) CONFIGURE_ARGS+= --enable-cli else CONFIGURE_ARGS+= --disable-cli endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-cgi),) +ifneq ($(CONFIG_PACKAGE_php5-cgi),) CONFIGURE_ARGS+= --enable-cgi else CONFIGURE_ARGS+= --disable-cgi endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-apc),) +ifneq ($(CONFIG_PACKAGE_php5-mod-apc),) CONFIGURE_ARGS+= --enable-apc=shared --disable-apc-mmap --disable-apc-pthreadmutex + CONFIGURE_LIBS+= -lrt else CONFIGURE_ARGS+= --disable-apc endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ctype),) +ifneq ($(CONFIG_PACKAGE_php5-mod-ctype),) CONFIGURE_ARGS+= --enable-ctype=shared else CONFIGURE_ARGS+= --disable-ctype endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-curl),) +ifneq ($(CONFIG_PACKAGE_php5-mod-curl),) CONFIGURE_ARGS+= --with-curl=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --without-curl endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-fileinfo),) +ifneq ($(CONFIG_PACKAGE_php5-mod-fileinfo),) CONFIGURE_ARGS+= --enable-fileinfo=shared else CONFIGURE_ARGS+= --disable-fileinfo endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gettext),) +ifneq ($(CONFIG_PACKAGE_php5-mod-gettext),) CONFIGURE_ARGS+= --with-gettext=shared,"$(STAGING_DIR)/usr/lib/libintl-full" else CONFIGURE_ARGS+= --without-gettext endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-dio),) - CONFIGURE_ARGS+= --enable-dio=shared -else - CONFIGURE_ARGS+= --disable-dio -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-dom),) +ifneq ($(CONFIG_PACKAGE_php5-mod-dom),) CONFIGURE_ARGS+= --enable-dom=shared else CONFIGURE_ARGS+= --disable-dom endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-exif),) +ifneq ($(CONFIG_PACKAGE_php5-mod-exif),) CONFIGURE_ARGS+= --enable-exif=shared else CONFIGURE_ARGS+= --disable-exif endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ftp),) +ifneq ($(CONFIG_PACKAGE_php5-mod-ftp),) CONFIGURE_ARGS+= --enable-ftp=shared else CONFIGURE_ARGS+= --disable-ftp endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gd),) +ifneq ($(CONFIG_PACKAGE_php5-mod-gd),) CONFIGURE_ARGS+= \ --with-gd=shared,"$(STAGING_DIR)/usr" \ --without-freetype-dir \ @@ -221,28 +226,19 @@ else CONFIGURE_ARGS+= --without-gd endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-gmp),) +ifneq ($(CONFIG_PACKAGE_php5-mod-gmp),) CONFIGURE_ARGS+= --with-gmp=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --without-gmp endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-hash),) +ifneq ($(CONFIG_PACKAGE_php5-mod-hash),) CONFIGURE_ARGS+= --enable-hash=shared else CONFIGURE_ARGS+= --disable-hash endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-http),) - CONFIGURE_ARGS+= \ - --enable-http=shared \ - --without-http-shared-deps \ - --with-http-curl-requests="$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --disable-http -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-iconv),) +ifneq ($(CONFIG_PACKAGE_php5-mod-iconv),) CONFIGURE_ARGS+= --with-iconv=shared,"$(ICONV_PREFIX)" else CONFIGURE_ARGS+= --without-iconv @@ -254,7 +250,7 @@ else CONFIGURE_ARGS+= --disable-json endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-ldap),) +ifneq ($(CONFIG_PACKAGE_php5-mod-ldap),) CONFIGURE_ARGS+= \ --with-ldap=shared,"$(STAGING_DIR)/usr" \ --with-ldap-sasl="$(STAGING_DIR)/usr" @@ -262,37 +258,25 @@ else CONFIGURE_ARGS+= --without-ldap endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-libevent),) - CONFIGURE_ARGS+= --with-libevent=shared,"$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= --without-libevent -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mbstring),) +ifneq ($(CONFIG_PACKAGE_php5-mod-mbstring),) CONFIGURE_ARGS+= --enable-mbstring=shared --enable-mbregex else CONFIGURE_ARGS+= --disable-mbstring endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mcrypt),) +ifneq ($(CONFIG_PACKAGE_php5-mod-mcrypt),) CONFIGURE_ARGS+= --with-mcrypt=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --without-mcrypt endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysql),) +ifneq ($(CONFIG_PACKAGE_php5-mod-mysql),) CONFIGURE_ARGS+= --with-mysql=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --without-mysql endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-mysqli),) - CONFIGURE_ARGS+= --with-mysqli=shared,"$(STAGING_DIR)/usr/bin/mysql_config" -else - CONFIGURE_ARGS+= --without-mysqli -endif - -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-openssl),) +ifneq ($(CONFIG_PACKAGE_php5-mod-openssl),) CONFIGURE_ARGS+= \ --with-openssl=shared,"$(STAGING_DIR)/usr" \ --with-kerberos=no \ @@ -301,26 +285,27 @@ else CONFIGURE_ARGS+= --without-openssl endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pcntl),) +ifneq ($(CONFIG_PACKAGE_php5-mod-pcntl),) CONFIGURE_ARGS+= --enable-pcntl=shared else CONFIGURE_ARGS+= --disable-pcntl endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo),) +ifneq ($(CONFIG_PACKAGE_php5-mod-pdo),) CONFIGURE_ARGS+= --enable-pdo=shared - ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-mysql),) + ifneq ($(CONFIG_PACKAGE_php5-mod-pdo-mysql),) CONFIGURE_ARGS+= --with-pdo-mysql=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --without-pdo-mysql endif - ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-pgsql),) + ifneq ($(CONFIG_PACKAGE_php5-mod-pdo-pgsql),) CONFIGURE_ARGS+= --with-pdo-pgsql=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --without-pdo-pgsql endif - ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pdo-sqlite),) + ifneq ($(CONFIG_PACKAGE_php5-mod-pdo-sqlite),) CONFIGURE_ARGS+= --with-pdo-sqlite=shared,"$(STAGING_DIR)/usr" + CONFIGURE_LIBS+= -lsqlite3 -lpthread else CONFIGURE_ARGS+= --without-pdo-sqlite endif @@ -328,73 +313,74 @@ else CONFIGURE_ARGS+= --disable-pdo endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-pgsql),) +ifneq ($(CONFIG_PACKAGE_php5-mod-pgsql),) CONFIGURE_ARGS+= --with-pgsql=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --without-pgsql endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-session),) +ifneq ($(CONFIG_PACKAGE_php5-mod-session),) CONFIGURE_ARGS+= --enable-session=shared else CONFIGURE_ARGS+= --disable-session endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-simplexml),) +ifneq ($(CONFIG_PACKAGE_php5-mod-simplexml),) CONFIGURE_ARGS+= --enable-simplexml=shared else CONFIGURE_ARGS+= --disable-simplexml endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-soap),) +ifneq ($(CONFIG_PACKAGE_php5-mod-soap),) CONFIGURE_ARGS+= --enable-soap=shared else CONFIGURE_ARGS+= --disable-soap endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sockets),) +ifneq ($(CONFIG_PACKAGE_php5-mod-sockets),) CONFIGURE_ARGS+= --enable-sockets=shared else CONFIGURE_ARGS+= --disable-sockets endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite),) +ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite),) CONFIGURE_ARGS+= --with-sqlite=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --without-sqlite endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sqlite3),) +ifneq ($(CONFIG_PACKAGE_php5-mod-sqlite3),) CONFIGURE_ARGS+= --with-sqlite3=shared,"$(STAGING_DIR)/usr" + CONFIGURE_LIBS+= -lsqlite3 -lpthread else CONFIGURE_ARGS+= --without-sqlite3 endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvmsg),) +ifneq ($(CONFIG_PACKAGE_php5-mod-sysvmsg),) CONFIGURE_ARGS+= --enable-sysvmsg=shared else CONFIGURE_ARGS+= --disable-sysvmsg endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvsem),) +ifneq ($(CONFIG_PACKAGE_php5-mod-sysvsem),) CONFIGURE_ARGS+= --enable-sysvsem=shared else CONFIGURE_ARGS+= --disable-sysvsem endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-sysvshm),) +ifneq ($(CONFIG_PACKAGE_php5-mod-sysvshm),) CONFIGURE_ARGS+= --enable-sysvshm=shared else CONFIGURE_ARGS+= --disable-sysvshm endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-tokenizer),) +ifneq ($(CONFIG_PACKAGE_php5-mod-tokenizer),) CONFIGURE_ARGS+= --enable-tokenizer=shared else CONFIGURE_ARGS+= --disable-tokenizer endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xml),) +ifneq ($(CONFIG_PACKAGE_php5-mod-xml),) CONFIGURE_ARGS+= --enable-xml=shared,"$(STAGING_DIR)/usr" ifneq ($(CONFIG_PHP5_LIBXML),) CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2" @@ -405,43 +391,31 @@ else CONFIGURE_ARGS+= --disable-xml endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlreader),) +ifneq ($(CONFIG_PACKAGE_php5-mod-xmlreader),) CONFIGURE_ARGS+= --enable-xmlreader=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --disable-xmlreader endif -ifneq ($(SDK)$(CONFIG_PACKAGE_php5-mod-xmlwriter),) +ifneq ($(CONFIG_PACKAGE_php5-mod-xmlwriter),) CONFIGURE_ARGS+= --enable-xmlwriter=shared,"$(STAGING_DIR)/usr" else CONFIGURE_ARGS+= --disable-xmlwriter endif -ifneq ($(CONFIG_PACKAGE_php5-mod-zip),) - CONFIGURE_ARGS+= --enable-zip=shared -else - CONFIGURE_ARGS+= --disable-zip -endif - -ifneq ($(SDK)$(CONFIG_PHP5_FILTER),) +ifneq ($(CONFIG_PHP5_FILTER),) CONFIGURE_ARGS+= --enable-filter else CONFIGURE_ARGS+= --disable-filter endif -ifneq ($(SDK)$(CONFIG_PHP5_LIBXML),) +ifneq ($(CONFIG_PHP5_LIBXML),) CONFIGURE_ARGS+= --enable-libxml CONFIGURE_ARGS+= --with-libxml-dir="$(STAGING_DIR)/usr/include/libxml2" else CONFIGURE_ARGS+= --disable-libxml endif -ifneq ($(CONFIG_PHP5_SYSTEMTZDATA),) - CONFIGURE_ARGS+= --with-system-tzdata -else - CONFIGURE_ARGS+= --without-system-tzdata -endif - CONFIGURE_VARS+= \ LIBS="$(CONFIGURE_LIBS)" \ ac_cv_c_bigendian_php=$(if $(CONFIG_BIG_ENDIAN),yes,no) \ @@ -470,19 +444,8 @@ define Package/php5-cgi/install endef define Package/php5-fastcgi/install - $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/php5-fastcgi.config $(1)/etc/config/php5-fastcgi - $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/php5-fastcgi.init $(1)/etc/init.d/php5-fastcgi -endef - -define Build/InstallDev - make -C $(PKG_BUILD_DIR) install INSTALL_ROOT=$(PKG_BUILD_DIR)/staging - rm -f $(PKG_BUILD_DIR)/staging/usr/bin/php - $(CP) $(PKG_BUILD_DIR)/staging/* $(STAGING_DIR_HOST) - sed -i -e "s#prefix='/usr'#prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize - sed -i -e "s#exec_prefix=\"\`eval echo /usr\`\"#exec_prefix='$(STAGING_DIR_HOST)/usr'#" $(STAGING_DIR_HOST)/usr/bin/phpize + $(INSTALL_BIN) ./files/php.init $(1)/etc/init.d/php endef define BuildModule @@ -518,7 +481,6 @@ $(eval $(call BuildModule,apc,APC,+PACKAGE_php5-mod-apc:librt)) $(eval $(call BuildModule,ctype,Ctype)) $(eval $(call BuildModule,curl,cURL,+PACKAGE_php5-mod-curl:libcurl)) $(eval $(call BuildModule,fileinfo,Fileinfo,+PACKAGE_php5-mod-fileinfo:libmagic)) -$(eval $(call BuildModule,dio,Direct IO)) $(eval $(call BuildModule,dom,DOM,+@PHP5_LIBXML +PACKAGE_php5-mod-dom:libxml2)) $(eval $(call BuildModule,exif,EXIF)) $(eval $(call BuildModule,ftp,FTP)) @@ -526,15 +488,12 @@ $(eval $(call BuildModule,gettext,Gettext,+PACKAGE_php5-mod-gettext:libintl-full $(eval $(call BuildModule,gd,GD graphics,+PACKAGE_php5-mod-gd:libgd)) $(eval $(call BuildModule,gmp,GMP,+PACKAGE_php5-mod-gmp:libgmp)) $(eval $(call BuildModule,hash,Hash)) -$(eval $(call BuildModule,http,HTTP,+PACKAGE_php5-mod-http:libcurl +PACKAGE_php5-mod-http:librt)) $(eval $(call BuildModule,iconv,iConv,+PACKAGE_php5-mod-iconv:libiconv)) $(eval $(call BuildModule,json,JSON)) $(eval $(call BuildModule,ldap,LDAP,+PACKAGE_php5-mod-ldap:libopenldap +PACKAGE_php5-mod-ldap:libsasl2)) -$(eval $(call BuildModule,libevent,libevent,+PACKAGE_php5-mod-libevent:libevent)) $(eval $(call BuildModule,mbstring,MBString)) $(eval $(call BuildModule,mcrypt,Mcrypt,+PACKAGE_php5-mod-mcrypt:libmcrypt +PACKAGE_php5-mod-mcrypt:libltdl)) $(eval $(call BuildModule,mysql,MySQL,+PACKAGE_php5-mod-mysql:libmysqlclient)) -$(eval $(call BuildModule,mysqli,MySQL Improved Extension,+PACKAGE_php5-mod-mysqli:libmysqlclient)) $(eval $(call BuildModule,openssl,OpenSSL,+PACKAGE_php5-mod-openssl:libopenssl)) $(eval $(call BuildModule,pcntl,PCNTL)) $(eval $(call BuildModule,pdo,PHP Data Objects)) @@ -555,4 +514,3 @@ $(eval $(call BuildModule,tokenizer,Tokenizer)) $(eval $(call BuildModule,xml,XML,+PHP5_LIBXML:libxml2 +!PHP5_LIBXML:libexpat)) $(eval $(call BuildModule,xmlreader,XMLReader,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlreader:libxml2 +PACKAGE_php5-mod-xmlreader:libiconv)) $(eval $(call BuildModule,xmlwriter,XMLWriter,+@PHP5_LIBXML +PACKAGE_php5-mod-xmlwriter:libxml2 +PACKAGE_php5-mod-xmlwriter:libiconv)) -$(eval $(call BuildModule,zip,ZIP,+PACKAGE_php5-mod-zip:zlib)) diff --git a/lang/php5/files/php.init b/lang/php5/files/php.init new file mode 100644 index 0000000000..2b8e4d96a5 --- /dev/null +++ b/lang/php5/files/php.init @@ -0,0 +1,16 @@ +#!/bin/sh /etc/rc.common +# Copyright (C) 2010 OpenWrt.org + +START=50 + +export PHP_FCGI_CHILDREN='' +PORT=1026 +BIN=/usr/bin/php-fcgi + +start() { + $BIN -b $PORT & +} + +stop() { + kill `pidof php-fcgi` +} diff --git a/lang/php5/files/php5-fastcgi.config b/lang/php5/files/php5-fastcgi.config deleted file mode 100644 index 039d3bbc53..0000000000 --- a/lang/php5/files/php5-fastcgi.config +++ /dev/null @@ -1,3 +0,0 @@ -config php5-fastcgi - option enabled 1 - option port '1026' diff --git a/lang/php5/files/php5-fastcgi.init b/lang/php5/files/php5-fastcgi.init deleted file mode 100644 index 0c452ad273..0000000000 --- a/lang/php5/files/php5-fastcgi.init +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/sh /etc/rc.common -# Copyright (C) 2010-2011 OpenWrt.org - -START=50 - -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 - -start_instance() { - local section="$1" - local enabled - local port - - config_get_bool enabled "$section" 'enabled' 0 - config_get port "$section" 'port' 1026 - - [ $enabled -gt 0 ] || return 1 - - PHP_FCGI_CHILDREN='' \ - service_start /usr/bin/php-fcgi -b $port -} - -start() { - config_load 'php5-fastcgi' - config_foreach start_instance 'php5-fastcgi' -} - -stop() { - service_stop /usr/bin/php-fcgi -} diff --git a/lang/php5/patches/010-PECL-dio.patch b/lang/php5/patches/010-PECL-dio.patch deleted file mode 100644 index 40867ed848..0000000000 --- a/lang/php5/patches/010-PECL-dio.patch +++ /dev/null @@ -1,3473 +0,0 @@ ---- /dev/null -+++ b/ext/dio/config.m4 -@@ -0,0 +1,10 @@ -+dnl -+dnl $Id: config.m4 291957 2009-12-10 17:13:14Z cyberspice $ -+dnl -+ -+PHP_ARG_ENABLE(dio, whether to enable direct I/O support, -+[ --enable-dio Enable direct I/O support]) -+ -+if test "$PHP_DIO" != "no"; then -+ PHP_NEW_EXTENSION(dio, dio.c dio_common.c dio_posix.c dio_stream_wrappers.c, $ext_shared) -+fi ---- /dev/null -+++ b/ext/dio/dio.c -@@ -0,0 +1,801 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 1997-2009 The PHP Group | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Sterling Hughes | -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "php.h" -+#include "php_ini.h" -+#include "ext/standard/info.h" -+ -+#include "php_dio.h" -+#include "php_dio_stream_wrappers.h" -+ -+#include -+#include -+ -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+#ifndef PHP_WIN32 -+#include -+#endif -+ -+/* e.g. IRIX does not have CRTSCTS */ -+#ifndef CRTSCTS -+# ifdef CNEW_RTSCTS -+# define CRTSCTS CNEW_RTSCTS -+# else -+# define CRTSCTS 0 -+# endif /* CNEW_RTSCTS */ -+#endif /* !CRTSCTS */ -+ -+/* -+ +----------------------------------------------------------------------+ -+ | DEPRECATED FUNCTIONALITY | -+ +----------------------------------------------------------------------+ -+ | The functions below are from the earlier DIO versions. They will | -+ | continue to be maintained but not extended. It is thoroughly | -+ | recommended that you should use either the stream wrappers or the | -+ | DIO classes in new code. - Melanie | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#define le_fd_name "Direct I/O File Descriptor" -+static int le_fd; -+ -+static int new_php_fd(php_fd_t **f, int fd) -+{ -+ if (!(*f = malloc(sizeof(php_fd_t)))) { -+ return 0; -+ } -+ (*f)->fd = fd; -+ return 1; -+} -+ -+static void _dio_close_fd(zend_rsrc_list_entry *rsrc TSRMLS_DC) -+{ -+ php_fd_t *f = (php_fd_t *) rsrc->ptr; -+ if (f) { -+ close(f->fd); -+ free(f); -+ } -+} -+ -+/* {{{ proto resource dio_open(string filename, int flags[, int mode]) -+ Open a new filename with specified permissions of flags and creation permissions of mode */ -+PHP_FUNCTION(dio_open) -+{ -+ php_fd_t *f; -+ char *file_name; -+ int file_name_length; -+ long flags; -+ long mode = 0; -+ int fd; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl|l", &file_name, &file_name_length, &flags, &mode) == FAILURE) { -+ return; -+ } -+ -+ if (php_check_open_basedir(file_name TSRMLS_CC) || (PG(safe_mode) && !php_checkuid(file_name, "wb+", CHECKUID_CHECK_MODE_PARAM))) { -+ RETURN_FALSE; -+ } -+ -+ if (ZEND_NUM_ARGS() == 3) { -+ fd = open(file_name, flags, mode); -+ } else { -+ fd = open(file_name, flags); -+ } -+ -+ if (fd == -1) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot open file %s with flags %ld and permissions %ld: %s", file_name, flags, mode, strerror(errno)); -+ RETURN_FALSE; -+ } -+ -+ -+ if (!new_php_fd(&f, fd)) { -+ RETURN_FALSE; -+ } -+ ZEND_REGISTER_RESOURCE(return_value, f, le_fd); -+} -+/* }}} */ -+ -+/* {{{ proto string dio_read(resource fd[, int n]) -+ Read n bytes from fd and return them, if n is not specified, read 1k */ -+PHP_FUNCTION(dio_read) -+{ -+ zval *r_fd; -+ php_fd_t *f; -+ char *data; -+ long bytes = 1024; -+ ssize_t res; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &r_fd, &bytes) == FAILURE) { -+ return; -+ } -+ -+ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); -+ -+ if (bytes <= 0) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Length parameter must be greater than 0."); -+ RETURN_FALSE; -+ } -+ -+ data = emalloc(bytes + 1); -+ res = read(f->fd, data, bytes); -+ if (res <= 0) { -+ efree(data); -+ RETURN_NULL(); -+ } -+ -+ data = erealloc(data, res + 1); -+ data[res] = 0; -+ -+ RETURN_STRINGL(data, res, 0); -+} -+/* }}} */ -+ -+/* {{{ proto int dio_write(resource fd, string data[, int len]) -+ Write data to fd with optional truncation at length */ -+PHP_FUNCTION(dio_write) -+{ -+ zval *r_fd; -+ php_fd_t *f; -+ char *data; -+ int data_len; -+ long trunc_len = 0; -+ ssize_t res; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &r_fd, &data, &data_len, &trunc_len) == FAILURE) { -+ return; -+ } -+ -+ if (trunc_len < 0 || trunc_len > data_len) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "length must be greater or equal to zero and less then the length of the specified string."); -+ RETURN_FALSE; -+ } -+ -+ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); -+ -+ res = write(f->fd, data, trunc_len ? trunc_len : data_len); -+ if (res == -1) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot write data to file descriptor %d, %s", f->fd, strerror(errno)); -+ } -+ -+ RETURN_LONG(res); -+} -+/* }}} */ -+ -+#ifndef PHP_WIN32 -+ -+/* {{{ proto bool dio_truncate(resource fd, int offset) -+ Truncate file descriptor fd to offset bytes */ -+PHP_FUNCTION(dio_truncate) -+{ -+ zval *r_fd; -+ php_fd_t *f; -+ long offset; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &r_fd, &offset) == FAILURE) { -+ return; -+ } -+ -+ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); -+ -+ if (ftruncate(f->fd, offset) == -1) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "couldn't truncate %d to %ld bytes: %s", f->fd, offset, strerror(errno)); -+ RETURN_FALSE; -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+#endif -+ -+#define ADD_FIELD(f, v) add_assoc_long_ex(return_value, (f), sizeof(f), v); -+ -+/* {{{ proto array dio_stat(resource fd) -+ Get stat information about the file descriptor fd */ -+PHP_FUNCTION(dio_stat) -+{ -+ zval *r_fd; -+ php_fd_t *f; -+ struct stat s; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &r_fd) == FAILURE) { -+ return; -+ } -+ -+ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); -+ -+ if (fstat(f->fd, &s) == -1) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "cannot stat %d: %s", f->fd, strerror(errno)); -+ RETURN_FALSE; -+ } -+ -+ array_init(return_value); -+ ADD_FIELD("device", s.st_dev); -+ ADD_FIELD("inode", s.st_ino); -+ ADD_FIELD("mode", s.st_mode); -+ ADD_FIELD("nlink", s.st_nlink); -+ ADD_FIELD("uid", s.st_uid); -+ ADD_FIELD("gid", s.st_gid); -+ ADD_FIELD("device_type", s.st_rdev); -+ ADD_FIELD("size", s.st_size); -+#ifndef PHP_WIN32 -+ ADD_FIELD("block_size", s.st_blksize); -+ ADD_FIELD("blocks", s.st_blocks); -+#endif -+ ADD_FIELD("atime", s.st_atime); -+ ADD_FIELD("mtime", s.st_mtime); -+ ADD_FIELD("ctime", s.st_ctime); -+} -+/* }}} */ -+ -+/* {{{ proto int dio_seek(resource fd, int pos, int whence) -+ Seek to pos on fd from whence */ -+PHP_FUNCTION(dio_seek) -+{ -+ zval *r_fd; -+ php_fd_t *f; -+ long offset; -+ long whence = SEEK_SET; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|l", &r_fd, &offset, &whence) == FAILURE) { -+ return; -+ } -+ -+ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); -+ -+ RETURN_LONG(lseek(f->fd, offset, whence)); -+} -+/* }}} */ -+ -+#ifndef PHP_WIN32 -+ -+/* {{{ proto mixed dio_fcntl(resource fd, int cmd[, mixed arg]) -+ Perform a c library fcntl on fd */ -+PHP_FUNCTION(dio_fcntl) -+{ -+ zval *r_fd; -+ zval *arg = NULL; -+ php_fd_t *f; -+ long cmd; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl|z", &r_fd, &cmd, &arg) == FAILURE) { -+ return; -+ } -+ -+ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); -+ -+ switch (cmd) { -+ case F_SETLK: -+ case F_SETLKW: { -+ zval **element; -+ struct flock lk = {0}; -+ HashTable *fh; -+ -+ if (!arg) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be array or int, none given"); -+ RETURN_FALSE; -+ } -+ if (Z_TYPE_P(arg) == IS_ARRAY) { -+ fh = HASH_OF(arg); -+ if (zend_hash_find(fh, "start", sizeof("start"), (void **) &element) == FAILURE) { -+ lk.l_start = 0; -+ } else { -+ lk.l_start = Z_LVAL_PP(element); -+ } -+ -+ if (zend_hash_find(fh, "length", sizeof("length"), (void **) &element) == FAILURE) { -+ lk.l_len = 0; -+ } else { -+ lk.l_len = Z_LVAL_PP(element); -+ } -+ -+ if (zend_hash_find(fh, "whence", sizeof("whence"), (void **) &element) == FAILURE) { -+ lk.l_whence = 0; -+ } else { -+ lk.l_whence = Z_LVAL_PP(element); -+ } -+ -+ if (zend_hash_find(fh, "type", sizeof("type"), (void **) &element) == FAILURE) { -+ lk.l_type = 0; -+ } else { -+ lk.l_type = Z_LVAL_PP(element); -+ } -+ } else if (Z_TYPE_P(arg) == IS_LONG) { -+ lk.l_start = 0; -+ lk.l_len = 0; -+ lk.l_whence = SEEK_SET; -+ lk.l_type = Z_LVAL_P(arg); -+ } else { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be array or int, %s given", zend_zval_type_name(arg)); -+ RETURN_FALSE; -+ } -+ -+ RETURN_LONG(fcntl(f->fd, cmd, &lk)); -+ break; -+ } -+ case F_GETLK: { -+ struct flock lk = {0}; -+ -+ fcntl(f->fd, cmd, &lk); -+ -+ array_init(return_value); -+ add_assoc_long(return_value, "type", lk.l_type); -+ add_assoc_long(return_value, "whence", lk.l_whence); -+ add_assoc_long(return_value, "start", lk.l_start); -+ add_assoc_long(return_value, "length", lk.l_len); -+ add_assoc_long(return_value, "pid", lk.l_pid); -+ -+ break; -+ } -+ case F_DUPFD: { -+ php_fd_t *new_f; -+ -+ if (!arg || Z_TYPE_P(arg) != IS_LONG) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be int"); -+ RETURN_FALSE; -+ } -+ -+ if (!new_php_fd(&new_f, fcntl(f->fd, cmd, Z_LVAL_P(arg)))) { -+ RETURN_FALSE; -+ } -+ ZEND_REGISTER_RESOURCE(return_value, new_f, le_fd); -+ break; -+ } -+ default: -+ if (!arg || Z_TYPE_P(arg) != IS_LONG) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "expects argument 3 to be int"); -+ RETURN_FALSE; -+ } -+ -+ RETURN_LONG(fcntl(f->fd, cmd, Z_LVAL_P(arg))); -+ } -+} -+/* }}} */ -+#endif -+ -+#ifndef PHP_WIN32 -+ -+/* {{{ proto mixed dio_tcsetattr(resource fd, array args ) -+ Perform a c library tcsetattr on fd */ -+PHP_FUNCTION(dio_tcsetattr) -+{ -+ zval *r_fd; -+ zval *arg = NULL; -+ php_fd_t *f; -+ struct termios newtio; -+ int Baud_Rate, Data_Bits=8, Stop_Bits=1, Parity=0, Flow_Control=1, Is_Canonical=1; -+ long BAUD,DATABITS,STOPBITS,PARITYON,PARITY; -+ HashTable *fh; -+ zval **element; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz", &r_fd, &arg) == FAILURE) { -+ return; -+ } -+ -+ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); -+ -+ if (Z_TYPE_P(arg) != IS_ARRAY) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"tcsetattr, third argument should be an associative array"); -+ return; -+ } -+ -+ fh = HASH_OF(arg); -+ -+ if (zend_hash_find(fh, "baud", sizeof("baud"), (void **) &element) == FAILURE) { -+ Baud_Rate = 9600; -+ } else { -+ Baud_Rate = Z_LVAL_PP(element); -+ } -+ -+ if (zend_hash_find(fh, "bits", sizeof("bits"), (void **) &element) == FAILURE) { -+ Data_Bits = 8; -+ } else { -+ Data_Bits = Z_LVAL_PP(element); -+ } -+ -+ if (zend_hash_find(fh, "stop", sizeof("stop"), (void **) &element) == FAILURE) { -+ Stop_Bits = 1; -+ } else { -+ Stop_Bits = Z_LVAL_PP(element); -+ } -+ -+ if (zend_hash_find(fh, "parity", sizeof("parity"), (void **) &element) == FAILURE) { -+ Parity = 0; -+ } else { -+ Parity = Z_LVAL_PP(element); -+ } -+ -+ if (zend_hash_find(fh, "flow_control", sizeof("flow_control"), (void **) &element) == FAILURE) { -+ Flow_Control = 1; -+ } else { -+ Flow_Control = Z_LVAL_PP(element); -+ } -+ -+ if (zend_hash_find(fh, "is_canonical", sizeof("is_canonical"), (void **) &element) == FAILURE) { -+ Is_Canonical = 1; -+ } else { -+ Is_Canonical = Z_LVAL_PP(element); -+ } -+ -+ /* assign to correct values... */ -+ switch (Baud_Rate) { -+ case 38400: -+ BAUD = B38400; -+ break; -+ case 19200: -+ BAUD = B19200; -+ break; -+ case 9600: -+ BAUD = B9600; -+ break; -+ case 4800: -+ BAUD = B4800; -+ break; -+ case 2400: -+ BAUD = B2400; -+ break; -+ case 1800: -+ BAUD = B1800; -+ break; -+ case 1200: -+ BAUD = B1200; -+ break; -+ case 600: -+ BAUD = B600; -+ break; -+ case 300: -+ BAUD = B300; -+ break; -+ case 200: -+ BAUD = B200; -+ break; -+ case 150: -+ BAUD = B150; -+ break; -+ case 134: -+ BAUD = B134; -+ break; -+ case 110: -+ BAUD = B110; -+ break; -+ case 75: -+ BAUD = B75; -+ break; -+ case 50: -+ BAUD = B50; -+ break; -+ default: -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid baud rate %d", Baud_Rate); -+ RETURN_FALSE; -+ } -+ switch (Data_Bits) { -+ case 8: -+ DATABITS = CS8; -+ break; -+ case 7: -+ DATABITS = CS7; -+ break; -+ case 6: -+ DATABITS = CS6; -+ break; -+ case 5: -+ DATABITS = CS5; -+ break; -+ default: -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data bits %d", Data_Bits); -+ RETURN_FALSE; -+ } -+ switch (Stop_Bits) { -+ case 1: -+ STOPBITS = 0; -+ break; -+ case 2: -+ STOPBITS = CSTOPB; -+ break; -+ default: -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid stop bits %d", Stop_Bits); -+ RETURN_FALSE; -+ } -+ -+ switch (Parity) { -+ case 0: -+ PARITYON = 0; -+ PARITY = 0; -+ break; -+ case 1: -+ PARITYON = PARENB; -+ PARITY = PARODD; -+ break; -+ case 2: -+ PARITYON = PARENB; -+ PARITY = 0; -+ break; -+ default: -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid parity %d", Parity); -+ RETURN_FALSE; -+ } -+ -+ memset(&newtio, 0, sizeof(newtio)); -+ tcgetattr(f->fd, &newtio); -+ -+ if (Is_Canonical) { -+ newtio.c_iflag = IGNPAR | ICRNL; -+ newtio.c_oflag = 0; -+ newtio.c_lflag = ICANON; -+ } else { -+ cfmakeraw(&newtio); -+ } -+ -+ newtio.c_cflag = BAUD | DATABITS | STOPBITS | PARITYON | PARITY | CLOCAL | CREAD; -+ -+#ifdef CRTSCTS -+ if (Flow_Control) { -+ newtio.c_cflag |= CRTSCTS; -+ } -+#endif -+ -+ if (Is_Canonical) -+ -+ newtio.c_cc[VMIN] = 1; -+ newtio.c_cc[VTIME] = 0; -+ tcflush(f->fd, TCIFLUSH); -+ tcsetattr(f->fd,TCSANOW,&newtio); -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+#endif -+ -+/* {{{ proto void dio_close(resource fd) -+ Close the file descriptor given by fd */ -+PHP_FUNCTION(dio_close) -+{ -+ zval *r_fd; -+ php_fd_t *f; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &r_fd) == FAILURE) { -+ return; -+ } -+ -+ ZEND_FETCH_RESOURCE(f, php_fd_t *, &r_fd, -1, le_fd_name, le_fd); -+ -+ zend_list_delete(Z_LVAL_P(r_fd)); -+} -+/* }}} */ -+ -+#define RDIOC(c) REGISTER_LONG_CONSTANT(#c, c, CONST_CS | CONST_PERSISTENT) -+ -+/* {{{ dio_init_legacy_defines -+ * Initialises the legacy PHP defines -+ */ -+static void dio_init_legacy_defines(int module_number TSRMLS_DC) { -+ RDIOC(O_RDONLY); -+ RDIOC(O_WRONLY); -+ RDIOC(O_RDWR); -+ RDIOC(O_CREAT); -+ RDIOC(O_EXCL); -+ RDIOC(O_TRUNC); -+ RDIOC(O_APPEND); -+#ifdef O_NONBLOCK -+ RDIOC(O_NONBLOCK); -+#endif -+#ifdef O_NDELAY -+ RDIOC(O_NDELAY); -+#endif -+#ifdef O_SYNC -+ RDIOC(O_SYNC); -+#endif -+#ifdef O_ASYNC -+ RDIOC(O_ASYNC); -+#endif -+#ifdef O_NOCTTY -+ RDIOC(O_NOCTTY); -+#endif -+#ifndef PHP_WIN32 -+ RDIOC(S_IRWXU); -+ RDIOC(S_IRUSR); -+ RDIOC(S_IWUSR); -+ RDIOC(S_IXUSR); -+ RDIOC(S_IRWXG); -+ RDIOC(S_IRGRP); -+ RDIOC(S_IWGRP); -+ RDIOC(S_IXGRP); -+ RDIOC(S_IRWXO); -+ RDIOC(S_IROTH); -+ RDIOC(S_IWOTH); -+ RDIOC(S_IXOTH); -+ RDIOC(F_DUPFD); -+ RDIOC(F_GETFD); -+ RDIOC(F_GETFL); -+ RDIOC(F_SETFL); -+ RDIOC(F_GETLK); -+ RDIOC(F_SETLK); -+ RDIOC(F_SETLKW); -+ RDIOC(F_SETOWN); -+ RDIOC(F_GETOWN); -+ RDIOC(F_UNLCK); -+ RDIOC(F_RDLCK); -+ RDIOC(F_WRLCK); -+#endif -+} -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_open_args, 0, 0, 2) -+ ZEND_ARG_INFO(0, filename) -+ ZEND_ARG_INFO(0, flags) -+ ZEND_ARG_INFO(0, mode) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_read_args, 0, 0, 1) -+ ZEND_ARG_INFO(0, fd) -+ ZEND_ARG_INFO(0, n) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_write_args, 0, 0, 2) -+ ZEND_ARG_INFO(0, fd) -+ ZEND_ARG_INFO(0, data) -+ ZEND_ARG_INFO(0, len) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_stat_args, 0, 0, 1) -+ ZEND_ARG_INFO(0, fd) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_truncate_args, 0, 0, 2) -+ ZEND_ARG_INFO(0, fd) -+ ZEND_ARG_INFO(0, offset) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_seek_args, 0, 0, 3) -+ ZEND_ARG_INFO(0, fd) -+ ZEND_ARG_INFO(0, pos) -+ ZEND_ARG_INFO(0, whence) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_fcntl_args, 0, 0, 2) -+ ZEND_ARG_INFO(0, fd) -+ ZEND_ARG_INFO(0, cmd) -+ ZEND_ARG_INFO(0, arg) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_tcsetattr_args, 0, 0, 2) -+ ZEND_ARG_INFO(0, fd) -+ ZEND_ARG_INFO(0, args) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_close_args, 0, 0, 1) -+ ZEND_ARG_INFO(0, fd) -+ZEND_END_ARG_INFO() -+ -+/* -+ +----------------------------------------------------------------------+ -+ | END OF DEPRECATED FUNCTIONALITY | -+ +----------------------------------------------------------------------+ -+ */ -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_raw_args, 0, 0, 2) -+ ZEND_ARG_INFO(0, filename) -+ ZEND_ARG_INFO(0, mode) -+ ZEND_ARG_INFO(0, options) -+ZEND_END_ARG_INFO() -+ -+ZEND_BEGIN_ARG_INFO_EX(dio_serial_args, 0, 0, 2) -+ ZEND_ARG_INFO(0, filename) -+ ZEND_ARG_INFO(0, mode) -+ ZEND_ARG_INFO(0, options) -+ZEND_END_ARG_INFO() -+ -+static zend_object_handlers dio_raw_object_handlers; -+ -+static function_entry dio_functions[] = { -+ /* Class functions. */ -+ -+ /* Legacy functions (Deprecated - See dio_legacy.c) */ -+ PHP_FE(dio_open, dio_open_args) -+#ifndef PHP_WIN32 -+ PHP_FE(dio_truncate, dio_truncate_args) -+#endif -+ PHP_FE(dio_stat, dio_stat_args) -+ PHP_FE(dio_seek, dio_seek_args) -+#ifndef PHP_WIN32 -+ PHP_FE(dio_fcntl, dio_fcntl_args) -+#endif -+ PHP_FE(dio_read, dio_read_args) -+ PHP_FE(dio_write, dio_write_args) -+ PHP_FE(dio_close, dio_close_args) -+#ifndef PHP_WIN32 -+ PHP_FE(dio_tcsetattr, dio_tcsetattr_args) -+#endif -+ -+ /* Stream functions */ -+ PHP_FE(dio_raw, dio_raw_args) -+ PHP_FE(dio_serial, dio_serial_args) -+ -+ /* End of functions */ -+ {NULL, NULL, NULL} -+}; -+ -+zend_module_entry dio_module_entry = { -+ STANDARD_MODULE_HEADER, -+ "dio", -+ dio_functions, -+ PHP_MINIT(dio), -+ NULL, -+ NULL, -+ NULL, -+ PHP_MINFO(dio), -+ PHP_DIO_VERSION, -+ STANDARD_MODULE_PROPERTIES -+}; -+ -+#ifdef COMPILE_DL_DIO -+ZEND_GET_MODULE(dio) -+#endif -+ -+#define DIO_UNDEF_CONST -1 -+ -+/* {{{ PHP_MINIT_FUNCTION -+ */ -+PHP_MINIT_FUNCTION(dio) -+{ -+ /* Legacy resource destructor. */ -+ le_fd = zend_register_list_destructors_ex(_dio_close_fd, NULL, le_fd_name, module_number); -+ -+ dio_init_legacy_defines(module_number TSRMLS_CC); -+ -+ /* Register the stream wrappers */ -+ return (php_register_url_stream_wrapper(DIO_RAW_STREAM_NAME, &php_dio_raw_stream_wrapper TSRMLS_CC) == SUCCESS && -+ php_register_url_stream_wrapper(DIO_SERIAL_STREAM_NAME, &php_dio_serial_stream_wrapper TSRMLS_CC) == SUCCESS) ? SUCCESS : FAILURE; -+} -+/* }}} */ -+ -+/* {{{ PHP_MSHUTDOWN_FUNCTION -+ */ -+PHP_MSHUTDOWN_FUNCTION(dio) -+{ -+ return (php_unregister_url_stream_wrapper(DIO_RAW_STREAM_NAME TSRMLS_CC) == SUCCESS && -+ php_unregister_url_stream_wrapper(DIO_SERIAL_STREAM_NAME TSRMLS_CC) == SUCCESS) ? SUCCESS : FAILURE; -+} -+/* }}} */ -+ -+/* {{{ PHP_MINFO_FUNCTION -+ */ -+PHP_MINFO_FUNCTION(dio) -+{ -+ php_info_print_table_start(); -+ php_info_print_table_header(2, "dio support", "enabled"); -+ php_info_print_table_row(2, "version", PHP_DIO_VERSION); -+ php_info_print_table_end(); -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ ---- /dev/null -+++ b/ext/dio/dio_common.c -@@ -0,0 +1,230 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 2009 Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "php.h" -+ -+#include "php_dio.h" -+#include "php_dio_common.h" -+ -+/* {{{ dio_init_stream_data -+ * Initialises the command parts of the stream data. -+ */ -+void dio_init_stream_data(php_dio_stream_data *data) { -+ data->stream_type = DIO_STREAM_TYPE_NONE; -+ data->end_of_file = 0; -+#ifdef DIO_HAS_FILEPERMS -+ data->has_perms = 0; -+ data->perms = 0; -+#endif -+#ifdef DIO_NONBLOCK -+ data->is_blocking = 1; -+ data->has_timeout = 0; -+ data->timeout_sec = 0; -+ data->timeout_usec = 0; -+ data->timed_out = 0; -+#endif -+ /* Serial options */ -+ data->data_rate = 9600; -+ data->data_bits = 8; -+ data->stop_bits = 1; -+ data->parity = 0; -+ data->flow_control = 1; -+ data->canonical = 1; -+} -+/* }}} */ -+ -+/* {{{ dio_convert_to_long -+ * Returns as a long, the value of the zval regardless of its type. -+ */ -+long dio_convert_to_long(zval *val) { -+ zval *copyval; -+ long longval; -+ -+ ALLOC_INIT_ZVAL(copyval); -+ *copyval = *val; -+ convert_to_long(copyval); -+ longval = Z_LVAL_P(copyval); -+ zval_ptr_dtor(©val); -+ -+ return longval; -+} -+/* }}} */ -+ -+/* {{{ dio_assoc_array_get_basic_options -+ * Retrieves the basic open option values from an associative array -+ */ -+void dio_assoc_array_get_basic_options(zval *options, php_dio_stream_data *data TSRMLS_DC) { -+#if defined(DIO_HAS_FILEPERMS) || defined(DIO_NONBLOCK) -+ zval **tmpzval; -+ HashTable *opthash; -+ -+ opthash = HASH_OF(options); -+#endif -+ -+#ifdef DIO_HAS_FILEPERMS -+ /* This is the file mode flags used by open(). */ -+ if (zend_hash_find(opthash, "perms", sizeof("perms"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->perms = (int)dio_convert_to_long(*tmpzval); -+ data->has_perms = 1; -+ } -+#endif -+ -+#ifdef DIO_NONBLOCK -+ /* This sets the underlying stream to be blocking/non -+ block (i.e. O_NONBLOCK) */ -+ if (zend_hash_find(opthash, "is_blocking", sizeof("is_blocking"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->is_blocking = dio_convert_to_long(*tmpzval) ? 1 : 0; -+ } -+ -+ /* This is the timeout value for reads in seconds. Only one of -+ timeout_secs or timeout_usecs need be defined to define a timeout. */ -+ if (zend_hash_find(opthash, "timeout_secs", sizeof("timeout_secs"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->timeout_sec = dio_convert_to_long(*tmpzval); -+ } -+ -+ /* This is the timeout value for reads in microseconds. Only one of -+ timeout_secs or timeout_usecs need be defined to define a timeout. */ -+ if (zend_hash_find(opthash, "timeout_usecs", sizeof("timeout_usecs"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->timeout_usec = dio_convert_to_long(*tmpzval); -+ } -+ -+ data->has_timeout = (data->timeout_sec | data->timeout_usec) ? 1 : 0; -+#endif -+} -+/* }}} */ -+ -+/* {{{ dio_assoc_array_get_serial_options -+ * Retrieves the serial open option values from an associative array -+ */ -+void dio_assoc_array_get_serial_options(zval *options, php_dio_stream_data *data TSRMLS_DC) { -+ zval **tmpzval; -+ HashTable *opthash; -+ -+ opthash = HASH_OF(options); -+ -+ if (zend_hash_find(opthash, "data_rate", sizeof("data_rate"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->data_rate = dio_convert_to_long(*tmpzval); -+ } -+ -+ if (zend_hash_find(opthash, "data_bits", sizeof("data_bits"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->data_bits = (int)dio_convert_to_long(*tmpzval); -+ } -+ -+ if (zend_hash_find(opthash, "stop_bits", sizeof("stop_bits"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->stop_bits = (int)dio_convert_to_long(*tmpzval); -+ } -+ -+ if (zend_hash_find(opthash, "parity", sizeof("parity"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->parity = (int)dio_convert_to_long(*tmpzval); -+ } -+ -+ if (zend_hash_find(opthash, "flow_control", sizeof("flow_control"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->flow_control = (int)(dio_convert_to_long(*tmpzval) ? 1 : 0); -+ } -+ -+ if (zend_hash_find(opthash, "is_canonical", sizeof("is_canonical"), (void **)&tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->canonical = (int)(dio_convert_to_long(*tmpzval) ? 1 : 0); -+ } -+} -+/* }}} */ -+ -+/* {{{ dio_stream_context_get_raw_options -+ * Extracts the option values for dio.raw mode from a context -+ */ -+void dio_stream_context_get_basic_options(php_stream_context *context, php_dio_stream_data *data TSRMLS_DC) { -+#if defined(DIO_HAS_FILEPERMS) || defined(DIO_NONBLOCK) -+ zval **tmpzval; -+#endif -+ -+#ifdef DIO_HAS_FILEPERMS -+ /* This is the file mode flags used by open(). */ -+ if (php_stream_context_get_option(context, "dio", "perms", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->perms = (int)dio_convert_to_long(*tmpzval); -+ data->has_perms = 1; -+ } -+#endif -+ -+#ifdef DIO_NONBLOCK -+ /* This sets the underlying stream to be blocking/non -+ block (i.e. O_NONBLOCK) */ -+ if (php_stream_context_get_option(context, "dio", "is_blocking", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->is_blocking = dio_convert_to_long(*tmpzval) ? 1 : 0; -+ } -+ -+ /* This is the timeout value for reads in seconds. Only one of -+ timeout_secs or timeout_usecs need be defined to define a timeout. */ -+ if (php_stream_context_get_option(context, "dio", "timeout_secs", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->timeout_sec = dio_convert_to_long(*tmpzval); -+ } -+ -+ /* This is the timeout value for reads in microseconds. Only one of -+ timeout_secs or timeout_usecs need be defined to define a timeout. */ -+ if (php_stream_context_get_option(context, "dio", "timeout_usecs", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->timeout_usec = dio_convert_to_long(*tmpzval); -+ } -+ -+ data->has_timeout = (data->timeout_sec | data->timeout_usec) ? 1 : 0; -+#endif -+} -+/* }}} */ -+ -+/* {{{ dio_stream_context_get_serial_options -+ * Extracts the option values for dio.serial mode from a context -+ */ -+void dio_stream_context_get_serial_options(php_stream_context *context, php_dio_stream_data *data TSRMLS_DC) { -+ zval **tmpzval; -+ -+ if (php_stream_context_get_option(context, "dio", "data_rate", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->data_rate = dio_convert_to_long(*tmpzval); -+ } -+ -+ if (php_stream_context_get_option(context, "dio", "data_bits", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->data_bits = (int)dio_convert_to_long(*tmpzval); -+ } -+ -+ if (php_stream_context_get_option(context, "dio", "stop_bits", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->stop_bits = (int)dio_convert_to_long(*tmpzval); -+ } -+ -+ if (php_stream_context_get_option(context, "dio", "parity", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->parity = (int)dio_convert_to_long(*tmpzval); -+ } -+ -+ if (php_stream_context_get_option(context, "dio", "flow_control", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->flow_control = (int)(dio_convert_to_long(*tmpzval) ? 1 : 0); -+ } -+ -+ if (php_stream_context_get_option(context, "dio", "is_canonical", &tmpzval) == SUCCESS && tmpzval && *tmpzval) { -+ data->canonical = (int)(dio_convert_to_long(*tmpzval) ? 1 : 0); -+ } -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ -+ ---- /dev/null -+++ b/ext/dio/dio_posix.c -@@ -0,0 +1,659 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 2009 Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "php.h" -+ -+#include "php_dio_common.h" -+ -+/* {{{ dio_stream_mode_to_flags -+ * Convert an fopen() mode string to open() flags -+ */ -+static int dio_stream_mode_to_flags(const char *mode) { -+ int flags = 0, ch = 0, bin = 1; -+ -+ switch(mode[ch++]) { -+ case 'r': -+ flags = 0; -+ break; -+ case 'w': -+ flags = O_TRUNC | O_CREAT; -+ break; -+ case 'a': -+ flags = O_APPEND | O_CREAT; -+ break; -+ case 'x': -+ flags = O_EXCL | O_CREAT; -+ break; -+ } -+ -+ if (mode[ch] != '+') { -+ bin = (mode[ch++] == 'b'); -+ } -+ -+ if (mode[ch] == '+') { -+ flags |= O_RDWR; -+ } else if (flags) { -+ flags |= O_WRONLY; -+ } else { -+ flags |= O_RDONLY; -+ } -+ -+#if defined(_O_TEXT) && defined(O_BINARY) -+ if (bin) { -+ flags |= O_BINARY; -+ } else { -+ flags |= _O_TEXT; -+ } -+#endif -+ -+ return flags; -+} -+/* }}} */ -+ -+/* {{{ dio_data_rate_to_define -+ * Converts a numeric data rate to a termios define -+ */ -+static int dio_data_rate_to_define(long rate, speed_t *def) { -+ speed_t val; -+ -+ switch (rate) { -+ case 0: -+ val = 0; -+ break; -+ case 50: -+ val = B50; -+ break; -+ case 75: -+ val = B75; -+ break; -+ case 110: -+ val = B110; -+ break; -+ case 134: -+ val = B134; -+ break; -+ case 150: -+ val = B150; -+ break; -+ case 200: -+ val = B200; -+ break; -+ case 300: -+ val = B300; -+ break; -+ case 600: -+ val = B600; -+ break; -+ case 1200: -+ val = B1200; -+ break; -+ case 1800: -+ val = B1800; -+ break; -+ case 2400: -+ val = B2400; -+ break; -+ case 4800: -+ val = B4800; -+ break; -+ case 9600: -+ val = B9600; -+ break; -+ case 19200: -+ val = B19200; -+ break; -+ case 38400: -+ val = B38400; -+ break; -+#ifdef B57600 -+ case 57600: -+ val = B57600; -+ break; -+#endif -+#ifdef B115200 -+ case 115200: -+ val = B115200; -+ break; -+#endif -+#ifdef B230400 -+ case 230400: -+ val = B230400; -+ break; -+#endif -+#ifdef B460800 -+ case 460800: -+ val = B460800; -+ break; -+#endif -+ default: -+ return 0; -+ } -+ -+ *def = val; -+ return 1; -+} -+ -+/* {{{ dio_data_bits_to_define -+ * Converts a number of data bits to a termios define -+ */ -+static int dio_data_bits_to_define(int data_bits, int *def) { -+ int val; -+ -+ switch (data_bits) { -+ case 8: -+ val = CS8; -+ break; -+ case 7: -+ val = CS7; -+ break; -+ case 6: -+ val = CS6; -+ break; -+ case 5: -+ val = CS5; -+ break; -+ default: -+ return 0; -+ } -+ -+ *def = val; -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_stop_bits_to_define -+ * Converts a number of stop bits to a termios define -+ */ -+static int dio_stop_bits_to_define(int stop_bits, int *def) { -+ int val; -+ -+ switch (stop_bits) { -+ case 1: -+ val = 0; -+ break; -+ case 2: -+ val = CSTOPB; -+ break; -+ default: -+ return 0; -+ } -+ -+ *def = val; -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_parity_to_define -+ * Converts a parity type to a termios define -+ */ -+static int dio_parity_to_define(int parity, int *def) { -+ int val; -+ -+ switch (parity) { -+ case 0: -+ val = 0; -+ break; -+ case 1: -+ val = PARENB | PARODD; -+ break; -+ case 2: -+ val = PARENB; -+ break; -+ default: -+ return 0; -+ } -+ -+ *def = val; -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_create_stream_data -+ * Creates an initialised stream data structure. Free with efree(). -+ */ -+php_dio_stream_data * dio_create_stream_data(void) { -+ php_dio_posix_stream_data * data = emalloc(sizeof(php_dio_posix_stream_data)); -+ dio_init_stream_data(&(data->common)); -+ data->fd = -1; -+ data->flags = 0; -+ -+ return (php_dio_stream_data *)data; -+} -+/* }}} */ -+ -+/* {{{ dio_common_write -+ * Writes count chars from the buffer to the stream described by the stream data. -+ */ -+size_t dio_common_write(php_dio_stream_data *data, const char *buf, size_t count) { -+ size_t ret; -+ -+ /* Blocking writes can be interrupted by signals etc. If -+ * interrupted try again. Not sure about non-blocking -+ * writes but it doesn't hurt to check. */ -+ do { -+ ret = write(((php_dio_posix_stream_data*)data)->fd, buf, count); -+ if (ret > 0) { -+ return ret; -+ } -+ } while (errno == EINTR); -+ return 0; -+} -+/* }}} */ -+ -+#ifdef DIO_NONBLOCK -+/* {{{ dio_timeval_subtract -+ * Calculates the difference between two timevals returning the result in the -+ * structure pointed to by diffptr. Returns -1 as error if late time is -+ * earlier than early time. -+ */ -+static int dio_timeval_subtract(struct timeval *late, struct timeval *early, struct timeval *diff) { -+ struct timeval *tmp; -+ -+ /* Handle negatives */ -+ if (late->tv_sec < early->tv_sec) { -+ return 0; -+ } -+ -+ if ((late->tv_sec == early->tv_sec) && (late->tv_usec < early->tv_usec)) { -+ return 0; -+ } -+ -+ /* Handle any carry. If later usec is smaller than earlier usec simple -+ * subtraction will result in negative value. Since usec has a maximum -+ * of one second by adding another second before the subtraction the -+ * result will always be positive. */ -+ if (late->tv_usec < early->tv_usec) { -+ late->tv_usec += 1000000; -+ late->tv_sec--; -+ } -+ -+ /* Once adjusted can just subtract values. */ -+ diff->tv_sec = late->tv_sec - early->tv_sec; -+ diff->tv_usec = late->tv_usec - early->tv_usec; -+ -+ return 1; -+} -+#endif -+ -+/* {{{ dio_common_read -+ * Reads count chars to the buffer to the stream described by the stream data. -+ */ -+size_t dio_common_read(php_dio_stream_data *data, const char *buf, size_t count) { -+ int fd = ((php_dio_posix_stream_data*)data)->fd; -+ size_t ret, total = 0; -+ char *ptr = (char*)buf; -+ -+ struct timeval timeout, timeouttmp, before, after, diff; -+ fd_set rfds; -+ -+ if (!data->has_timeout) { -+ /* Blocking reads can be interrupted by signals etc. If -+ * interrupted try again. Not sure about non-blocking -+ * reads but it doesn't hurt to check. */ -+ do { -+ ret = read(fd, (char*)ptr, count); -+ if (ret > 0) { -+ return ret; -+ } else if (!ret) { -+ data->end_of_file = 1; -+ } -+ } while ((errno == EINTR) && !data->end_of_file); -+ return 0; -+ } -+#ifdef DIO_NONBLOCK -+ else { -+ /* Clear timed out flag */ -+ data->timed_out = 0; -+ -+ /* The initial timeout value */ -+ timeout.tv_sec = data->timeout_sec; -+ timeout.tv_usec = data->timeout_usec; -+ -+ do { -+ /* The semantics of select() are that you cannot guarantee -+ * that the timeval structure passed in has not been changed by -+ * the select call. So you keep a copy. */ -+ timeouttmp = timeout; -+ -+ /* The time before we wait for data. */ -+ (void) gettimeofday(&before, NULL); -+ -+ /* Wait for an event on our file descriptor. */ -+ FD_ZERO(&rfds); -+ FD_SET(fd, &rfds); -+ -+ ret = select(fd + 1, &rfds, NULL, NULL, &timeouttmp); -+ /* An error. */ -+ if ((ret < 0) && (errno != EINTR) && (errno != EAGAIN)) { -+ return 0; -+ } -+ -+ /* We have data to read. */ -+ if ((ret > 0) && FD_ISSET(fd, &rfds)) { -+ ret = read(fd, ptr, count); -+ /* Another error */ -+ if ((ret < 0) && (errno != EINTR) && (errno != EAGAIN)) { -+ return 0; -+ } -+ -+ if (ret > 0) { -+ /* Got data, add it to the buffer. */ -+ ptr += ret; -+ total += ret; -+ count -= ret; -+ } else if (!ret) { -+ /* This should never happen since how can we have -+ * data to read at an end of file, but still -+ * just in case! */ -+ data->end_of_file = 1; -+ break; -+ } -+ } -+ -+ /* If not timed out and not end of file and not all data read -+ * calculate how long it took us and loop if we still have time -+ * out time left. */ -+ if (count) { -+ (void) gettimeofday(&after, NULL); -+ -+ /* Diff the timevals */ -+ (void) dio_timeval_subtract(&after, &before, &diff); -+ -+ /* Now adjust the timeout. */ -+ if (!dio_timeval_subtract(&timeout, &diff, &timeout)) { -+ /* If it errors we've run out of time. */ -+ data->timed_out = 1; -+ break; -+ } else if (!timeout.tv_sec && !(timeout.tv_usec / 1000)) { -+ /* Check for rounding issues (millisecond accuracy) */ -+ data->timed_out = 1; -+ break; -+ } -+ } -+ } while (count); /* Until time out or end of file or all data read. */ -+ -+ return total; -+ } -+#endif -+} -+/* }}} */ -+ -+/* {{{ php_dio_stream_data -+ * Closes the php_stream. -+ */ -+int dio_common_close(php_dio_stream_data *data) { -+ if (close(((php_dio_posix_stream_data*)data)->fd) < 0) { -+ return 0; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_common_set_option -+ * Sets/gets stream options -+ */ -+int dio_common_set_option(php_dio_stream_data *data, int option, int value, void *ptrparam) { -+ int fd = ((php_dio_posix_stream_data*)data)->fd; -+ int old_is_blocking; -+ int flags; -+ -+ switch (option) { -+#ifdef DIO_NONBLOCK -+ case PHP_STREAM_OPTION_READ_TIMEOUT: -+ if (ptrparam) { -+ struct timeval *tv = (struct timeval*)ptrparam; -+ -+ flags = fcntl(fd, F_GETFL, 0); -+ -+ /* A timeout of zero seconds and zero microseconds disables -+ any existing timeout. */ -+ if (tv->tv_sec || tv->tv_usec) { -+ data->timeout_sec = tv->tv_sec; -+ data->timeout_usec = tv->tv_usec; -+ data->has_timeout = -1; -+ (void) fcntl(fd, F_SETFL, flags & ~DIO_NONBLOCK); -+ } else { -+ data->timeout_sec = 0; -+ data->timeout_usec = 0; -+ data->has_timeout = 0; -+ data->timed_out = 0; -+ (void) fcntl(fd, F_SETFL, flags | DIO_NONBLOCK); -+ } -+ -+ return PHP_STREAM_OPTION_RETURN_OK; -+ } else { -+ return PHP_STREAM_OPTION_RETURN_ERR; -+ } -+ -+ case PHP_STREAM_OPTION_BLOCKING: -+ flags = fcntl(fd, F_GETFL, 0); -+ if (value) { -+ flags &= ~DIO_NONBLOCK; -+ } else { -+ flags |= DIO_NONBLOCK; -+ } -+ (void) fcntl(fd, F_SETFL, flags); -+ -+ old_is_blocking = data->is_blocking; -+ data->is_blocking = value; -+ return old_is_blocking ? PHP_STREAM_OPTION_RETURN_OK : PHP_STREAM_OPTION_RETURN_ERR; -+#endif /* O_NONBLOCK */ -+ -+ default: -+ break; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_raw_open_stream -+ * Opens the underlying stream. -+ */ -+int dio_raw_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC) { -+ php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data; -+ pdata->flags = dio_stream_mode_to_flags(mode); -+ -+#ifdef DIO_NONBLOCK -+ if (!data->is_blocking || data->has_timeout) { -+ pdata->flags |= DIO_NONBLOCK; -+ } -+#endif -+ -+ /* Open the file and handle any errors. */ -+#ifdef DIO_HAS_FILEPERMS -+ if (data->has_perms) { -+ pdata->fd = open(filename, pdata->flags, (mode_t)data->perms); -+ } else { -+ pdata->fd = open(filename, pdata->flags); -+ } -+#else -+ pdata->fd = open(filename, pdata->flags); -+#endif -+ -+ if (pdata->fd < 0) { -+ switch (errno) { -+ case EEXIST: -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "File exists!"); -+ return 0; -+ default: -+ return 0; -+ } -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_serial_init -+ * Initialises the serial settings storing the original settings before hand. -+ */ -+static int dio_serial_init(php_dio_stream_data *data TSRMLS_DC) { -+ php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data; -+ int ret = 0, data_bits_def, stop_bits_def, parity_def; -+ struct termios tio; -+ speed_t rate_def; -+ -+ if (!dio_data_rate_to_define(data->data_rate, &rate_def)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data_rate value (%ld)", data->data_rate); -+ return 0; -+ } -+ -+ if (!dio_data_bits_to_define(data->data_bits, &data_bits_def)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data_bits value (%d)", data->data_bits); -+ return 0; -+ } -+ -+ if (!dio_stop_bits_to_define(data->stop_bits, &stop_bits_def)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid stop_bits value (%d)", data->stop_bits); -+ return 0; -+ } -+ -+ if (!dio_parity_to_define(data->parity, &parity_def)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid parity value (%d)", data->parity); -+ return 0; -+ } -+ -+ ret = tcgetattr(pdata->fd, &(pdata->oldtio)); -+ if (ret < 0) { -+ if ((errno == ENOTTY) || (errno == ENODEV)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Not a serial port or terminal!"); -+ } -+ return 0; -+ } -+ -+ ret = tcgetattr(pdata->fd, &tio); -+ if (ret < 0) { -+ return 0; -+ } -+ -+ if (data->canonical) { -+ tio.c_iflag = IGNPAR | ICRNL; -+ tio.c_oflag = 0; -+ tio.c_lflag = ICANON; -+ } else { -+ cfmakeraw(&tio); -+ } -+ -+ cfsetispeed(&tio, rate_def); -+ cfsetospeed(&tio, rate_def); -+ -+ tio.c_cflag &= ~CSIZE; -+ tio.c_cflag |= data_bits_def; -+ tio.c_cflag &= ~CSTOPB; -+ tio.c_cflag |= stop_bits_def; -+ tio.c_cflag &= ~(PARENB|PARODD); -+ tio.c_cflag |= parity_def; -+ -+#ifdef CRTSCTS -+ tio.c_cflag &= ~(CLOCAL | CRTSCTS); -+#else -+ tio.c_cflag &= ~CLOCAL; -+#endif -+ if (!data->flow_control) { -+ tio.c_cflag |= CLOCAL; -+#ifdef CRTSCTS -+ } else { -+ tio.c_cflag |= CRTSCTS; -+#endif -+ } -+ -+ ret = tcsetattr(pdata->fd, TCSANOW, &tio); -+ if (ret < 0) { -+ return 0; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_serial_uninit -+ * Restores the serial settings back to their original state. -+ */ -+int dio_serial_uninit(php_dio_stream_data *data) { -+ php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data; -+ int ret; -+ -+ do { -+ ret = tcsetattr(pdata->fd, TCSANOW, &(pdata->oldtio)); -+ } while ((ret < 0) && (errno == EINTR)); -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_serial_flush -+ * Purges the serial buffers of data. -+ */ -+int dio_serial_purge(php_dio_stream_data *data) { -+ php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data; -+ int ret; -+ -+ if ((pdata->flags & O_RDWR) == O_RDWR) { -+ ret = tcflush(pdata->fd, TCIOFLUSH); -+ } else if ((pdata->flags & O_WRONLY) == O_WRONLY) { -+ ret = tcflush(pdata->fd, TCOFLUSH); -+ } else if ((pdata->flags & O_RDONLY) == O_RDONLY) { -+ ret = tcflush(pdata->fd, TCIFLUSH); -+ } -+ -+ if (ret < 0) { -+ return 0; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_serial_open_stream -+ * Opens the underlying stream. -+ */ -+int dio_serial_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC) { -+ php_dio_posix_stream_data *pdata = (php_dio_posix_stream_data*)data; -+ -+#ifdef O_NOCTTY -+ /* We don't want a controlling TTY */ -+ pdata->flags |= O_NOCTTY; -+#endif -+ -+ if (!dio_raw_open_stream(filename, mode, data TSRMLS_CC)) { -+ return 0; -+ } -+ -+ if (!dio_serial_init(data TSRMLS_CC)) { -+ close(pdata->fd); -+ return 0; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ ---- /dev/null -+++ b/ext/dio/dio_stream_wrappers.c -@@ -0,0 +1,410 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 2009 Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "php.h" -+#include "ext/standard/url.h" -+ -+#include "php_dio.h" -+#include "php_dio_common.h" -+#include "php_dio_stream_wrappers.h" -+ -+/* -+ +----------------------------------------------------------------------+ -+ | Raw stream handling | -+ +----------------------------------------------------------------------+ -+*/ -+ -+/* {{{ dio_stream_write -+ * Write to the stream -+ */ -+static size_t dio_stream_write(php_stream *stream, const char *buf, size_t count TSRMLS_DC) -+{ -+ return dio_common_write((php_dio_stream_data*)stream->abstract, buf, count); -+} -+/* }}} */ -+ -+/* {{{ dio_stream_read -+ * Read from the stream -+ */ -+static size_t dio_stream_read(php_stream *stream, char *buf, size_t count TSRMLS_DC) -+{ -+ php_dio_stream_data* data = (php_dio_stream_data*)stream->abstract; -+ size_t bytes = dio_common_read(data, buf, count); -+ stream->eof = data->end_of_file; -+ -+ return bytes; -+} -+/* }}} */ -+ -+/* {{{ dio_stream_flush -+ * Flush the stream. For raw streams this does nothing. -+ */ -+static int dio_stream_flush(php_stream *stream TSRMLS_DC) -+{ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_stream_close -+ * Close the stream -+ */ -+static int dio_stream_close(php_stream *stream, int close_handle TSRMLS_DC) -+{ -+ php_dio_stream_data *abstract = (php_dio_stream_data*)stream->abstract; -+ -+ if (!dio_common_close(abstract)) { -+ return 0; -+ } -+ -+ efree(abstract); -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_stream_set_option -+ * Set the stream options. -+ */ -+static int dio_stream_set_option(php_stream *stream, int option, int value, void *ptrparam TSRMLS_DC) -+{ -+ php_dio_stream_data *abstract = (php_dio_stream_data*)stream->abstract; -+ -+ switch (option) { -+ case PHP_STREAM_OPTION_META_DATA_API: -+#ifdef DIO_NONBLOCK -+ add_assoc_bool((zval *)ptrparam, "timed_out", abstract->timed_out); -+ add_assoc_bool((zval *)ptrparam, "blocked", abstract->is_blocking); -+#endif -+ add_assoc_bool((zval *)ptrparam, "eof", stream->eof); -+ return PHP_STREAM_OPTION_RETURN_OK; -+ -+#if PHP_MAJOR_VERSION >= 5 -+ case PHP_STREAM_OPTION_CHECK_LIVENESS: -+ stream->eof = abstract->end_of_file; -+ return PHP_STREAM_OPTION_RETURN_OK; -+#endif /* PHP_MAJOR_VERSION >= 5 */ -+ -+ default: -+ break; -+ } -+ -+ return dio_common_set_option(abstract, option, value, ptrparam); -+} -+/* }}} */ -+ -+php_stream_ops dio_raw_stream_ops = { -+ dio_stream_write, -+ dio_stream_read, -+ dio_stream_close, -+ dio_stream_flush, -+ "dio", -+ NULL, /* seek */ -+ NULL, /* cast */ -+ NULL, /* stat */ -+ dio_stream_set_option, -+}; -+ -+/* {{{ dio_raw_fopen_wrapper -+ * fopen for the dio.raw stream. -+ */ -+static php_stream *dio_raw_fopen_wrapper(php_stream_wrapper *wrapper, -+ char *path, char *mode, -+ int options, char **opened_path, -+ php_stream_context *context STREAMS_DC TSRMLS_DC) { -+ php_dio_stream_data *data; -+ php_stream *stream; -+ char *filename; -+ -+ /* Check it was actually for us (not a corrupted function pointer -+ somewhere!). */ -+ if (strncmp(path, DIO_RAW_STREAM_PROTOCOL, sizeof(DIO_RAW_STREAM_PROTOCOL) - 1)) { -+ return NULL; -+ } -+ -+ /* Get the actually file system name/path. */ -+ filename = path + sizeof(DIO_RAW_STREAM_PROTOCOL) - 1; -+ -+ /* Check we can actually access it. */ -+ if (php_check_open_basedir(filename TSRMLS_CC) || -+ (PG(safe_mode) && !php_checkuid(filename, mode, CHECKUID_CHECK_MODE_PARAM))) { -+ return NULL; -+ } -+ -+ data = dio_create_stream_data(); -+ data->stream_type = DIO_STREAM_TYPE_RAW; -+ -+ /* Parse the context. */ -+ if (context) { -+ dio_stream_context_get_basic_options(context, data TSRMLS_CC); -+ } -+ -+ /* Try and open a raw stream. */ -+ if (!dio_raw_open_stream(filename, mode, data TSRMLS_CC)) { -+ return NULL; -+ } -+ -+ /* Create a PHP stream based on raw stream */ -+ stream = php_stream_alloc(&dio_raw_stream_ops, data, 0, mode); -+ if (!stream) { -+ (void) dio_common_close(data); -+ efree(data); -+ } -+ -+ return stream; -+} -+/* }}} */ -+ -+static php_stream_wrapper_ops dio_raw_stream_wops = { -+ dio_raw_fopen_wrapper, -+ NULL, /* stream_close */ -+ NULL, /* stat */ -+ NULL, /* stat_url */ -+ NULL, /* opendir */ -+ DIO_RAW_STREAM_NAME -+}; -+ -+php_stream_wrapper php_dio_raw_stream_wrapper = { -+ &dio_raw_stream_wops, -+ NULL, -+ 0 -+}; -+ -+/* {{{ proto dio_raw(string filename, string mode[, array options]) -+ * Opens a raw direct IO stream. -+ */ -+PHP_FUNCTION(dio_raw) { -+ zval *options = NULL; -+ php_dio_stream_data *data; -+ php_stream *stream; -+ -+ char *filename; -+ int filename_len; -+ char *mode; -+ int mode_len; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|z", &filename, &filename_len, &mode, &mode_len, &options) == FAILURE) { -+ RETURN_FALSE; -+ } -+ -+ /* Check the third argument is an array. */ -+ if (options && (Z_TYPE_P(options) != IS_ARRAY)) { -+ RETURN_FALSE; -+ } -+ -+ /* Check we can actually access the file. */ -+ if (php_check_open_basedir(filename TSRMLS_CC) || -+ (PG(safe_mode) && !php_checkuid(filename, mode, CHECKUID_CHECK_MODE_PARAM))) { -+ RETURN_FALSE; -+ } -+ -+ data = dio_create_stream_data(); -+ data->stream_type = DIO_STREAM_TYPE_RAW; -+ -+ if (options) { -+ dio_assoc_array_get_basic_options(options, data TSRMLS_CC); -+ } -+ -+ /* Try and open a raw stream. */ -+ if (dio_raw_open_stream(filename, mode, data TSRMLS_CC)) { -+ stream = php_stream_alloc(&dio_raw_stream_ops, data, 0, mode); -+ if (!stream) { -+ (void) dio_common_close(data); -+ efree(data); -+ RETURN_FALSE; -+ } -+ } -+ -+ php_stream_to_zval(stream, return_value); -+} -+/* }}} */ -+ -+/* -+ +----------------------------------------------------------------------+ -+ | Serial stream handling | -+ +----------------------------------------------------------------------+ -+*/ -+ -+/* {{{ dio_stream_flush -+ * Flush the stream. If the stream is read only, it flushes the read -+ * stream, if it is write only it flushes the write, otherwise it flushes -+ * both. -+ */ -+static int dio_serial_stream_flush(php_stream *stream TSRMLS_DC) -+{ -+ return dio_serial_purge((php_dio_stream_data*)stream->abstract); -+} -+/* }}} */ -+ -+/* {{{ dio_stream_close -+ * Close the stream. Restores the serial settings to their value before -+ * the stream was open. -+ */ -+static int dio_serial_stream_close(php_stream *stream, int close_handle TSRMLS_DC) -+{ -+ php_dio_stream_data *abstract = (php_dio_stream_data*)stream->abstract; -+ -+ if (!dio_serial_uninit(abstract)) { -+ return 0; -+ } -+ -+ if (!dio_common_close(abstract)) { -+ return 0; -+ } -+ -+ efree(abstract); -+ return 1; -+} -+/* }}} */ -+ -+php_stream_ops dio_serial_stream_ops = { -+ dio_stream_write, -+ dio_stream_read, -+ dio_serial_stream_close, -+ dio_serial_stream_flush, -+ "dio", -+ NULL, /* seek */ -+ NULL, /* cast */ -+ NULL, /* stat */ -+ dio_stream_set_option, -+}; -+ -+/* {{{ dio_raw_fopen_wrapper -+ * fopen for the dio.raw stream. -+ */ -+static php_stream *dio_serial_fopen_wrapper(php_stream_wrapper *wrapper, -+ char *path, char *mode, -+ int options, char **opened_path, -+ php_stream_context *context STREAMS_DC TSRMLS_DC) { -+ php_dio_stream_data *data; -+ php_stream *stream; -+ char *filename; -+ -+ /* Check it was actually for us (not a corrupted function pointer -+ somewhere!). */ -+ if (strncmp(path, DIO_SERIAL_STREAM_PROTOCOL, sizeof(DIO_SERIAL_STREAM_PROTOCOL) - 1)) { -+ return NULL; -+ } -+ -+ /* Get the actually file system name/path. */ -+ filename = path + sizeof(DIO_SERIAL_STREAM_PROTOCOL) - 1; -+ -+ /* Check we can actually access it. */ -+ if (php_check_open_basedir(filename TSRMLS_CC) || -+ (PG(safe_mode) && !php_checkuid(filename, mode, CHECKUID_CHECK_MODE_PARAM))) { -+ return NULL; -+ } -+ -+ data = dio_create_stream_data(); -+ data->stream_type = DIO_STREAM_TYPE_SERIAL; -+ -+ /* Parse the context. */ -+ if (context) { -+ dio_stream_context_get_basic_options(context, data TSRMLS_CC); -+ dio_stream_context_get_serial_options(context, data TSRMLS_CC); -+ } -+ -+ /* Try and open a serial stream. */ -+ if (!dio_serial_open_stream(filename, mode, data TSRMLS_CC)) { -+ return NULL; -+ } -+ -+ stream = php_stream_alloc(&dio_serial_stream_ops, data, 0, mode); -+ if (!stream) { -+ efree(data); -+ } -+ -+ return stream; -+} -+/* }}} */ -+ -+static php_stream_wrapper_ops dio_serial_stream_wops = { -+ dio_serial_fopen_wrapper, -+ NULL, /* stream_close */ -+ NULL, /* stat */ -+ NULL, /* stat_url */ -+ NULL, /* opendir */ -+ DIO_SERIAL_STREAM_NAME -+}; -+ -+php_stream_wrapper php_dio_serial_stream_wrapper = { -+ &dio_serial_stream_wops, -+ NULL, -+ 0 -+}; -+ -+/* {{{ proto dio_serial(string filename, string mode[, array options]) -+ * Opens a serial direct IO stream. -+ */ -+PHP_FUNCTION(dio_serial) { -+ zval *options = NULL; -+ php_dio_stream_data *data; -+ php_stream *stream; -+ -+ char *filename; -+ int filename_len; -+ char *mode; -+ int mode_len; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|z", &filename, &filename_len, &mode, &mode_len, &options) == FAILURE) { -+ RETURN_FALSE; -+ } -+ -+ /* Check the third argument is an array. */ -+ if (options && (Z_TYPE_P(options) != IS_ARRAY)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING,"dio_serial, the third argument should be an array of options"); -+ RETURN_FALSE; -+ } -+ -+ /* Check we can actually access the file. */ -+ if (php_check_open_basedir(filename TSRMLS_CC) || -+ (PG(safe_mode) && !php_checkuid(filename, mode, CHECKUID_CHECK_MODE_PARAM))) { -+ RETURN_FALSE; -+ } -+ -+ data = dio_create_stream_data(); -+ data->stream_type = DIO_STREAM_TYPE_SERIAL; -+ -+ if (options) { -+ dio_assoc_array_get_basic_options(options, data TSRMLS_CC); -+ dio_assoc_array_get_serial_options(options, data TSRMLS_CC); -+ } -+ -+ /* Try and open a serial stream. */ -+ if (dio_serial_open_stream(filename, mode, data TSRMLS_CC)) { -+ stream = php_stream_alloc(&dio_serial_stream_ops, data, 0, mode); -+ if (!stream) { -+ efree(data); -+ RETURN_FALSE; -+ } -+ } -+ -+ php_stream_to_zval(stream, return_value); -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ ---- /dev/null -+++ b/ext/dio/dio_win32.c -@@ -0,0 +1,669 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 2009 Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "php.h" -+ -+#include "php_dio_common.h" -+ -+/* {{{ dio_data_rate_to_define -+ * Converts a numeric data rate to a termios define -+ */ -+static int dio_data_rate_to_define(long rate, DWORD *def) { -+ switch (rate) { -+ case 75: -+ case 110: -+ case 134: -+ case 150: -+ case 300: -+ case 600: -+ case 1200: -+ case 1800: -+ case 2400: -+ case 4800: -+ case 7200: -+ case 9600: -+ case 14400: -+ case 19200: -+ case 38400: -+ case 57600: -+ case 115200: -+ case 56000: -+ case 128000: -+ break; -+ default: -+ return 0; -+ } -+ -+ *def = (DWORD)rate; -+ return 1; -+} -+/* }}} */ -+ -+ -+/* {{{ dio_data_bits_to_define -+ * Converts a number of data bits to a termios define -+ */ -+static int dio_data_bits_to_define(int data_bits, DWORD *def) { -+ switch (data_bits) { -+ case 8: -+ case 7: -+ case 6: -+ case 5: -+ case 4: -+ break; -+ default: -+ return 0; -+ } -+ -+ *def = (DWORD)data_bits; -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_stop_bits_to_define -+ * Converts a number of stop bits to a termios define -+ */ -+static int dio_stop_bits_to_define(int stop_bits, DWORD *def) { -+ DWORD val; -+ -+ switch (stop_bits) { -+ case 1: -+ val = 0; -+ break; -+ case 2: -+ val = 2; -+ break; -+ case 3: -+ val = 1; -+ break; -+ default: -+ return 0; -+ } -+ -+ *def = val; -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_parity_to_define -+ * Converts a parity type to a termios define -+ */ -+static int dio_parity_to_define(int parity, DWORD *def) { -+ switch (parity) { -+ case 0: -+ case 1: -+ case 2: -+ break; -+ default: -+ return 0; -+ } -+ -+ *def = (DWORD)parity; -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_create_stream_data -+ * Creates an initialised stream data structure. Free with efree(). -+ */ -+php_dio_stream_data * dio_create_stream_data(void) { -+ php_dio_win32_stream_data * data = emalloc(sizeof(php_dio_win32_stream_data)); -+ memset(data, 0, sizeof(php_dio_win32_stream_data)); -+ dio_init_stream_data(&(data->common)); -+ data->handle = INVALID_HANDLE_VALUE; -+ data->desired_access = 0; -+ data->creation_disposition = 0; -+ data->olddcb.DCBlength = sizeof(DCB); -+ -+ return (php_dio_stream_data *)data; -+} -+/* }}} */ -+ -+/* {{{ dio_common_write -+ * Writes count chars from the buffer to the stream described by the stream data. -+ */ -+size_t dio_common_write(php_dio_stream_data *data, const char *buf, size_t count) { -+ php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data; -+ DWORD total = 0; -+ -+ if (WriteFile(wdata->handle, buf, (DWORD)count, &total, NULL)) { -+ return (size_t)total; -+ } -+ -+ return 0; -+} -+/* }}} */ -+ -+/* {{{ dio_buffer_read -+ * Reads any available chars from the canonical buffer. -+ */ -+static size_t dio_buffer_read(php_dio_win32_stream_data *wdata, const char *buf, size_t count) { -+ php_dio_win32_canon_data *canon_data = wdata->canon_data; -+ size_t total = 0; -+ -+ /* Read always follows write. I.e. if read ptr > write ptr buffer has -+ wrapped and so we need to copy two blocks of data. */ -+ if (canon_data->read_pos > canon_data->write_pos) { -+ -+ /* Check we actually need to copy both blocks */ -+ if ((canon_data->size - canon_data->read_pos) > count) { -+ -+ /* No we don't. Just copy as much as we were asked for. */ -+ memcpy((char*)buf, -+ &(canon_data->buf[canon_data->read_pos]), -+ count); -+ /* Update the read pointer. */ -+ canon_data->read_pos += count; -+ -+ /* Return the amount read. */ -+ return count; -+ } else { -+ -+ /* We need to copy both blocks so copy data up to the end of -+ the buffer. */ -+ total = canon_data->size - canon_data->read_pos; -+ memcpy((char*)buf, -+ &(canon_data->buf[canon_data->read_pos]), -+ total); -+ canon_data->read_pos = 0; -+ count -= total; -+ -+ /* Now copy the data from the start of the buffer either up -+ count or the number of bytes in the buffer. */ -+ -+ if (canon_data->write_pos > count) { -+ memcpy((char*)buf, canon_data->buf, count); -+ canon_data->read_pos = count; -+ total += count; -+ -+ return total; -+ } else { -+ memcpy((char*)buf, canon_data->buf, canon_data->write_pos); -+ canon_data->read_pos = canon_data->write_pos; -+ total += canon_data->write_pos; -+ -+ return total; -+ } -+ } -+ -+ /* Else if write follows read. This is a simpler case. We just copy -+ either all the data buffered or count, which ever is smaller. */ -+ } else if (canon_data->write_pos > canon_data->read_pos) { -+ if ((canon_data->write_pos - canon_data->read_pos) > count) { -+ memcpy((char*)buf, -+ &(canon_data->buf[canon_data->read_pos]), -+ count); -+ canon_data->read_pos += count; -+ -+ return count; -+ } else { -+ total = canon_data->write_pos - canon_data->read_pos; -+ memcpy((char*)buf, -+ &(canon_data->buf[canon_data->read_pos]), -+ total); -+ canon_data->read_pos += total; -+ -+ return total; -+ } -+ } -+ -+ /* Else we need to read more data from the data port. */ -+ return 0; -+} -+ -+/* {{{ dio_com_read -+ * Read chars from the data port. -+ */ -+static size_t dio_com_read(php_dio_stream_data *data, const char *buf, size_t count) { -+ php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data; -+ DWORD err, total = 0; -+ -+ if (ReadFile(wdata->handle, (void*)buf, (DWORD)count, &total, NULL)) { -+ -+ if (total) { -+ return (size_t)total; -+ } -+ -+ data->end_of_file = 1; -+ } -+ -+ if (!data->end_of_file) { -+ err = GetLastError(); -+ -+ if (ERROR_HANDLE_EOF == err) { -+ data->end_of_file = 1; -+ } -+ } -+ -+ return 0; -+} -+ -+/* {{{ dio_canonical_read -+ * Reads chars from the input stream until the internal buffer is full or a new -+ * line is reached. -+ */ -+static size_t dio_canonical_read(php_dio_win32_stream_data *wdata, const char *buf, size_t count) { -+ php_dio_win32_canon_data *canon_data = wdata->canon_data; -+ size_t total = 0; -+ char ch; -+ -+ /* See if there's any buffered data and copy it. */ -+ total = dio_buffer_read(wdata, buf, count); -+ if (total) { -+ return total; -+ } -+ -+ /* Need to read more data from the data port. Buffer should be empty(er) -+ by now. */ -+ do { -+ /* Is the buffer full? */ -+ if (((canon_data->write_pos + 1) % canon_data->size) == -+ canon_data->read_pos) { -+ break; -+ } -+ -+ /* Read a byte from the input checking for EOF. */ -+ if (!dio_com_read((php_dio_stream_data*)wdata, &ch, 1)) { -+ break; -+ } -+ -+ /* Translate CR to newlines (same as ICRNL in POSIX) */ -+ ch = (ch != '\r') ? ch : '\n'; -+ -+ /* We read a character! So buffer it. */ -+ canon_data->buf[canon_data->write_pos++] = ch; -+ if (canon_data->write_pos >= canon_data->size) { -+ canon_data->write_pos = 0; -+ } -+ -+ /* End of line/input (^D)? */ -+ } while ((ch != '\n') && (ch != 0x04)); -+ -+ return dio_buffer_read(wdata, buf, count); -+} -+/* }}} */ -+ -+/* {{{ dio_common_read -+ * Reads count chars to the buffer to the stream described by the stream data. -+ */ -+size_t dio_common_read(php_dio_stream_data *data, const char *buf, size_t count) { -+ -+ /* You ask for no bytes you'll get none :-) */ -+ if (!count) { -+ return 0; -+ } -+ -+ if (data->canonical) { -+ return dio_canonical_read((php_dio_win32_stream_data*)data, buf, count); -+ } else { -+ return dio_com_read(data, buf, count); -+ } -+} -+/* }}} */ -+ -+/* {{{ php_dio_stream_data -+ * Closes the php_stream. -+ */ -+int dio_common_close(php_dio_stream_data *data) { -+ php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data; -+ -+ if (data->canonical) { -+ efree(wdata->canon_data); -+ } -+ -+ if (!CloseHandle(wdata->handle)) { -+ return 0; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_common_set_option -+ * Sets/gets stream options -+ */ -+int dio_common_set_option(php_dio_stream_data *data, int option, int value, void *ptrparam) { -+ COMMTIMEOUTS cto = { 0, 0, 0, 0, 0 }; -+ int old_is_blocking = 0; -+ -+ /* Can't do timeouts or non blocking with raw windows streams :-( */ -+ if (DIO_STREAM_TYPE_SERIAL == data->stream_type) { -+ switch (option) { -+ case PHP_STREAM_OPTION_BLOCKING: -+ old_is_blocking = data->is_blocking; -+ data->is_blocking = value ? 1 : 0; -+ -+ /* Only change values if we need to change them. */ -+ if (data->is_blocking != old_is_blocking) { -+ /* If we're not blocking but don't have a timeout -+ set to return immediately */ -+ if (!data->is_blocking && !data->has_timeout) { -+ cto.ReadIntervalTimeout = MAXDWORD; -+ } -+ -+ /* If we have a timeout ignore the blocking and set -+ the total time in which to read the data */ -+ if (data->has_timeout) { -+ cto.ReadIntervalTimeout = MAXDWORD; -+ cto.ReadTotalTimeoutMultiplier = MAXDWORD; -+ cto.ReadTotalTimeoutConstant = (data->timeout_usec / 1000) + -+ (data->timeout_sec * 1000); -+ } -+ -+ if (!SetCommTimeouts(((php_dio_win32_stream_data*)data)->handle, &cto)) { -+ return PHP_STREAM_OPTION_RETURN_ERR; -+ } -+ } -+ return old_is_blocking ? PHP_STREAM_OPTION_RETURN_OK : PHP_STREAM_OPTION_RETURN_ERR; -+ -+ case PHP_STREAM_OPTION_READ_TIMEOUT: -+ if (ptrparam) { -+ /* struct timeval is supported with PHP_WIN32 defined. */ -+ struct timeval *tv = (struct timeval*)ptrparam; -+ -+ /* A timeout of zero seconds and zero microseconds disables -+ any existing timeout. */ -+ if (tv->tv_sec || tv->tv_usec) { -+ data->timeout_sec = tv->tv_sec; -+ data->timeout_usec = tv->tv_usec; -+ data->has_timeout = -1; -+ -+ cto.ReadIntervalTimeout = MAXDWORD; -+ cto.ReadTotalTimeoutMultiplier = MAXDWORD; -+ cto.ReadTotalTimeoutConstant = (data->timeout_usec / 1000) + -+ (data->timeout_sec * 1000); -+ } else { -+ data->timeout_sec = 0; -+ data->timeout_usec = 0; -+ data->has_timeout = 0; -+ data->timed_out = 0; -+ -+ /* If we're not blocking but don't have a timeout -+ set to return immediately */ -+ if (!data->is_blocking) { -+ cto.ReadIntervalTimeout = MAXDWORD; -+ } -+ } -+ -+ if (!SetCommTimeouts(((php_dio_win32_stream_data*)data)->handle, &cto)) { -+ return PHP_STREAM_OPTION_RETURN_ERR; -+ } else { -+ return PHP_STREAM_OPTION_RETURN_OK; -+ } -+ } else { -+ return PHP_STREAM_OPTION_RETURN_ERR; -+ } -+ -+ default: -+ break; -+ } -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_raw_open_stream -+ * Opens the underlying stream. -+ */ -+int dio_raw_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC) { -+ php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data; -+ DWORD err; -+ -+ switch(*mode) { -+ case 'r': -+ wdata->creation_disposition = OPEN_EXISTING; -+ break; -+ case 'w': -+ wdata->creation_disposition = TRUNCATE_EXISTING; -+ break; -+ case 'a': -+ wdata->creation_disposition = OPEN_ALWAYS; -+ break; -+ case 'x': -+ wdata->creation_disposition = CREATE_NEW; -+ break; -+ } -+ mode ++; -+ -+ if (*mode && (*mode != '+')) { -+ mode++; -+ } -+ -+ if (*mode && (*mode == '+')) { -+ wdata->desired_access = GENERIC_READ | GENERIC_WRITE; -+ } else if (OPEN_EXISTING == wdata->creation_disposition) { -+ wdata->desired_access = GENERIC_READ; -+ } else { -+ wdata->desired_access = GENERIC_WRITE; -+ } -+ -+ wdata->handle = CreateFile(filename, wdata->desired_access, 0, -+ NULL, wdata->creation_disposition, FILE_ATTRIBUTE_NORMAL, NULL); -+ if (INVALID_HANDLE_VALUE == wdata->handle) { -+ err = GetLastError(); -+ switch (err) { -+ case ERROR_FILE_EXISTS: -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "File exists!"); -+ return 0; -+ -+ case ERROR_FILE_NOT_FOUND: -+ /* ERROR_FILE_NOT_FOUND with TRUNCATE_EXISTING means that -+ * the file doesn't exist so now try to create it. */ -+ if (TRUNCATE_EXISTING == wdata->creation_disposition) { -+ wdata->handle = CreateFile(filename, wdata->desired_access, 0, -+ NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL); -+ if (INVALID_HANDLE_VALUE == wdata->handle) { -+ err = GetLastError(); -+ return 0; -+ } -+ } else { -+ return 0; -+ } -+ break; -+ -+ default: -+ return 0; -+ } -+ } -+ -+ /* If canonical allocate the canonical buffer. */ -+ if (data->canonical) { -+ wdata->canon_data = emalloc(sizeof(php_dio_win32_canon_data)); -+ memset(wdata->canon_data, 0, sizeof(php_dio_win32_canon_data)); -+ wdata->canon_data->size = DIO_WIN32_CANON_BUF_SIZE; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_serial_init -+ * Initialises the serial port -+ */ -+static int dio_serial_init(php_dio_stream_data *data TSRMLS_DC) { -+ php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data; -+ DWORD err, rate_def, data_bits_def, stop_bits_def, parity_def; -+ DCB dcb; -+ -+ if (!dio_data_rate_to_define(data->data_rate, &rate_def)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data_rate value (%d) (%d)", data->data_rate, __LINE__); -+ return 0; -+ } -+ -+ if (!dio_data_bits_to_define(data->data_bits, &data_bits_def)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid data_bits value (%d)", data->data_bits); -+ return 0; -+ } -+ -+ if (!dio_stop_bits_to_define(data->stop_bits, &stop_bits_def)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid stop_bits value (%d)", data->stop_bits); -+ return 0; -+ } -+ -+ if (!dio_parity_to_define(data->parity, &parity_def)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid parity value (%d)", data->parity); -+ return 0; -+ } -+ -+ if (!GetCommState(wdata->handle, &(wdata->olddcb))) { -+ err = GetLastError(); -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "GetCommState() failed! (%d)", err); -+ return 0; -+ } -+ -+ /* Init the DCB structure */ -+ memset(&dcb, 0, sizeof(DCB)); -+ dcb.DCBlength = sizeof(DCB); -+ -+ /* Set the communication parameters */ -+ dcb.fBinary = 1; -+ dcb.BaudRate = rate_def; -+ dcb.ByteSize = (BYTE)data_bits_def; -+ dcb.StopBits = (BYTE)stop_bits_def; -+ dcb.Parity = (BYTE)parity_def; -+ -+ /* Set the control line parameters */ -+ dcb.fDtrControl = DTR_CONTROL_DISABLE; -+ dcb.fDsrSensitivity = FALSE; -+ dcb.fOutxDsrFlow = FALSE; -+ dcb.fTXContinueOnXoff = FALSE; -+ dcb.fOutX = FALSE; -+ dcb.fInX = FALSE; -+ dcb.fErrorChar = FALSE; -+ dcb.fNull = FALSE; -+ dcb.fAbortOnError = FALSE; -+ -+ /* Hardware flow control */ -+ if (data->flow_control) { -+ dcb.fOutxCtsFlow = TRUE; -+ dcb.fRtsControl = RTS_CONTROL_HANDSHAKE; -+ } else { -+ dcb.fOutxCtsFlow = FALSE; -+ dcb.fRtsControl = RTS_CONTROL_DISABLE; -+ } -+ -+ if (!SetCommState(wdata->handle, &dcb)) { -+ return 0; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+ -+/* {{{ dio_serial_uninit -+ * Restores the serial settings back to their original state. -+ */ -+int dio_serial_uninit(php_dio_stream_data *data) { -+ php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data; -+ -+ if (!SetCommState(wdata->handle, &(wdata->olddcb))) { -+ return 0; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* {{{ dio_serial_flush -+ * Purges the serial buffers of data. -+ */ -+int dio_serial_purge(php_dio_stream_data *data) { -+ php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data; -+ BOOL ret; -+ -+ /* Purge the canonical buffer if required */ -+ if (data->canonical && ((wdata->desired_access & GENERIC_READ) == GENERIC_READ)) { -+ wdata->canon_data->read_pos = 0; -+ wdata->canon_data->write_pos = 0; -+ } -+ -+ /* Purge the com port */ -+ if ((wdata->desired_access & (GENERIC_READ|GENERIC_WRITE)) == (GENERIC_READ|GENERIC_WRITE)) { -+ ret = PurgeComm(wdata->handle, PURGE_RXCLEAR|PURGE_TXCLEAR); -+ } else if ((wdata->desired_access & GENERIC_WRITE) == GENERIC_WRITE) { -+ ret = PurgeComm(wdata->handle, PURGE_TXCLEAR); -+ } else if ((wdata->desired_access & GENERIC_READ) == GENERIC_READ) { -+ ret = PurgeComm(wdata->handle, PURGE_RXCLEAR); -+ } -+ -+ return ret; -+} -+/* }}} */ -+ -+/* {{{ dio_serial_open_stream -+ * Opens the underlying stream. -+ */ -+int dio_serial_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC) { -+ php_dio_win32_stream_data *wdata = (php_dio_win32_stream_data*)data; -+ COMMTIMEOUTS cto = { 0, 0, 0, 0, 0 }; -+ DWORD err; -+ -+ if (!dio_raw_open_stream(filename, mode, data TSRMLS_CC)) { -+ return 0; -+ } -+ -+ if (!GetCommTimeouts(wdata->handle, &(wdata->oldcto))) { -+ err = GetLastError(); -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "SetCommTimeouts() failed! (%d) Not a comm port?", err); -+ CloseHandle(wdata->handle); -+ return 0; -+ } -+ -+ /* If we're not blocking but don't have a timeout -+ set to return immediately */ -+ if (!data->is_blocking && !data->has_timeout) { -+ cto.ReadIntervalTimeout = MAXDWORD; -+ } -+ -+ /* If we have a timeout ignore the blocking and set -+ the total time in which to read the data */ -+ if (data->has_timeout) { -+ cto.ReadIntervalTimeout = MAXDWORD; -+ cto.ReadTotalTimeoutMultiplier = MAXDWORD; -+ cto.ReadTotalTimeoutConstant = (data->timeout_usec / 1000) + -+ (data->timeout_sec * 1000); -+ } -+ -+ if (!SetCommTimeouts(wdata->handle, &cto)) { -+ CloseHandle(wdata->handle); -+ return 0; -+ } -+ -+ if (!dio_serial_init(data TSRMLS_CC)) { -+ CloseHandle(wdata->handle); -+ return 0; -+ } -+ -+ return 1; -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ ---- /dev/null -+++ b/ext/dio/php_dio.h -@@ -0,0 +1,60 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 1997-2004 The PHP Group | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifndef PHP_DIO_H -+#define PHP_DIO_H -+ -+#include "php.h" -+#include "php_dio_common.h" -+#include "php_dio_stream_wrappers.h" -+ -+extern zend_module_entry dio_module_entry; -+#define phpext_dio_ptr &dio_module_entry -+ -+#define PHP_DIO_VERSION "0.0.4RC4" -+ -+/* Standard module functions. */ -+PHP_MINIT_FUNCTION(dio); -+PHP_MSHUTDOWN_FUNCTION(dio); -+PHP_RINIT_FUNCTION(dio); -+PHP_RSHUTDOWN_FUNCTION(dio); -+PHP_MINFO_FUNCTION(dio); -+ -+/* Legacy functions. */ -+PHP_FUNCTION(dio_open); -+PHP_FUNCTION(dio_truncate); -+PHP_FUNCTION(dio_stat); -+PHP_FUNCTION(dio_seek); -+PHP_FUNCTION(dio_read); -+PHP_FUNCTION(dio_write); -+PHP_FUNCTION(dio_fcntl); -+PHP_FUNCTION(dio_close); -+PHP_FUNCTION(dio_tcsetattr); -+ -+typedef struct { -+ int fd; -+} php_fd_t; -+ -+#endif -+ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * indent-tabs-mode: t -+ * End: -+ */ ---- /dev/null -+++ b/ext/dio/php_dio_common.h -@@ -0,0 +1,77 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 2009 Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifndef PHP_DIO_COMMON_H_ -+#define PHP_DIO_COMMON_H_ -+ -+#ifdef PHP_WIN32 -+#define PHP_DIO_API __declspec(dllexport) -+#else -+#define PHP_DIO_API -+#endif -+ -+#ifdef PHP_WIN32 -+#include "php_dio_win32.h" -+#else -+#include "php_dio_posix.h" -+#endif -+ -+#define DIO_STREAM_TYPE_NONE 0 -+#define DIO_STREAM_TYPE_RAW 1 -+#define DIO_STREAM_TYPE_SERIAL 2 -+ -+long dio_convert_to_long(zval *val); -+ -+php_dio_stream_data * dio_create_stream_data(void); -+ -+void dio_init_stream_data(php_dio_stream_data *data); -+ -+void dio_assoc_array_get_basic_options(zval *options, php_dio_stream_data *data TSRMLS_DC); -+ -+void dio_assoc_array_get_serial_options(zval *options, php_dio_stream_data *data TSRMLS_DC); -+ -+void dio_stream_context_get_basic_options(php_stream_context *context, php_dio_stream_data *data TSRMLS_DC); -+ -+void dio_stream_context_get_serial_options(php_stream_context *context, php_dio_stream_data *data TSRMLS_DC); -+ -+size_t dio_common_write(php_dio_stream_data *data, const char *buf, size_t count); -+ -+size_t dio_common_read(php_dio_stream_data *data, const char *buf, size_t count); -+ -+int dio_common_close(php_dio_stream_data *data); -+ -+int dio_common_set_option(php_dio_stream_data *data, int option, int value, void *ptrparam); -+ -+int dio_raw_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC); -+ -+int dio_serial_uninit(php_dio_stream_data *data); -+ -+int dio_serial_purge(php_dio_stream_data *data); -+ -+int dio_serial_open_stream(char *filename, char *mode, php_dio_stream_data *data TSRMLS_DC); -+ -+#endif /* PHP_DIO_COMMON_H_ */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ ---- /dev/null -+++ b/ext/dio/php_dio_common_data.h -@@ -0,0 +1,59 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 2009 Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifndef PHP_DIO_COMMON_DATA_H_ -+#define PHP_DIO_COMMON_DATA_H_ -+ -+/* This is the data structure 'base class'. It is common data fields used -+ * by all versions of DIO. -+ */ -+typedef struct _php_dio_stream_data { -+ /* Stream type */ -+ int stream_type; -+ /* Stream options */ -+ int end_of_file; -+#ifdef DIO_HAS_FILEPERMS -+ int has_perms; -+ int perms; -+#endif -+#ifdef DIO_NONBLOCK -+ int is_blocking; -+ int has_timeout; -+ long timeout_sec; -+ long timeout_usec; -+ int timed_out; -+#endif -+ /* Serial options */ -+ long data_rate; -+ int data_bits; -+ int stop_bits; -+ int parity; -+ int flow_control; -+ int canonical; -+} php_dio_stream_data ; -+ -+#endif /* PHP_DIO_COMMON_DATA_H_ */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ ---- /dev/null -+++ b/ext/dio/php_dio_posix.h -@@ -0,0 +1,70 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 2009 Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifndef PHP_DIO_POSIX_H_ -+#define PHP_DIO_POSIX_H_ -+ -+#include -+#include -+#include -+#include -+ -+#ifdef HAVE_UNISTD_H -+#include -+#endif -+ -+#include -+#include -+ -+ -+/** -+ * Detect if we can support non blocking IO. -+ */ -+#ifdef O_NONBLOCK -+#define DIO_NONBLOCK O_NONBLOCK -+#else -+#ifdef O_NDELAY -+#define DIO_NONBLOCK O_NDELAY -+#endif -+#endif -+ -+/** -+ * POSIXy platforms have file permissions -+ */ -+#define DIO_HAS_FILEPERMS -+ -+#include "php_dio_common_data.h" -+ -+typedef struct _php_dio_posix_stream_data { -+ php_dio_stream_data common; -+ int fd; -+ int flags; -+ /* Serial options */ -+ struct termios oldtio; -+} php_dio_posix_stream_data ; -+ -+#endif /* PHP_DIO_POSIX_H_ */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ ---- /dev/null -+++ b/ext/dio/php_dio_stream_wrappers.h -@@ -0,0 +1,44 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 2009 Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifndef PHP_DIO_STREAM_WRAPPERS_H_ -+#define PHP_DIO_STREAM_WRAPPERS_H_ -+ -+#define DIO_RAW_STREAM_NAME "dio.raw" -+#define DIO_RAW_STREAM_PROTOCOL "dio.raw://" -+#define DIO_SERIAL_STREAM_NAME "dio.serial" -+#define DIO_SERIAL_STREAM_PROTOCOL "dio.serial://" -+ -+extern php_stream_wrapper php_dio_raw_stream_wrapper; -+ -+PHP_FUNCTION(dio_raw); -+ -+extern php_stream_wrapper php_dio_serial_stream_wrapper; -+ -+PHP_FUNCTION(dio_serial); -+ -+#endif /* PHP_DIO_STREAM_WRAPPERS_H_ */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ ---- /dev/null -+++ b/ext/dio/php_dio_win32.h -@@ -0,0 +1,62 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 2009 Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.0 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_0.txt. | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Melanie Rhianna Lewis | -+ +----------------------------------------------------------------------+ -+ */ -+ -+#ifndef PHP_DIO_WIN32_H_ -+#define PHP_DIO_WIN32_H_ -+ -+#include -+ -+/* Windows platform can do non blocking. */ -+#define DIO_NONBLOCK -+ -+#include "php_dio_common_data.h" -+ -+#define DIO_WIN32_CANON_BUF_SIZE 8192 -+ -+/* This is the buffer information when reading in canonical mode. Data is -+ read right up to either buffer being full or a newline being read. Excess -+ data will be retained in the buffer until the next read. */ -+typedef struct _php_dio_win32_canon_data { -+ size_t size; -+ size_t read_pos; -+ size_t write_pos; -+ char buf[DIO_WIN32_CANON_BUF_SIZE]; -+ -+} php_dio_win32_canon_data; -+ -+typedef struct _php_dio_win32_stream_data { -+ php_dio_stream_data common; -+ HANDLE handle; -+ DWORD desired_access; -+ DWORD creation_disposition; -+ DCB olddcb; -+ COMMTIMEOUTS oldcto; -+ php_dio_win32_canon_data *canon_data; -+ -+} php_dio_win32_stream_data ; -+ -+#endif /* PHP_DIO_WIN32_H_ */ -+ -+/* -+ * Local variables: -+ * c-basic-offset: 4 -+ * tab-width: 4 -+ * End: -+ * vim600: fdm=marker -+ * vim: sw=4 ts=4 noet -+ */ ---- /dev/null -+++ b/ext/dio/tests/001.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+Test dio legacy open -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECT-- -+Legacy open passed ---- /dev/null -+++ b/ext/dio/tests/dio_raw_stream_001.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+Test dio raw stream open -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECT-- -+Raw open passed ---- /dev/null -+++ b/ext/dio/tests/dio_raw_stream_002.phpt -@@ -0,0 +1,27 @@ -+--TEST-- -+Test dio raw stream close -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECT-- -+Raw close passed ---- /dev/null -+++ b/ext/dio/tests/dio_raw_stream_003.phpt -@@ -0,0 +1,29 @@ -+--TEST-- -+Test dio raw stream write -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECT-- -+Raw write passed ---- /dev/null -+++ b/ext/dio/tests/dio_raw_stream_004.phpt -@@ -0,0 +1,46 @@ -+--TEST-- -+Test dio raw read -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECT-- -+Raw read passed ---- /dev/null -+++ b/ext/dio/tests/dio_raw_stream_005.phpt -@@ -0,0 +1,45 @@ -+--TEST-- -+Test dio eof read -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECT-- -+Raw feof passed ---- /dev/null -+++ b/ext/dio/tests/dio_raw_stream_006.phpt -@@ -0,0 +1,46 @@ -+--TEST-- -+Test dio raw read -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECT-- -+Raw set blocking passed ---- /dev/null -+++ b/ext/dio/tests/dio_raw_stream_007.phpt -@@ -0,0 +1,22 @@ -+--TEST-- -+Test dio_raw() call -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECT-- -+dio_raw passed diff --git a/lang/php5/patches/011-PECL-dio-additional-baudrates.patch b/lang/php5/patches/011-PECL-dio-additional-baudrates.patch deleted file mode 100644 index 11a298179a..0000000000 --- a/lang/php5/patches/011-PECL-dio-additional-baudrates.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/ext/dio/dio.c -+++ b/ext/dio/dio.c -@@ -442,6 +442,26 @@ PHP_FUNCTION(dio_tcsetattr) - - /* assign to correct values... */ - switch (Baud_Rate) { -+#ifdef B460800 -+ case 460800: -+ BAUD = B460800; -+ break; -+#endif -+#ifdef B230400 -+ case 230400: -+ BAUD = B230400; -+ break; -+#endif -+#ifdef B115200 -+ case 115200: -+ BAUD = B115200; -+ break; -+#endif -+#ifdef B57600 -+ case 57600: -+ BAUD = B57600; -+ break; -+#endif - case 38400: - BAUD = B38400; - break; diff --git a/lang/php5/patches/020-PECL-add-libevent.patch b/lang/php5/patches/020-PECL-add-libevent.patch deleted file mode 100644 index 71869a8f30..0000000000 --- a/lang/php5/patches/020-PECL-add-libevent.patch +++ /dev/null @@ -1,1758 +0,0 @@ ---- /dev/null -+++ b/ext/libevent/CREDITS -@@ -0,0 +1 @@ -+Antony Dovgal, Arnaud Le Blanc ---- /dev/null -+++ b/ext/libevent/config.m4 -@@ -0,0 +1,52 @@ -+dnl $Id: config.m4 287913 2009-08-31 08:45:42Z tony2001 $ -+ -+PHP_ARG_WITH(libevent, for libevent support, -+[ --with-libevent Include libevent support]) -+ -+if test "$PHP_LIBEVENT" != "no"; then -+ SEARCH_PATH="/usr /usr/local" -+ SEARCH_FOR="/include/event.h" -+ -+ if test "$PHP_LIBEVENT" = "yes"; then -+ AC_MSG_CHECKING([for libevent headers in default path]) -+ for i in $SEARCH_PATH ; do -+ if test -r $i/$SEARCH_FOR; then -+ LIBEVENT_DIR=$i -+ AC_MSG_RESULT(found in $i) -+ fi -+ done -+ else -+ AC_MSG_CHECKING([for libevent headers in $PHP_LIBEVENT]) -+ if test -r $PHP_LIBEVENT/$SEARCH_FOR; then -+ LIBEVENT_DIR=$PHP_LIBEVENT -+ AC_MSG_RESULT([found]) -+ fi -+ fi -+ -+ if test -z "$LIBEVENT_DIR"; then -+ AC_MSG_RESULT([not found]) -+ AC_MSG_ERROR([Cannot find libevent headers]) -+ fi -+ -+ PHP_ADD_INCLUDE($LIBEVENT_DIR/include) -+ -+ LIBNAME=event -+ LIBSYMBOL=event_base_new -+ -+ if test "x$PHP_LIBDIR" = "x"; then -+ PHP_LIBDIR=lib -+ fi -+ -+ PHP_CHECK_LIBRARY($LIBNAME,$LIBSYMBOL, -+ [ -+ PHP_ADD_LIBRARY_WITH_PATH($LIBNAME, $LIBEVENT_DIR/$PHP_LIBDIR, LIBEVENT_SHARED_LIBADD) -+ ],[ -+ AC_MSG_ERROR([wrong libevent version {1.4.+ is required} or lib not found]) -+ ],[ -+ -L$LIBEVENT_DIR/$PHP_LIBDIR -+ ]) -+ -+ PHP_ADD_EXTENSION_DEP(libevent, sockets, true) -+ PHP_SUBST(LIBEVENT_SHARED_LIBADD) -+ PHP_NEW_EXTENSION(libevent, libevent.c, $ext_shared) -+fi ---- /dev/null -+++ b/ext/libevent/libevent.c -@@ -0,0 +1,1564 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 1997-2008 The PHP Group | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.01 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_01.txt | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Antony Dovgal | -+ | Arnaud Le Blanc | -+ +----------------------------------------------------------------------+ -+*/ -+ -+/* $Id: libevent.c 300303 2010-06-09 10:43:38Z tony2001 $ */ -+ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif -+ -+#include "php.h" -+#include "php_ini.h" -+#include "ext/standard/info.h" -+#include "php_streams.h" -+#include "php_network.h" -+#include "php_libevent.h" -+ -+#include -+ -+#if PHP_VERSION_ID >= 50301 && (HAVE_SOCKETS || defined(COMPILE_DL_SOCKETS)) -+# include "ext/sockets/php_sockets.h" -+# define LIBEVENT_SOCKETS_SUPPORT -+#endif -+ -+#include -+ -+#if PHP_MAJOR_VERSION < 5 -+# ifdef PHP_WIN32 -+typedef SOCKET php_socket_t; -+# else -+typedef int php_socket_t; -+# endif -+ -+# ifdef ZTS -+# define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = (void ***) ctx -+# define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_ls -+# else -+# define TSRMLS_FETCH_FROM_CTX(ctx) -+# define TSRMLS_SET_CTX(ctx) -+# endif -+ -+# ifndef Z_ADDREF_P -+# define Z_ADDREF_P(x) (x)->refcount++ -+# endif -+#endif -+ -+static int le_event_base; -+static int le_event; -+static int le_bufferevent; -+ -+#ifdef COMPILE_DL_LIBEVENT -+ZEND_GET_MODULE(libevent) -+#endif -+ -+typedef struct _php_event_base_t { /* {{{ */ -+ struct event_base *base; -+ int rsrc_id; -+ zend_uint events; -+} php_event_base_t; -+/* }}} */ -+ -+typedef struct _php_event_callback_t { /* {{{ */ -+ zval *func; -+ zval *arg; -+} php_event_callback_t; -+/* }}} */ -+ -+typedef struct _php_event_t { /* {{{ */ -+ struct event *event; -+ int rsrc_id; -+ int stream_id; -+ php_event_base_t *base; -+ php_event_callback_t *callback; -+#ifdef ZTS -+ void ***thread_ctx; -+#endif -+ int in_free; -+} php_event_t; -+/* }}} */ -+ -+typedef struct _php_bufferevent_t { /* {{{ */ -+ struct bufferevent *bevent; -+ int rsrc_id; -+ php_event_base_t *base; -+ zval *readcb; -+ zval *writecb; -+ zval *errorcb; -+ zval *arg; -+#ifdef ZTS -+ void ***thread_ctx; -+#endif -+} php_bufferevent_t; -+/* }}} */ -+ -+#define ZVAL_TO_BASE(zval, base) \ -+ ZEND_FETCH_RESOURCE(base, php_event_base_t *, &zval, -1, "event base", le_event_base) -+ -+#define ZVAL_TO_EVENT(zval, event) \ -+ ZEND_FETCH_RESOURCE(event, php_event_t *, &zval, -1, "event", le_event) -+ -+#define ZVAL_TO_BEVENT(zval, bevent) \ -+ ZEND_FETCH_RESOURCE(bevent, php_bufferevent_t *, &zval, -1, "buffer event", le_bufferevent) -+ -+/* {{{ internal funcs */ -+ -+static inline void _php_event_callback_free(php_event_callback_t *callback) /* {{{ */ -+{ -+ if (!callback) { -+ return; -+ } -+ -+ zval_ptr_dtor(&callback->func); -+ if (callback->arg) { -+ zval_ptr_dtor(&callback->arg); -+ } -+ efree(callback); -+} -+/* }}} */ -+ -+static void _php_event_base_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */ -+{ -+ php_event_base_t *base = (php_event_base_t*)rsrc->ptr; -+ -+ event_base_free(base->base); -+ efree(base); -+} -+/* }}} */ -+ -+static void _php_event_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */ -+{ -+ php_event_t *event = (php_event_t*)rsrc->ptr; -+ int base_id = -1; -+ -+ if (event->in_free) { -+ return; -+ } -+ -+ event->in_free = 1; -+ -+ if (event->base) { -+ base_id = event->base->rsrc_id; -+ --event->base->events; -+ } -+ if (event->stream_id >= 0) { -+ zend_list_delete(event->stream_id); -+ } -+ event_del(event->event); -+ -+ _php_event_callback_free(event->callback); -+ efree(event->event); -+ efree(event); -+ -+ if (base_id >= 0) { -+ zend_list_delete(base_id); -+ } -+} -+/* }}} */ -+ -+static void _php_bufferevent_dtor(zend_rsrc_list_entry *rsrc TSRMLS_DC) /* {{{ */ -+{ -+ php_bufferevent_t *bevent = (php_bufferevent_t*)rsrc->ptr; -+ int base_id = -1; -+ -+ if (bevent->base) { -+ base_id = bevent->base->rsrc_id; -+ --bevent->base->events; -+ } -+ if (bevent->readcb) { -+ zval_ptr_dtor(&(bevent->readcb)); -+ } -+ if (bevent->writecb) { -+ zval_ptr_dtor(&(bevent->writecb)); -+ } -+ if (bevent->errorcb) { -+ zval_ptr_dtor(&(bevent->errorcb)); -+ } -+ if (bevent->arg) { -+ zval_ptr_dtor(&(bevent->arg)); -+ } -+ -+ bufferevent_free(bevent->bevent); -+ efree(bevent); -+ -+ if (base_id >= 0) { -+ zend_list_delete(base_id); -+ } -+} -+/* }}} */ -+ -+static void _php_event_callback(int fd, short events, void *arg) /* {{{ */ -+{ -+ zval *args[3]; -+ php_event_t *event = (php_event_t *)arg; -+ php_event_callback_t *callback; -+ zval retval; -+ TSRMLS_FETCH_FROM_CTX(event ? event->thread_ctx : NULL); -+ -+ if (!event || !event->callback || !event->base) { -+ return; -+ } -+ -+ callback = event->callback; -+ -+ MAKE_STD_ZVAL(args[0]); -+ if (event->stream_id >= 0) { -+ ZVAL_RESOURCE(args[0], event->stream_id); -+ zend_list_addref(event->stream_id); -+ } else { -+ ZVAL_NULL(args[0]); -+ } -+ -+ MAKE_STD_ZVAL(args[1]); -+ ZVAL_LONG(args[1], events); -+ -+ args[2] = callback->arg; -+ Z_ADDREF_P(callback->arg); -+ -+ if (call_user_function(EG(function_table), NULL, callback->func, &retval, 3, args TSRMLS_CC) == SUCCESS) { -+ zval_dtor(&retval); -+ } -+ -+ zval_ptr_dtor(&(args[0])); -+ zval_ptr_dtor(&(args[1])); -+ zval_ptr_dtor(&(args[2])); -+ -+} -+/* }}} */ -+ -+static void _php_bufferevent_readcb(struct bufferevent *be, void *arg) /* {{{ */ -+{ -+ zval *args[2]; -+ zval retval; -+ php_bufferevent_t *bevent = (php_bufferevent_t *)arg; -+ TSRMLS_FETCH_FROM_CTX(bevent ? bevent->thread_ctx : NULL); -+ -+ if (!bevent || !bevent->base || !bevent->readcb) { -+ return; -+ } -+ -+ MAKE_STD_ZVAL(args[0]); -+ ZVAL_RESOURCE(args[0], bevent->rsrc_id); -+ zend_list_addref(bevent->rsrc_id); /* we do refcount-- later in zval_ptr_dtor */ -+ -+ args[1] = bevent->arg; -+ Z_ADDREF_P(args[1]); -+ -+ if (call_user_function(EG(function_table), NULL, bevent->readcb, &retval, 2, args TSRMLS_CC) == SUCCESS) { -+ zval_dtor(&retval); -+ } -+ -+ zval_ptr_dtor(&(args[0])); -+ zval_ptr_dtor(&(args[1])); -+ -+} -+/* }}} */ -+ -+static void _php_bufferevent_writecb(struct bufferevent *be, void *arg) /* {{{ */ -+{ -+ zval *args[2]; -+ zval retval; -+ php_bufferevent_t *bevent = (php_bufferevent_t *)arg; -+ TSRMLS_FETCH_FROM_CTX(bevent ? bevent->thread_ctx : NULL); -+ -+ if (!bevent || !bevent->base || !bevent->writecb) { -+ return; -+ } -+ -+ MAKE_STD_ZVAL(args[0]); -+ ZVAL_RESOURCE(args[0], bevent->rsrc_id); -+ zend_list_addref(bevent->rsrc_id); /* we do refcount-- later in zval_ptr_dtor */ -+ -+ args[1] = bevent->arg; -+ Z_ADDREF_P(args[1]); -+ -+ if (call_user_function(EG(function_table), NULL, bevent->writecb, &retval, 2, args TSRMLS_CC) == SUCCESS) { -+ zval_dtor(&retval); -+ } -+ -+ zval_ptr_dtor(&(args[0])); -+ zval_ptr_dtor(&(args[1])); -+ -+} -+/* }}} */ -+ -+static void _php_bufferevent_errorcb(struct bufferevent *be, short what, void *arg) /* {{{ */ -+{ -+ zval *args[3]; -+ zval retval; -+ php_bufferevent_t *bevent = (php_bufferevent_t *)arg; -+ TSRMLS_FETCH_FROM_CTX(bevent ? bevent->thread_ctx : NULL); -+ -+ if (!bevent || !bevent->base || !bevent->errorcb) { -+ return; -+ } -+ -+ MAKE_STD_ZVAL(args[0]); -+ ZVAL_RESOURCE(args[0], bevent->rsrc_id); -+ zend_list_addref(bevent->rsrc_id); /* we do refcount-- later in zval_ptr_dtor */ -+ -+ MAKE_STD_ZVAL(args[1]); -+ ZVAL_LONG(args[1], what); -+ -+ args[2] = bevent->arg; -+ Z_ADDREF_P(args[2]); -+ -+ if (call_user_function(EG(function_table), NULL, bevent->errorcb, &retval, 3, args TSRMLS_CC) == SUCCESS) { -+ zval_dtor(&retval); -+ } -+ -+ zval_ptr_dtor(&(args[0])); -+ zval_ptr_dtor(&(args[1])); -+ zval_ptr_dtor(&(args[2])); -+ -+} -+/* }}} */ -+ -+/* }}} */ -+ -+ -+/* {{{ proto resource event_base_new() -+ */ -+static PHP_FUNCTION(event_base_new) -+{ -+ php_event_base_t *base; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") != SUCCESS) { -+ return; -+ } -+ -+ base = emalloc(sizeof(php_event_base_t)); -+ base->base = event_base_new(); -+ if (!base->base) { -+ efree(base); -+ RETURN_FALSE; -+ } -+ -+ base->events = 0; -+ -+ base->rsrc_id = zend_list_insert(base, le_event_base); -+ RETURN_RESOURCE(base->rsrc_id); -+} -+/* }}} */ -+ -+/* {{{ proto void event_base_free(resource base) -+ */ -+static PHP_FUNCTION(event_base_free) -+{ -+ zval *zbase; -+ php_event_base_t *base; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zbase) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BASE(zbase, base); -+ -+ if (base->events > 0) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "base has events attached to it and cannot be freed"); -+ RETURN_FALSE; -+ } -+ -+ zend_list_delete(base->rsrc_id); -+} -+/* }}} */ -+ -+/* {{{ proto int event_base_loop(resource base[, int flags]) -+ */ -+static PHP_FUNCTION(event_base_loop) -+{ -+ zval *zbase; -+ php_event_base_t *base; -+ long flags = 0; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zbase, &flags) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BASE(zbase, base); -+ zend_list_addref(base->rsrc_id); /* make sure the base cannot be destroyed during the loop */ -+ ret = event_base_loop(base->base, flags); -+ zend_list_delete(base->rsrc_id); -+ -+ RETURN_LONG(ret); -+} -+/* }}} */ -+ -+/* {{{ proto bool event_base_loopbreak(resource base) -+ */ -+static PHP_FUNCTION(event_base_loopbreak) -+{ -+ zval *zbase; -+ php_event_base_t *base; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zbase) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BASE(zbase, base); -+ ret = event_base_loopbreak(base->base); -+ if (ret == 0) { -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto bool event_base_loopexit(resource base[, int timeout]) -+ */ -+static PHP_FUNCTION(event_base_loopexit) -+{ -+ zval *zbase; -+ php_event_base_t *base; -+ int ret; -+ long timeout = -1; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zbase, &timeout) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BASE(zbase, base); -+ -+ if (timeout < 0) { -+ ret = event_base_loopexit(base->base, NULL); -+ } else { -+ struct timeval time; -+ -+ time.tv_usec = timeout % 1000000; -+ time.tv_sec = timeout / 1000000; -+ ret = event_base_loopexit(base->base, &time); -+ } -+ -+ if (ret == 0) { -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto bool event_base_set(resource event, resource base) -+ */ -+static PHP_FUNCTION(event_base_set) -+{ -+ zval *zbase, *zevent; -+ php_event_base_t *base, *old_base; -+ php_event_t *event; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &zevent, &zbase) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BASE(zbase, base); -+ ZVAL_TO_EVENT(zevent, event); -+ -+ old_base = event->base; -+ ret = event_base_set(base->base, event->event); -+ -+ if (ret == 0) { -+ if (base != old_base) { -+ /* make sure the base is destroyed after the event */ -+ zend_list_addref(base->rsrc_id); -+ ++base->events; -+ } -+ -+ if (old_base) { -+ --old_base->events; -+ zend_list_delete(old_base->rsrc_id); -+ } -+ -+ event->base = base; -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto bool event_base_priority_init(resource base, int npriorities) -+ */ -+static PHP_FUNCTION(event_base_priority_init) -+{ -+ zval *zbase; -+ php_event_base_t *base; -+ long npriorities; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbase, &npriorities) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BASE(zbase, base); -+ -+ if (npriorities < 0) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "npriorities cannot be less than zero"); -+ RETURN_FALSE; -+ } -+ -+ ret = event_base_priority_init(base->base, npriorities); -+ if (ret == 0) { -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+ -+/* {{{ proto resource event_new() -+ */ -+static PHP_FUNCTION(event_new) -+{ -+ php_event_t *event; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "") != SUCCESS) { -+ return; -+ } -+ -+ event = emalloc(sizeof(php_event_t)); -+ event->event = ecalloc(1, sizeof(struct event)); -+ -+ event->stream_id = -1; -+ event->callback = NULL; -+ event->base = NULL; -+ event->in_free = 0; -+ TSRMLS_SET_CTX(event->thread_ctx); -+ -+ event->rsrc_id = zend_list_insert(event, le_event); -+ RETURN_RESOURCE(event->rsrc_id); -+} -+/* }}} */ -+ -+/* {{{ proto void event_free(resource event) -+ */ -+static PHP_FUNCTION(event_free) -+{ -+ zval *zevent; -+ php_event_t *event; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zevent) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_EVENT(zevent, event); -+ zend_list_delete(event->rsrc_id); -+} -+/* }}} */ -+ -+/* {{{ proto bool event_add(resource event[, int timeout]) -+ */ -+static PHP_FUNCTION(event_add) -+{ -+ zval *zevent; -+ php_event_t *event; -+ int ret; -+ long timeout = -1; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zevent, &timeout) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_EVENT(zevent, event); -+ -+ if (!event->base) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to add event without an event base"); -+ RETURN_FALSE; -+ } -+ -+ if (timeout < 0) { -+ ret = event_add(event->event, NULL); -+ } else { -+ struct timeval time; -+ -+ time.tv_usec = timeout % 1000000; -+ time.tv_sec = timeout / 1000000; -+ ret = event_add(event->event, &time); -+ } -+ -+ if (ret != 0) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto bool event_set(resource event, resource fd, int events, mixed callback[, mixed arg]) -+ */ -+static PHP_FUNCTION(event_set) -+{ -+ zval *zevent, **fd, *zcallback, *zarg = NULL; -+ php_event_t *event; -+ long events; -+ php_event_callback_t *callback, *old_callback; -+ char *func_name; -+ php_stream *stream; -+ php_socket_t file_desc; -+#ifdef LIBEVENT_SOCKETS_SUPPORT -+ php_socket *php_sock; -+#endif -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rZlz|z", &zevent, &fd, &events, &zcallback, &zarg) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_EVENT(zevent, event); -+ -+ if (events & EV_SIGNAL) { -+ /* signal support */ -+ convert_to_long_ex(fd); -+ file_desc = Z_LVAL_PP(fd); -+ if (file_desc < 0 || file_desc >= NSIG) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "invalid signal passed"); -+ RETURN_FALSE; -+ } -+ } else { -+ if (ZEND_FETCH_RESOURCE_NO_RETURN(stream, php_stream *, fd, -1, NULL, php_file_le_stream())) { -+ if (php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&file_desc, 1) != SUCCESS || file_desc < 0) { -+ RETURN_FALSE; -+ } -+ } else { -+#ifdef LIBEVENT_SOCKETS_SUPPORT -+ if (ZEND_FETCH_RESOURCE_NO_RETURN(php_sock, php_socket *, fd, -1, NULL, php_sockets_le_socket())) { -+ file_desc = php_sock->bsd_socket; -+ } else { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "fd argument must be either valid PHP stream or valid PHP socket resource"); -+ RETURN_FALSE; -+ } -+#else -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "fd argument must be valid PHP stream resource"); -+ RETURN_FALSE; -+#endif -+ } -+ } -+ -+ if (!zend_is_callable(zcallback, 0, &func_name TSRMLS_CC)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid callback", func_name); -+ efree(func_name); -+ RETURN_FALSE; -+ } -+ efree(func_name); -+ -+ zval_add_ref(&zcallback); -+ if (zarg) { -+ zval_add_ref(&zarg); -+ } else { -+ ALLOC_INIT_ZVAL(zarg); -+ } -+ -+ callback = emalloc(sizeof(php_event_callback_t)); -+ callback->func = zcallback; -+ callback->arg = zarg; -+ -+ old_callback = event->callback; -+ event->callback = callback; -+ if (events & EV_SIGNAL) { -+ event->stream_id = -1; -+ } else { -+ zend_list_addref(Z_LVAL_PP(fd)); -+ event->stream_id = Z_LVAL_PP(fd); -+ } -+ -+ event_set(event->event, (int)file_desc, (short)events, _php_event_callback, event); -+ -+ if (old_callback) { -+ _php_event_callback_free(old_callback); -+ } -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto bool event_del(resource event) -+ */ -+static PHP_FUNCTION(event_del) -+{ -+ zval *zevent; -+ php_event_t *event; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zevent) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_EVENT(zevent, event); -+ -+ if (!event->base) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to delete event without an event base"); -+ RETURN_FALSE; -+ } -+ -+ if (event_del(event->event) == 0) { -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+ -+/* {{{ proto bool event_timer_set(resource event, mixed callback[, mixed arg]) -+ */ -+static PHP_FUNCTION(event_timer_set) -+{ -+ zval *zevent, *zcallback, *zarg = NULL; -+ php_event_t *event; -+ php_event_callback_t *callback, *old_callback; -+ char *func_name; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rz|z", &zevent, &zcallback, &zarg) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_EVENT(zevent, event); -+ -+ if (!zend_is_callable(zcallback, 0, &func_name TSRMLS_CC)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid callback", func_name); -+ efree(func_name); -+ RETURN_FALSE; -+ } -+ efree(func_name); -+ -+ zval_add_ref(&zcallback); -+ if (zarg) { -+ zval_add_ref(&zarg); -+ } else { -+ ALLOC_INIT_ZVAL(zarg); -+ } -+ -+ callback = emalloc(sizeof(php_event_callback_t)); -+ callback->func = zcallback; -+ callback->arg = zarg; -+ -+ old_callback = event->callback; -+ event->callback = callback; -+ if (event->stream_id >= 0) { -+ zend_list_delete(event->stream_id); -+ } -+ event->stream_id = -1; -+ -+ event_set(event->event, -1, 0, _php_event_callback, event); -+ -+ if (old_callback) { -+ _php_event_callback_free(old_callback); -+ } -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto bool event_timer_pending(resource event[, int timeout]) -+ */ -+static PHP_FUNCTION(event_timer_pending) -+{ -+ zval *zevent; -+ php_event_t *event; -+ int ret; -+ long timeout = -1; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r|l", &zevent, &timeout) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_EVENT(zevent, event); -+ -+ if (timeout < 0) { -+ ret = event_pending(event->event, EV_TIMEOUT, NULL); -+ } else { -+ struct timeval time; -+ -+ time.tv_usec = timeout % 1000000; -+ time.tv_sec = timeout / 1000000; -+ ret = event_pending(event->event, EV_TIMEOUT, &time); -+ } -+ -+ if (ret != 0) { -+ RETURN_FALSE; -+ } -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+ -+ -+/* {{{ proto resource event_buffer_new(resource stream, mixed readcb, mixed writecb, mixed errorcb[, mixed arg]) -+ */ -+static PHP_FUNCTION(event_buffer_new) -+{ -+ php_bufferevent_t *bevent; -+ php_stream *stream; -+ zval *zstream, *zreadcb, *zwritecb, *zerrorcb, *zarg = NULL; -+ php_socket_t fd; -+ char *func_name; -+#ifdef LIBEVENT_SOCKETS_SUPPORT -+ php_socket *php_sock; -+#endif -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzzz|z", &zstream, &zreadcb, &zwritecb, &zerrorcb, &zarg) != SUCCESS) { -+ return; -+ } -+ -+ if (ZEND_FETCH_RESOURCE_NO_RETURN(stream, php_stream *, &zstream, -1, NULL, php_file_le_stream())) { -+ if (php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&fd, 1) != SUCCESS || fd < 0) { -+ RETURN_FALSE; -+ } -+ } else { -+#ifdef LIBEVENT_SOCKETS_SUPPORT -+ if (ZEND_FETCH_RESOURCE_NO_RETURN(php_sock, php_socket *, &zstream, -1, NULL, php_sockets_le_socket())) { -+ fd = php_sock->bsd_socket; -+ } else { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "stream argument must be either valid PHP stream or valid PHP socket resource"); -+ RETURN_FALSE; -+ } -+#else -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "stream argument must be valid PHP stream resource"); -+ RETURN_FALSE; -+#endif -+ } -+ -+ if (Z_TYPE_P(zreadcb) != IS_NULL) { -+ if (!zend_is_callable(zreadcb, 0, &func_name TSRMLS_CC)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid read callback", func_name); -+ efree(func_name); -+ RETURN_FALSE; -+ } -+ efree(func_name); -+ } else { -+ zreadcb = NULL; -+ } -+ -+ if (Z_TYPE_P(zwritecb) != IS_NULL) { -+ if (!zend_is_callable(zwritecb, 0, &func_name TSRMLS_CC)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid write callback", func_name); -+ efree(func_name); -+ RETURN_FALSE; -+ } -+ efree(func_name); -+ } else { -+ zwritecb = NULL; -+ } -+ -+ if (!zend_is_callable(zerrorcb, 0, &func_name TSRMLS_CC)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid error callback", func_name); -+ efree(func_name); -+ RETURN_FALSE; -+ } -+ efree(func_name); -+ -+ bevent = emalloc(sizeof(php_bufferevent_t)); -+ bevent->bevent = bufferevent_new(fd, _php_bufferevent_readcb, _php_bufferevent_writecb, _php_bufferevent_errorcb, bevent); -+ -+ bevent->base = NULL; -+ -+ if (zreadcb) { -+ zval_add_ref(&zreadcb); -+ } -+ bevent->readcb = zreadcb; -+ -+ if (zwritecb) { -+ zval_add_ref(&zwritecb); -+ } -+ bevent->writecb = zwritecb; -+ -+ zval_add_ref(&zerrorcb); -+ bevent->errorcb = zerrorcb; -+ -+ if (zarg) { -+ zval_add_ref(&zarg); -+ bevent->arg = zarg; -+ } else { -+ ALLOC_INIT_ZVAL(bevent->arg); -+ } -+ -+ TSRMLS_SET_CTX(bevent->thread_ctx); -+ -+ bevent->rsrc_id = zend_list_insert(bevent, le_bufferevent); -+ RETURN_RESOURCE(bevent->rsrc_id); -+} -+/* }}} */ -+ -+/* {{{ proto void event_buffer_free(resource bevent) -+ */ -+static PHP_FUNCTION(event_buffer_free) -+{ -+ zval *zbevent; -+ php_bufferevent_t *bevent; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zbevent) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ zend_list_delete(bevent->rsrc_id); -+} -+/* }}} */ -+ -+/* {{{ proto bool event_buffer_base_set(resource bevent, resource base) -+ */ -+static PHP_FUNCTION(event_buffer_base_set) -+{ -+ zval *zbase, *zbevent; -+ php_event_base_t *base, *old_base; -+ php_bufferevent_t *bevent; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &zbevent, &zbase) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BASE(zbase, base); -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ -+ old_base = bevent->base; -+ ret = bufferevent_base_set(base->base, bevent->bevent); -+ -+ if (ret == 0) { -+ if (base != old_base) { -+ /* make sure the base is destroyed after the event */ -+ zend_list_addref(base->rsrc_id); -+ ++base->events; -+ } -+ -+ if (old_base) { -+ --old_base->events; -+ zend_list_delete(old_base->rsrc_id); -+ } -+ -+ bevent->base = base; -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto bool event_buffer_priority_set(resource bevent, int priority) -+ */ -+static PHP_FUNCTION(event_buffer_priority_set) -+{ -+ zval *zbevent; -+ php_bufferevent_t *bevent; -+ long priority; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbevent, &priority) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ -+ if (!bevent->base) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "Unable to set event priority without an event base"); -+ RETURN_FALSE; -+ } -+ -+ ret = bufferevent_priority_set(bevent->bevent, priority); -+ -+ if (ret == 0) { -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto bool event_buffer_write(resource bevent, string data[, int data_size]) -+ */ -+static PHP_FUNCTION(event_buffer_write) -+{ -+ zval *zbevent; -+ php_bufferevent_t *bevent; -+ char *data; -+ int data_len; -+ long data_size = -1; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rs|l", &zbevent, &data, &data_len, &data_size) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ -+ if (ZEND_NUM_ARGS() < 3 || data_size < 0) { -+ data_size = data_len; -+ } else if (data_size > data_len) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_size out of range"); -+ RETURN_FALSE; -+ } -+ -+ ret = bufferevent_write(bevent->bevent, (const void *)data, data_size); -+ -+ if (ret == 0) { -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto string event_buffer_read(resource bevent, int data_size) -+ */ -+static PHP_FUNCTION(event_buffer_read) -+{ -+ zval *zbevent; -+ php_bufferevent_t *bevent; -+ char *data; -+ long data_size; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbevent, &data_size) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ -+ if (data_size == 0) { -+ RETURN_EMPTY_STRING(); -+ } else if (data_size < 0) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "data_size cannot be less than zero"); -+ RETURN_FALSE; -+ } -+ -+ data = safe_emalloc((int)data_size, sizeof(char), 1); -+ -+ ret = bufferevent_read(bevent->bevent, data, data_size); -+ if (ret > 0) { -+ if (ret > data_size) { /* paranoia */ -+ ret = data_size; -+ } -+ data[ret] = '\0'; -+ RETURN_STRINGL(data, ret, 0); -+ } -+ efree(data); -+ RETURN_EMPTY_STRING(); -+} -+/* }}} */ -+ -+/* {{{ proto bool event_buffer_enable(resource bevent, int events) -+ */ -+static PHP_FUNCTION(event_buffer_enable) -+{ -+ zval *zbevent; -+ php_bufferevent_t *bevent; -+ long events; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbevent, &events) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ -+ ret = bufferevent_enable(bevent->bevent, events); -+ -+ if (ret == 0) { -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto bool event_buffer_disable(resource bevent, int events) -+ */ -+static PHP_FUNCTION(event_buffer_disable) -+{ -+ zval *zbevent; -+ php_bufferevent_t *bevent; -+ long events; -+ int ret; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rl", &zbevent, &events) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ -+ ret = bufferevent_disable(bevent->bevent, events); -+ -+ if (ret == 0) { -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto void event_buffer_timeout_set(resource bevent, int read_timeout, int write_timeout) -+ */ -+static PHP_FUNCTION(event_buffer_timeout_set) -+{ -+ zval *zbevent; -+ php_bufferevent_t *bevent; -+ long read_timeout, write_timeout; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rll", &zbevent, &read_timeout, &write_timeout) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ bufferevent_settimeout(bevent->bevent, read_timeout, write_timeout); -+} -+/* }}} */ -+ -+/* {{{ proto void event_buffer_watermark_set(resource bevent, int events, int lowmark, int highmark) -+ */ -+static PHP_FUNCTION(event_buffer_watermark_set) -+{ -+ zval *zbevent; -+ php_bufferevent_t *bevent; -+ long events, lowmark, highmark; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rlll", &zbevent, &events, &lowmark, &highmark) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ bufferevent_setwatermark(bevent->bevent, events, lowmark, highmark); -+} -+/* }}} */ -+ -+/* {{{ proto void event_buffer_fd_set(resource bevent, resource fd) -+ */ -+static PHP_FUNCTION(event_buffer_fd_set) -+{ -+ zval *zbevent, *zfd; -+ php_stream *stream; -+ php_bufferevent_t *bevent; -+ php_socket_t fd; -+#ifdef LIBEVENT_SOCKETS_SUPPORT -+ php_socket *php_sock; -+#endif -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rr", &zbevent, &zfd) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ if (ZEND_FETCH_RESOURCE_NO_RETURN(stream, php_stream *, &zfd, -1, NULL, php_file_le_stream())) { -+ if (php_stream_cast(stream, PHP_STREAM_AS_FD_FOR_SELECT | PHP_STREAM_CAST_INTERNAL, (void*)&fd, 1) != SUCCESS || fd < 0) { -+ RETURN_FALSE; -+ } -+ } else { -+#ifdef LIBEVENT_SOCKETS_SUPPORT -+ if (ZEND_FETCH_RESOURCE_NO_RETURN(php_sock, php_socket *, &zfd, -1, NULL, php_sockets_le_socket())) { -+ fd = php_sock->bsd_socket; -+ } else { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "fd argument must be either valid PHP stream or valid PHP socket resource"); -+ RETURN_FALSE; -+ } -+#else -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "fd argument must be valid PHP stream resource"); -+ RETURN_FALSE; -+#endif -+ } -+ -+ bufferevent_setfd(bevent->bevent, fd); -+} -+/* }}} */ -+ -+/* {{{ proto resource event_buffer_set_callback(resource bevent, mixed readcb, mixed writecb, mixed errorcb[, mixed arg]) -+ */ -+static PHP_FUNCTION(event_buffer_set_callback) -+{ -+ php_bufferevent_t *bevent; -+ zval *zbevent, *zreadcb, *zwritecb, *zerrorcb, *zarg = NULL; -+ char *func_name; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "rzzz|z", &zbevent, &zreadcb, &zwritecb, &zerrorcb, &zarg) != SUCCESS) { -+ return; -+ } -+ -+ ZVAL_TO_BEVENT(zbevent, bevent); -+ -+ if (Z_TYPE_P(zreadcb) != IS_NULL) { -+ if (!zend_is_callable(zreadcb, 0, &func_name TSRMLS_CC)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid read callback", func_name); -+ efree(func_name); -+ RETURN_FALSE; -+ } -+ efree(func_name); -+ } else { -+ zreadcb = NULL; -+ } -+ -+ if (Z_TYPE_P(zwritecb) != IS_NULL) { -+ if (!zend_is_callable(zwritecb, 0, &func_name TSRMLS_CC)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid write callback", func_name); -+ efree(func_name); -+ RETURN_FALSE; -+ } -+ efree(func_name); -+ } else { -+ zwritecb = NULL; -+ } -+ -+ if (Z_TYPE_P(zerrorcb) != IS_NULL) { -+ if (!zend_is_callable(zerrorcb, 0, &func_name TSRMLS_CC)) { -+ php_error_docref(NULL TSRMLS_CC, E_WARNING, "'%s' is not a valid error callback", func_name); -+ efree(func_name); -+ RETURN_FALSE; -+ } -+ efree(func_name); -+ } else { -+ zerrorcb = NULL; -+ } -+ -+ if (zreadcb) { -+ zval_add_ref(&zreadcb); -+ -+ if (bevent->readcb) { -+ zval_ptr_dtor(&bevent->readcb); -+ } -+ bevent->readcb = zreadcb; -+ } else { -+ if (bevent->readcb) { -+ zval_ptr_dtor(&bevent->readcb); -+ } -+ bevent->readcb = NULL; -+ } -+ -+ if (zwritecb) { -+ zval_add_ref(&zwritecb); -+ -+ if (bevent->writecb) { -+ zval_ptr_dtor(&bevent->writecb); -+ } -+ bevent->writecb = zwritecb; -+ } else { -+ if (bevent->writecb) { -+ zval_ptr_dtor(&bevent->writecb); -+ } -+ bevent->writecb = NULL; -+ } -+ -+ if (zerrorcb) { -+ zval_add_ref(&zerrorcb); -+ -+ if (bevent->errorcb) { -+ zval_ptr_dtor(&bevent->errorcb); -+ } -+ bevent->errorcb = zerrorcb; -+ } -+ -+ if (zarg) { -+ zval_add_ref(&zarg); -+ if (bevent->arg) { -+ zval_ptr_dtor(&bevent->arg); -+ } -+ bevent->arg = zarg; -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+ -+/* {{{ PHP_MINIT_FUNCTION -+ */ -+static PHP_MINIT_FUNCTION(libevent) -+{ -+ le_event_base = zend_register_list_destructors_ex(_php_event_base_dtor, NULL, "event base", module_number); -+ le_event = zend_register_list_destructors_ex(_php_event_dtor, NULL, "event", module_number); -+ le_bufferevent = zend_register_list_destructors_ex(_php_bufferevent_dtor, NULL, "buffer event", module_number); -+ -+ REGISTER_LONG_CONSTANT("EV_TIMEOUT", EV_TIMEOUT, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EV_READ", EV_READ, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EV_WRITE", EV_WRITE, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EV_SIGNAL", EV_SIGNAL, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EV_PERSIST", EV_PERSIST, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EVLOOP_NONBLOCK", EVLOOP_NONBLOCK, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EVLOOP_ONCE", EVLOOP_ONCE, CONST_CS | CONST_PERSISTENT); -+ -+ REGISTER_LONG_CONSTANT("EVBUFFER_READ", EVBUFFER_READ, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EVBUFFER_WRITE", EVBUFFER_WRITE, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EVBUFFER_EOF", EVBUFFER_EOF, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EVBUFFER_ERROR", EVBUFFER_ERROR, CONST_CS | CONST_PERSISTENT); -+ REGISTER_LONG_CONSTANT("EVBUFFER_TIMEOUT", EVBUFFER_TIMEOUT, CONST_CS | CONST_PERSISTENT); -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ PHP_MINFO_FUNCTION -+ */ -+static PHP_MINFO_FUNCTION(libevent) -+{ -+ char buf[64]; -+ -+ -+ php_info_print_table_start(); -+ php_info_print_table_header(2, "libevent support", "enabled"); -+ php_info_print_table_row(2, "extension version", PHP_LIBEVENT_VERSION); -+ php_info_print_table_row(2, "Revision", "$Revision: 300303 $"); -+ -+ snprintf(buf, sizeof(buf) - 1, "%s", event_get_version()); -+ php_info_print_table_row(2, "libevent version", buf); -+ -+ php_info_print_table_end(); -+} -+/* }}} */ -+ -+#if PHP_MAJOR_VERSION >= 5 -+/* {{{ arginfo */ -+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3) || PHP_MAJOR_VERSION > 5 -+# define EVENT_ARGINFO -+#else -+# define EVENT_ARGINFO static -+#endif -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_loop, 0, 0, 1) -+ ZEND_ARG_INFO(0, base) -+ ZEND_ARG_INFO(0, flags) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_loopbreak, 0, 0, 1) -+ ZEND_ARG_INFO(0, base) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_loopexit, 0, 0, 1) -+ ZEND_ARG_INFO(0, base) -+ ZEND_ARG_INFO(0, timeout) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_set, 0, 0, 2) -+ ZEND_ARG_INFO(0, event) -+ ZEND_ARG_INFO(0, base) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_base_priority_init, 0, 0, 2) -+ ZEND_ARG_INFO(0, base) -+ ZEND_ARG_INFO(0, npriorities) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO(arginfo_event_new, 0) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_add, 0, 0, 1) -+ ZEND_ARG_INFO(0, event) -+ ZEND_ARG_INFO(0, timeout) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_set, 0, 0, 4) -+ ZEND_ARG_INFO(0, event) -+ ZEND_ARG_INFO(0, fd) -+ ZEND_ARG_INFO(0, events) -+ ZEND_ARG_INFO(0, callback) -+ ZEND_ARG_INFO(0, arg) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_del, 0, 0, 1) -+ ZEND_ARG_INFO(0, event) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_new, 0, 0, 4) -+ ZEND_ARG_INFO(0, stream) -+ ZEND_ARG_INFO(0, readcb) -+ ZEND_ARG_INFO(0, writecb) -+ ZEND_ARG_INFO(0, errorcb) -+ ZEND_ARG_INFO(0, arg) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_free, 0, 0, 1) -+ ZEND_ARG_INFO(0, bevent) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_base_set, 0, 0, 2) -+ ZEND_ARG_INFO(0, bevent) -+ ZEND_ARG_INFO(0, base) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_priority_set, 0, 0, 2) -+ ZEND_ARG_INFO(0, bevent) -+ ZEND_ARG_INFO(0, priority) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_write, 0, 0, 2) -+ ZEND_ARG_INFO(0, bevent) -+ ZEND_ARG_INFO(0, data) -+ ZEND_ARG_INFO(0, data_size) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_read, 0, 0, 2) -+ ZEND_ARG_INFO(0, bevent) -+ ZEND_ARG_INFO(0, data_size) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_disable, 0, 0, 2) -+ ZEND_ARG_INFO(0, bevent) -+ ZEND_ARG_INFO(0, events) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_timeout_set, 0, 0, 3) -+ ZEND_ARG_INFO(0, bevent) -+ ZEND_ARG_INFO(0, read_timeout) -+ ZEND_ARG_INFO(0, write_timeout) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_watermark_set, 0, 0, 4) -+ ZEND_ARG_INFO(0, bevent) -+ ZEND_ARG_INFO(0, events) -+ ZEND_ARG_INFO(0, lowmark) -+ ZEND_ARG_INFO(0, highmark) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_fd_set, 0, 0, 2) -+ ZEND_ARG_INFO(0, bevent) -+ ZEND_ARG_INFO(0, fd) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_buffer_set_callback, 0, 0, 4) -+ ZEND_ARG_INFO(0, bevent) -+ ZEND_ARG_INFO(0, readcb) -+ ZEND_ARG_INFO(0, writecb) -+ ZEND_ARG_INFO(0, errorcb) -+ ZEND_ARG_INFO(0, arg) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_timer_set, 0, 0, 2) -+ ZEND_ARG_INFO(0, event) -+ ZEND_ARG_INFO(0, callback) -+ ZEND_ARG_INFO(0, arg) -+ZEND_END_ARG_INFO() -+ -+EVENT_ARGINFO -+ZEND_BEGIN_ARG_INFO_EX(arginfo_event_timer_pending, 0, 0, 1) -+ ZEND_ARG_INFO(0, event) -+ ZEND_ARG_INFO(0, timeout) -+ZEND_END_ARG_INFO() -+/* }}} */ -+ -+/* {{{ libevent_functions[] -+ */ -+#if ZEND_MODULE_API_NO >= 20071006 -+const -+#endif -+zend_function_entry libevent_functions[] = { -+ PHP_FE(event_base_new, arginfo_event_new) -+ PHP_FE(event_base_free, arginfo_event_base_loopbreak) -+ PHP_FE(event_base_loop, arginfo_event_base_loop) -+ PHP_FE(event_base_loopbreak, arginfo_event_base_loopbreak) -+ PHP_FE(event_base_loopexit, arginfo_event_base_loopexit) -+ PHP_FE(event_base_set, arginfo_event_base_set) -+ PHP_FE(event_base_priority_init, arginfo_event_base_priority_init) -+ PHP_FE(event_new, arginfo_event_new) -+ PHP_FE(event_free, arginfo_event_del) -+ PHP_FE(event_add, arginfo_event_add) -+ PHP_FE(event_set, arginfo_event_set) -+ PHP_FE(event_del, arginfo_event_del) -+ PHP_FE(event_buffer_new, arginfo_event_buffer_new) -+ PHP_FE(event_buffer_free, arginfo_event_buffer_free) -+ PHP_FE(event_buffer_base_set, arginfo_event_buffer_base_set) -+ PHP_FE(event_buffer_priority_set, arginfo_event_buffer_priority_set) -+ PHP_FE(event_buffer_write, arginfo_event_buffer_write) -+ PHP_FE(event_buffer_read, arginfo_event_buffer_read) -+ PHP_FE(event_buffer_enable, arginfo_event_buffer_disable) -+ PHP_FE(event_buffer_disable, arginfo_event_buffer_disable) -+ PHP_FE(event_buffer_timeout_set, arginfo_event_buffer_timeout_set) -+ PHP_FE(event_buffer_watermark_set, arginfo_event_buffer_watermark_set) -+ PHP_FE(event_buffer_fd_set, arginfo_event_buffer_fd_set) -+ PHP_FE(event_buffer_set_callback, arginfo_event_buffer_set_callback) -+ PHP_FALIAS(event_timer_new, event_new, arginfo_event_new) -+ PHP_FE(event_timer_set, arginfo_event_timer_set) -+ PHP_FE(event_timer_pending, arginfo_event_timer_pending) -+ PHP_FALIAS(event_timer_add, event_add, arginfo_event_add) -+ PHP_FALIAS(event_timer_del, event_del, arginfo_event_del) -+ {NULL, NULL, NULL} -+}; -+/* }}} */ -+#else -+/* {{{ libevent_functions[] -+ */ -+zend_function_entry libevent_functions[] = { -+ PHP_FE(event_base_new, NULL) -+ PHP_FE(event_base_free, NULL) -+ PHP_FE(event_base_loop, NULL) -+ PHP_FE(event_base_loopbreak, NULL) -+ PHP_FE(event_base_loopexit, NULL) -+ PHP_FE(event_base_set, NULL) -+ PHP_FE(event_base_priority_init, NULL) -+ PHP_FE(event_new, NULL) -+ PHP_FE(event_free, NULL) -+ PHP_FE(event_add, NULL) -+ PHP_FE(event_set, NULL) -+ PHP_FE(event_del, NULL) -+ PHP_FE(event_buffer_new, NULL) -+ PHP_FE(event_buffer_free, NULL) -+ PHP_FE(event_buffer_base_set, NULL) -+ PHP_FE(event_buffer_priority_set, NULL) -+ PHP_FE(event_buffer_write, NULL) -+ PHP_FE(event_buffer_read, NULL) -+ PHP_FE(event_buffer_enable, NULL) -+ PHP_FE(event_buffer_disable, NULL) -+ PHP_FE(event_buffer_timeout_set, NULL) -+ PHP_FE(event_buffer_watermark_set, NULL) -+ PHP_FE(event_buffer_fd_set, NULL) -+ PHP_FALIAS(event_timer_new, event_new, NULL) -+ PHP_FE(event_timer_set, NULL) -+ PHP_FE(event_timer_pending, NULL) -+ PHP_FALIAS(event_timer_add, event_add, NULL) -+ PHP_FALIAS(event_timer_del, event_del, NULL) -+ {NULL, NULL, NULL} -+}; -+/* }}} */ -+#endif -+ -+static const zend_module_dep libevent_deps[] = { /* {{{ */ -+ ZEND_MOD_OPTIONAL("sockets") -+ {NULL, NULL, NULL} -+}; -+/* }}} */ -+ -+/* {{{ libevent_module_entry -+ */ -+zend_module_entry libevent_module_entry = { -+ STANDARD_MODULE_HEADER_EX, -+ NULL, -+ libevent_deps, -+ "libevent", -+ libevent_functions, -+ PHP_MINIT(libevent), -+ NULL, -+ NULL, -+ NULL, -+ PHP_MINFO(libevent), -+ PHP_LIBEVENT_VERSION, -+ STANDARD_MODULE_PROPERTIES -+}; -+/* }}} */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/libevent/libevent.php -@@ -0,0 +1,58 @@ -+ ---- /dev/null -+++ b/ext/libevent/php_libevent.h -@@ -0,0 +1,68 @@ -+/* -+ +----------------------------------------------------------------------+ -+ | PHP Version 5 | -+ +----------------------------------------------------------------------+ -+ | Copyright (c) 1997-2008 The PHP Group | -+ +----------------------------------------------------------------------+ -+ | This source file is subject to version 3.01 of the PHP license, | -+ | that is bundled with this package in the file LICENSE, and is | -+ | available through the world-wide-web at the following url: | -+ | http://www.php.net/license/3_01.txt | -+ | If you did not receive a copy of the PHP license and are unable to | -+ | obtain it through the world-wide-web, please send a note to | -+ | license@php.net so we can mail you a copy immediately. | -+ +----------------------------------------------------------------------+ -+ | Author: Antony Dovgal | -+ | Arnaud Le Blanc | -+ +----------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_libevent.h 300687 2010-06-23 08:13:24Z tony2001 $ */ -+ -+#ifndef PHP_LIBEVENT_H -+#define PHP_LIBEVENT_H -+ -+#define PHP_LIBEVENT_VERSION "0.0.4" -+ -+extern zend_module_entry libevent_module_entry; -+#define phpext_libevent_ptr &libevent_module_entry -+ -+#ifdef ZTS -+#include "TSRM.h" -+#endif -+ -+#ifndef zend_always_inline -+# if defined(__GNUC__) -+# define zend_always_inline inline __attribute__((always_inline)) -+# elif defined(_MSC_VER) -+# define zend_always_inline __forceinline -+# else -+# define zend_always_inline inline -+# endif -+#endif -+ -+#ifndef Z_ADDREF_P -+#define Z_ADDREF_P(pz) zval_addref_p(pz) -+static zend_always_inline zend_uint zval_addref_p(zval* pz) { -+ return ++pz->refcount; -+} -+#endif -+ -+#ifndef Z_DELREF_P -+#define Z_DELREF_P(pz) zval_delref_p(pz) -+static zend_always_inline zend_uint zval_delref_p(zval* pz) { -+ return --pz->refcount; -+} -+#endif -+ -+#endif /* PHP_LIBEVENT_H */ -+ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ diff --git a/lang/php5/patches/030-PECL-add-http.patch b/lang/php5/patches/030-PECL-add-http.patch deleted file mode 100644 index 8250343487..0000000000 --- a/lang/php5/patches/030-PECL-add-http.patch +++ /dev/null @@ -1,29802 +0,0 @@ ---- /dev/null -+++ b/ext/http/CREDITS -@@ -0,0 +1,2 @@ -+HTTP extension for PHP -+Michael Wallner ---- /dev/null -+++ b/ext/http/KnownIssues.txt -@@ -0,0 +1,33 @@ -+Known Issues -+============ -+$Id: KnownIssues.txt 292753 2009-12-29 12:30:43Z mike $ -+ -+PHP < 5.1.3: -+ HttpResponse::getHeader() does not work with Apache2 SAPIs. -+ Using an encoding stream filter on a stream you read from doesn't work. -+ -+Windows: -+ If you keep getting "SSL connect error" when trying to issue -+ requests, try another (newer) libeay32.dll/ssleay32.dll pair. -+ -+Internals: -+ Our http_urlencode_hash() does not differentiate between prefixes -+ for numeric or string keys. -+ Inflating raw deflated data causes a re-initialization of the inflate -+ stream where the corresponding window bits are modified to tell libz -+ to not check for zlib header bytes. This is not preventable AFAICS. -+ LFS dependant parts of libcurl are left out because of off_t, -+ respectively off64_t confusion. -+ Persistent handles and "cookiestore" request option do interfere, -+ as libcurl saves the cookies to the file on curl_easy_destroy(), -+ cookies are not saved until the CURL handle will be recycled. -+ Thus one would either need to -+ * run PHP with http.persistent.handles.limit = 0 -+ * call http_persistent_handles_clean() every request -+ * call $HttpRequest->flushCookies(), which is available -+ since libcurl v7.17.1 and does not work with the -+ procedural API -+ Anyway, none of these options is really perfect. -+ HTTP and Proxy authentication information (username/password) can not be -+ unset with NULL prior libcurl v7.19.6 and separate options for setting -+ username and password--which work--are only available since v7.19.6. ---- /dev/null -+++ b/ext/http/LICENSE -@@ -0,0 +1,47 @@ -+Copyright (c) 2004-2010, Michael Wallner . -+All rights reserved. -+ -+Redistribution and use in source and binary forms, with or without -+modification, are permitted provided that the following conditions are met: -+ -+ * Redistributions of source code must retain the above copyright notice, -+ this list of conditions and the following disclaimer. -+ * Redistributions in binary form must reproduce the above copyright -+ notice, this list of conditions and the following disclaimer in the -+ documentation and/or other materials provided with the distribution. -+ -+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE -+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -+ -+=============================================================================== -+ -+The date parser in file http_date_api.c is derived from the implementation -+found in the original libcurl source, licensed under the following conditions: -+ -+Copyright (c) 1996 - 2006, Daniel Stenberg, . -+All rights reserved. -+ -+Permission to use, copy, modify, and distribute this software for any purpose -+with or without fee is hereby granted, provided that the above copyright -+notice and this permission notice appear in all copies. -+ -+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF THIRD PARTY RIGHTS. IN -+NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, -+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR -+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE -+OR OTHER DEALINGS IN THE SOFTWARE. -+ -+Except as contained in this notice, the name of a copyright holder shall not -+be used in advertising or otherwise to promote the sale, use or other dealings -+in this Software without prior written authorization of the copyright holder. -+ ---- /dev/null -+++ b/ext/http/Makefile.frag -@@ -0,0 +1,23 @@ -+# vim: noet ts=1 sw=1 -+ -+phpincludedir=$(prefix)/include/php -+ -+install-http: install install-http-headers -+ -+install-http-headers: -+ @echo "Installing HTTP headers: $(INSTALL_ROOT)$(phpincludedir)/ext/http/" -+ @$(mkinstalldirs) $(INSTALL_ROOT)$(phpincludedir)/ext/http -+ @for f in $(PHP_HTTP_HEADERS); do \ -+ if test -f "$(top_srcdir)/$$f"; then \ -+ $(INSTALL_DATA) $(top_srcdir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/http; \ -+ elif test -f "$(top_builddir)/$$f"; then \ -+ $(INSTALL_DATA) $(top_builddir)/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/http; \ -+ elif test -f "$(top_srcdir)/ext/http/$$f"; then \ -+ $(INSTALL_DATA) $(top_srcdir)/ext/http/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/http; \ -+ elif test -f "$(top_builddir)/ext/http/$$f"; then \ -+ $(INSTALL_DATA) $(top_builddir)/ext/http/$$f $(INSTALL_ROOT)$(phpincludedir)/ext/http; \ -+ else \ -+ echo "WTF? $$f"; \ -+ fi \ -+ done; -+ ---- /dev/null -+++ b/ext/http/ThanksTo.txt -@@ -0,0 +1,20 @@ -+Thanks To -+========= -+$Id: ThanksTo.txt 275653 2009-02-12 13:11:05Z mike $ -+ -+People who repeatedly reported issues with this extension in a manner -+so they could be fixed in a reasonable way, or suggested useful features -+to implement, in alphabetical order: -+ -+ Ilia Alshanetsky (ilia at php dot net) -+ Petr Czaderna (petr at hroch dot info) -+ David James (james82 at gmail dot com) -+ Thomas Landro Johnsen (thomas dot l dot johnsen at gmail dot com) -+ Clay Loveless (clay at killersoft dot com) -+ Felipe Pena (felipe at php dot net) -+ David Sklar (sklar at sklar dot com) -+ Travis Swicegood (travis at mashery dot com) -+ Alexey Zakhlestin (indeyets at gmail dot com) -+ Alexander Zhuravlev (zaa at zaa dot pp dot ru) -+ -+Thanks a lot! ---- /dev/null -+++ b/ext/http/config.m4 -@@ -0,0 +1,5 @@ -+dnl phpize stub of config9.m4 for pecl/http -+dnl $Id: config.m4 214417 2006-06-07 21:05:34Z mike $ -+dnl vim: noet ts=1 sw=1 -+ -+sinclude(config9.m4) ---- /dev/null -+++ b/ext/http/config.w32 -@@ -0,0 +1,129 @@ -+// config.w32 for pecl/http -+// $Id: config.w32 287971 2009-09-02 14:36:08Z pajoye $ -+ -+ARG_ENABLE("http", "whether to enable extended HTTP support", "no"); -+ -+function check_for_main_ext(ext, header) -+{ -+ if (!header) { -+ header = "php_"+ ext +".h"; -+ } -+ -+ /* When in configure, we're always in the root of PHP source */ -+ var ext_path = "ext\\" + ext; -+ -+ STDOUT.Write("Checking for ext/"+ ext +" ... "); -+ -+ if (FSO.FileExists(ext_path + "\\" + header)) { -+ STDOUT.WriteLine(ext_path); -+ return ext_path; -+ } -+ -+ STDOUT.WriteLine(""); -+ return false; -+} -+ -+function check_for_pecl_ext(ext, header) -+{ -+ if (!header) { -+ header = "php_"+ ext +".h"; -+ } -+ -+ var g; -+ var s = ext +"\\"+ header; -+ -+ STDOUT.Write("Checking for pecl/"+ ext +" ... "); -+ if ( (g = glob(configure_module_dirname +"\\..\\"+ s)) || -+ (g = glob(configure_module_dirname +"\\..\\..\\..\\pecl\\"+ s))) { -+ var f = g[0].substr(0, g[0].length - header.length - 1); -+ STDOUT.WriteLine(f); -+ return f; -+ } -+ STDOUT.WriteLine(""); -+ return false; -+} -+ -+if (PHP_HTTP != "no") { -+ -+ EXTENSION("http", -+ "missing.c http.c http_functions.c http_exception_object.c "+ -+ "http_util_object.c http_message_object.c http_requestpool_object.c "+ -+ "http_request_object.c http_response_object.c "+ -+ "http_api.c http_cache_api.c http_request_pool_api.c "+ -+ "http_request_api.c http_date_api.c http_headers_api.c "+ -+ "http_message_api.c http_send_api.c http_url_api.c "+ -+ "http_info_api.c http_request_method_api.c http_encoding_api.c "+ -+ "http_filter_api.c http_request_body_api.c http_querystring_object.c "+ -+ "http_deflatestream_object.c http_inflatestream_object.c "+ -+ "http_cookie_api.c http_querystring_api.c http_request_datashare_api.c "+ -+ "http_requestdatashare_object.c http_request_info.c http_persistent_handle_api.c", -+ null, -+ "/I\"" + configure_module_dirname + "/phpstr\""); -+ ADD_SOURCES(configure_module_dirname + "/phpstr", "phpstr.c", "http"); -+ AC_DEFINE("HAVE_HTTP", 1, "Have extended HTTP support"); -+ AC_DEFINE("HTTP_SHARED_DEPS", 1, "Depend on shared extensions"); -+ -+ AC_DEFINE("HAVE_GETHOSTNAME", 1); -+ AC_DEFINE("HAVE_GETSERVBYPORT", 1); -+ AC_DEFINE("HAVE_GETSERVBYNAME", 1); -+ -+ if (PHP_DEBUG != "no") { -+ ADD_FLAG("CFLAGS_HTTP", "/W3"); -+ } -+ -+ if (CHECK_HEADER_ADD_INCLUDE('zlib.h', 'CFLAGS_HTTP', '..\\zlib;' + php_usual_include_suspects)) { -+ AC_DEFINE('HTTP_HAVE_ZLIB', 1, "Have zlib library"); -+ ADD_FLAG("LDFLAGS_HTTP", "/FORCE:MULTIPLE"); -+ } else { -+ WARNING("zlib encoding functions not enabled; libraries and headers not found"); -+ } -+ -+ if (typeof(PHP_HASH) != "undefined" && PHP_HASH != "no") { -+ var f; -+ -+ if ((f = check_for_pecl_ext("hash")) || (f = check_for_main_ext("hash"))) { -+ ADD_FLAG("CFLAGS_HTTP", '/I "' + f + '" /DHTTP_HAVE_PHP_HASH_H=1'); -+ ADD_EXTENSION_DEP("http", "hash", true); -+ } -+ } -+ -+ if (PHP_SESSION != "no") { -+ ADD_EXTENSION_DEP("http", "session", true); -+ } -+ -+ if (PHP_ICONV != "no") { -+ ADD_EXTENSION_DEP("http", "iconv", true); -+ } -+ -+ CURL_LIB="libcurl_a.lib;libcurl.lib;" + (PHP_DEBUG != "no" ? "libcurld.lib":"libcurl.lib"); -+ if (CHECK_HEADER_ADD_INCLUDE("curl/curl.h", "CFLAGS_HTTP") && -+ CHECK_HEADER_ADD_INCLUDE("openssl/crypto.h", "CFLAGS_HTTP") && -+ CHECK_LIB(CURL_LIB, "http", PHP_HTTP) && -+ CHECK_LIB("ssleay32.lib", "http", PHP_HTTP) && -+ CHECK_LIB("libeay32.lib", "http", PHP_HTTP) && -+ CHECK_LIB("zlib.lib;zlib_a.lib", "http", PHP_HTTP) && -+ CHECK_LIB("winmm.lib", "http", PHP_HTTP)) { -+ AC_DEFINE("HTTP_HAVE_CURL", 1, "Have CURL library"); -+ AC_DEFINE("HTTP_HAVE_SSL", 1, "Have SSL"); -+ AC_DEFINE("HAVE_CURL_MULTI_STRERROR", 1, ""); -+ AC_DEFINE("HAVE_CURL_SHARE_STRERROR", 1, ""); -+ AC_DEFINE("HAVE_CURL_EASY_STRERROR", 1, ""); -+ AC_DEFINE("HAVE_CURL_EASY_RESET", 1, ""); -+ AC_DEFINE("HAVE_CURL_GETFORMDATA", 1, ""); -+ AC_DEFINE("HAVE_CURL_FORMGET", 1, ""); -+ AC_DEFINE("HAVE_CURL_MULTI_SETOPT", 1, ""); -+ AC_DEFINE("HAVE_CURL_MULTI_TIMEOUT", 1, ""); -+ } else { -+ WARNING("curl convenience functions not enabled; libraries and headers not found"); -+ } -+/* -+// MAGIC_LIB = PHP_DEBUG != "no" ? "libmagic-staticd.lib":"libmagic-static.lib"; -+// if (CHECK_HEADER_ADD_INCLUDE("magic.h", "CFLAGS_HTTP") && -+// CHECK_LIB(MAGIC_LIB, "http", PHP_HTTP)) { -+// AC_DEFINE("HTTP_HAVE_MAGIC", 1, "Have magic library"); -+// AC_DEFINE("USE_MAGIC_STATIC", "", ""); -+// } else { -+// WARNING("content type guessing not enabled; libraries and headers not found"); -+// } -+*/ -+} ---- /dev/null -+++ b/ext/http/config9.m4 -@@ -0,0 +1,468 @@ -+dnl config.m4 for pecl/http -+dnl $Id: config9.m4 242664 2007-09-18 19:13:37Z mike $ -+dnl vim: noet ts=1 sw=1 -+ -+PHP_ARG_ENABLE([http], [whether to enable extended HTTP support], -+[ --enable-http Enable extended HTTP support]) -+PHP_ARG_WITH([http-shared-deps], [whether to depend on extensions which have been built shared], -+[ --with-http-shared-deps -+ HTTP: disable to not depend on extensions like hash, -+ iconv and session (when built shared)], $PHP_HTTP, $PHP_HTTP) -+PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support], -+[ --with-http-curl-requests[=LIBCURLDIR] -+ HTTP: with cURL request support], $PHP_HTTP, $PHP_HTTP) -+PHP_ARG_WITH([http-curl-libevent], [whether to enable libevent support fur cURL], -+[ --with-http-curl-libevent[=LIBEVENTDIR] -+ HTTP: libevent install directory], $PHP_HTTP_CURL_REQUESTS, "") -+PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support], -+[ --with-http-zlib-compression[=LIBZDIR] -+ HTTP: with zlib encodings support], $PHP_HTTP, $PHP_HTTP) -+PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing], -+[ --with-http-magic-mime[=LIBMAGICDIR] -+ HTTP: with magic mime response content type guessing], "no", "no") -+ -+if test "$PHP_HTTP" != "no"; then -+ -+ ifdef([AC_PROG_EGREP], [ -+ AC_PROG_EGREP -+ ], [ -+ AC_CHECK_PROG(EGREP, egrep, egrep) -+ ]) -+ ifdef([AC_PROG_SED], [ -+ AC_PROG_SED -+ ], [ -+ ifdef([LT_AC_PROG_SED], [ -+ LT_AC_PROG_SED -+ ], [ -+ AC_CHECK_PROG(SED, sed, sed) -+ ]) -+ ]) -+ -+ AC_PROG_CPP -+ -+ if test "$PHP_HTTP_SHARED_DEPS" != "no"; then -+ AC_DEFINE([HTTP_SHARED_DEPS], [1], [ ]) -+ else -+ AC_DEFINE([HTTP_SHARED_DEPS], [0], [ ]) -+ fi -+ -+ dnl -+ dnl HTTP_SHARED_DEP(name[, code-if-yes[, code-if-not]]) -+ dnl -+ AC_DEFUN([HTTP_SHARED_DEP], [ -+ extname=$1 -+ haveext=$[HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__) -+ -+ AC_MSG_CHECKING([whether to add a dependency on ext/$extname]) -+ if test "$PHP_HTTP_SHARED_DEPS" = "no"; then -+ AC_MSG_RESULT([no]) -+ $3 -+ elif test "$haveext"; then -+ AC_MSG_RESULT([yes]) -+ ifdef([PHP_ADD_EXTENSION_DEP], [ -+ PHP_ADD_EXTENSION_DEP([http], $1, true) -+ ]) -+ $2 -+ else -+ AC_MSG_RESULT([no]) -+ $3 -+ fi -+ ]) -+ -+ dnl -+ dnl HTTP_HAVE_PHP_EXT(name[, code-if-yes[, code-if-not]]) -+ dnl -+ AC_DEFUN([HTTP_HAVE_PHP_EXT], [ -+ extname=$1 -+ haveext=$[PHP_]translit($1,a-z_-,A-Z__) -+ -+ AC_MSG_CHECKING([for ext/$extname support]) -+ if test -x "$PHP_EXECUTABLE"; then -+ grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` -+ if test "$grepext" = "$extname"; then -+ [HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1 -+ AC_MSG_RESULT([yes]) -+ $2 -+ else -+ [HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)= -+ AC_MSG_RESULT([no]) -+ $3 -+ fi -+ elif test "$haveext" != "no" && test "x$haveext" != "x"; then -+ [HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)=1 -+ AC_MSG_RESULT([yes]) -+ $2 -+ else -+ [HTTP_HAVE_EXT_]translit($1,a-z_-,A-Z__)= -+ AC_MSG_RESULT([no]) -+ $3 -+ fi -+ ]) -+ -+ dnl -+ dnl odd PHP4 fix -+ dnl -+ if test "x$PHP_LIBDIR" = "x"; then -+ PHP_LIBDIR=lib -+ fi -+ -+dnl ---- -+dnl STDC -+dnl ---- -+ AC_CHECK_HEADERS([netdb.h unistd.h]) -+ PHP_CHECK_FUNC(gethostname, nsl) -+ PHP_CHECK_FUNC(getdomainname, nsl) -+ PHP_CHECK_FUNC(getservbyport, nsl) -+ PHP_CHECK_FUNC(getservbyname, nsl) -+ -+dnl ---- -+dnl ZLIB -+dnl ---- -+ if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then -+ AC_MSG_CHECKING([for zlib.h]) -+ ZLIB_DIR= -+ for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do -+ if test -f "$i/include/zlib.h"; then -+ ZLIB_DIR=$i -+ break; -+ fi -+ done -+ if test "x$ZLIB_DIR" = "x"; then -+ AC_MSG_RESULT([not found]) -+ AC_MSG_ERROR([could not find zlib.h]) -+ else -+ AC_MSG_RESULT([found in $ZLIB_DIR]) -+ AC_MSG_CHECKING([for zlib version >= 1.2.0.4]) -+ ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[[^0-9\.]]//g'` -+ AC_MSG_RESULT([$ZLIB_VERSION]) -+ if test `echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then -+ AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required]) -+ else -+ PHP_ADD_INCLUDE($ZLIB_DIR/include) -+ PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) -+ AC_DEFINE([HTTP_HAVE_ZLIB], [1], [Have zlib support]) -+ fi -+ fi -+ fi -+ -+dnl ---- -+dnl CURL -+dnl ---- -+ if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then -+ AC_MSG_CHECKING([for curl/curl.h]) -+ CURL_DIR= -+ for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do -+ if test -f "$i/include/curl/curl.h"; then -+ CURL_DIR=$i -+ break -+ fi -+ done -+ if test "x$CURL_DIR" = "x"; then -+ AC_MSG_RESULT([not found]) -+ AC_MSG_ERROR([could not find curl/curl.h]) -+ else -+ AC_MSG_RESULT([found in $CURL_DIR]) -+ fi -+ -+ AC_MSG_CHECKING([for curl-config]) -+ CURL_CONFIG= -+ for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do -+ if test -x "$i"; then -+ CURL_CONFIG=$i -+ break -+ fi -+ done -+ if test "x$CURL_CONFIG" = "x"; then -+ AC_MSG_RESULT([not found]) -+ AC_MSG_ERROR([could not find curl-config]) -+ else -+ AC_MSG_RESULT([found: $CURL_CONFIG]) -+ fi -+ -+ dnl Debian stable has currently 7.13.2 (this is not a typo) -+ AC_MSG_CHECKING([for curl version >= 7.12.3]) -+ CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'` -+ AC_MSG_RESULT([$CURL_VERSION]) -+ if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then -+ AC_MSG_ERROR([libcurl version greater or equal to 7.12.3 required]) -+ fi -+ -+ dnl -+ dnl compile tests -+ dnl -+ -+ save_INCLUDES="$INCLUDES" -+ INCLUDES= -+ save_LIBS="$LIBS" -+ LIBS= -+ save_CFLAGS="$CFLAGS" -+ CFLAGS=`$CURL_CONFIG --cflags` -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS=`$CURL_CONFIG --libs` -+ LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR" -+ -+ AC_MSG_CHECKING([for SSL support in libcurl]) -+ CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` -+ if test "$CURL_SSL" = "SSL"; then -+ AC_MSG_RESULT([yes]) -+ AC_DEFINE([HTTP_HAVE_SSL], [1], [ ]) -+ -+ AC_MSG_CHECKING([for openssl support in libcurl]) -+ AC_TRY_RUN([ -+ #include -+ int main(int argc, char *argv[]) { -+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); -+ if (data && data->ssl_version && *data->ssl_version) { -+ const char *ptr = data->ssl_version; -+ while(*ptr == ' ') ++ptr; -+ return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1); -+ } -+ return 1; -+ } -+ ], [ -+ AC_MSG_RESULT([yes]) -+ AC_CHECK_HEADER([openssl/crypto.h], [ -+ AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ]) -+ ]) -+ ], [ -+ AC_MSG_RESULT([no]) -+ ], [ -+ AC_MSG_RESULT([no]) -+ ]) -+ -+ AC_MSG_CHECKING([for gnutls support in libcurl]) -+ AC_TRY_RUN([ -+ #include -+ int main(int argc, char *argv[]) { -+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); -+ if (data && data->ssl_version && *data->ssl_version) { -+ const char *ptr = data->ssl_version; -+ while(*ptr == ' ') ++ptr; -+ return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1); -+ } -+ return 1; -+ } -+ ], [ -+ AC_MSG_RESULT([yes]) -+ AC_CHECK_HEADER([gcrypt.h], [ -+ AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ]) -+ ]) -+ ], [ -+ AC_MSG_RESULT([no]) -+ ], [ -+ AC_MSG_RESULT([no]) -+ ]) -+ else -+ AC_MSG_RESULT([no]) -+ fi -+ -+ INCLUDES="$save_INCLUDES" -+ LIBS="$save_LIBS" -+ CFLAGS="$save_CFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ -+ dnl end compile tests -+ -+ AC_MSG_CHECKING([for bundled SSL CA info]) -+ CURL_CAINFO= -+ for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do -+ if test -f "$i"; then -+ CURL_CAINFO="$i" -+ break -+ fi -+ done -+ if test "x$CURL_CAINFO" = "x"; then -+ AC_MSG_RESULT([not found]) -+ else -+ AC_MSG_RESULT([$CURL_CAINFO]) -+ AC_DEFINE_UNQUOTED([HTTP_CURL_CAINFO], ["$CURL_CAINFO"], [path to bundled SSL CA info]) -+ fi -+ -+ PHP_ADD_INCLUDE($CURL_DIR/include) -+ PHP_ADD_LIBRARY_WITH_PATH(curl, $CURL_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) -+ PHP_EVAL_LIBLINE(`$CURL_CONFIG --libs`, HTTP_SHARED_LIBADD) -+ AC_DEFINE([HTTP_HAVE_CURL], [1], [Have cURL support]) -+ -+ PHP_CHECK_LIBRARY(curl, curl_share_strerror, -+ [AC_DEFINE([HAVE_CURL_SHARE_STRERROR], [1], [ ])], [ ], -+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] -+ ) -+ PHP_CHECK_LIBRARY(curl, curl_multi_strerror, -+ [AC_DEFINE([HAVE_CURL_MULTI_STRERROR], [1], [ ])], [ ], -+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] -+ ) -+ PHP_CHECK_LIBRARY(curl, curl_easy_strerror, -+ [AC_DEFINE([HAVE_CURL_EASY_STRERROR], [1], [ ])], [ ], -+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] -+ ) -+ PHP_CHECK_LIBRARY(curl, curl_easy_reset, -+ [AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ], -+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] -+ ) -+ PHP_CHECK_LIBRARY(curl, curl_formget, -+ [AC_DEFINE([HAVE_CURL_FORMGET], [1], [ ])], [ ], -+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] -+ ) -+ PHP_CHECK_LIBRARY(curl, curl_multi_setopt, -+ [AC_DEFINE([HAVE_CURL_MULTI_SETOPT], [1], [ ])], [ ], -+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] -+ ) -+ PHP_CHECK_LIBRARY(curl, curl_multi_timeout, -+ [AC_DEFINE([HAVE_CURL_MULTI_TIMEOUT], [1], [ ])], [ ], -+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] -+ ) -+ -+ dnl ---- -+ dnl EVENT -+ dnl ---- -+ -+ if test "$PHP_HTTP_CURL_LIBEVENT" != "no"; then -+ HTTP_HAVE_PHP_EXT([event], [ -+ AC_MSG_WARN([event support is incompatible with pecl/event; continuing without libevent support]) -+ ], [ -+ AC_MSG_CHECKING([for event.h]) -+ EVENT_DIR= -+ for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do -+ if test -f "$i/include/event.h"; then -+ EVENT_DIR=$i -+ break -+ fi -+ done -+ if test "x$EVENT_DIR" = "x"; then -+ AC_MSG_RESULT([not found]) -+ AC_MSG_WARN([continuing without libevent support]) -+ else -+ AC_MSG_RESULT([found in $EVENT_DIR]) -+ -+ AC_MSG_CHECKING([for libevent version, roughly]) -+ EVENT_VER="1.1b or lower" -+ if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then -+ if test -f "$EVENT_DIR/include/evrpc.h"; then -+ EVENT_VER="1.4 or greater" -+ else -+ EVENT_VER="1.2 or greater" -+ fi -+ fi -+ AC_DEFINE_UNQUOTED([HTTP_EVENT_VERSION], ["$EVENT_VER"], [ ]) -+ AC_MSG_RESULT([$EVENT_VER]) -+ -+ AC_MSG_CHECKING([for libcurl version >= 7.16.0]) -+ AC_MSG_RESULT([$CURL_VERSION]) -+ if test `echo $CURL_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then -+ AC_MSG_WARN([libcurl version greater or equal to 7.16.0 required; continuing without libevent support]) -+ else -+ PHP_ADD_INCLUDE($EVENT_DIR/include) -+ PHP_ADD_LIBRARY_WITH_PATH(event, $EVENT_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) -+ AC_DEFINE([HTTP_HAVE_EVENT], [1], [Have libevent support for cURL]) -+ PHP_CHECK_LIBRARY(curl, curl_multi_socket_action, -+ [AC_DEFINE([HAVE_CURL_MULTI_SOCKET_ACTION], [1], [ ])], [ ], -+ [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR] -+ ) -+ fi -+ fi -+ ]) -+ fi -+ fi -+ -+dnl ---- -+dnl MAGIC -+dnl ---- -+ if test "$PHP_HTTP_MAGIC_MIME" != "no"; then -+ AC_MSG_CHECKING([for magic.h]) -+ MAGIC_DIR= -+ for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do -+ if test -f "$i/include/magic.h"; then -+ MAGIC_DIR=$i -+ break -+ fi -+ done -+ if test "x$MAGIC_DIR" = "x"; then -+ AC_MSG_RESULT([not found]) -+ AC_MSG_ERROR([could not find magic.h]) -+ else -+ AC_MSG_RESULT([found in $MAGIC_DIR]) -+ fi -+ -+ PHP_ADD_INCLUDE($MAGIC_DIR/include) -+ PHP_ADD_LIBRARY_WITH_PATH(magic, $MAGIC_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD) -+ AC_DEFINE([HTTP_HAVE_MAGIC], [1], [Have magic mime support]) -+ fi -+ -+dnl ---- -+dnl HASH -+dnl ---- -+ HTTP_HAVE_PHP_EXT([hash], [ -+ AC_MSG_CHECKING([for php_hash.h]) -+ HTTP_EXT_HASH_INCDIR= -+ for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do -+ if test -d $i; then -+ if test -f $i/php_hash.h; then -+ HTTP_EXT_HASH_INCDIR=$i -+ break -+ elif test -f $i/ext/hash/php_hash.h; then -+ HTTP_EXT_HASH_INCDIR=$i/ext/hash -+ break -+ fi -+ fi -+ done -+ if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then -+ AC_MSG_RESULT([not found]) -+ else -+ AC_MSG_RESULT([$HTTP_EXT_HASH_INCDIR]) -+ AC_DEFINE([HTTP_HAVE_PHP_HASH_H], [1], [Have ext/hash support]) -+ PHP_ADD_INCLUDE([$HTTP_EXT_HASH_INCDIR]) -+ fi -+ ]) -+ -+dnl ---- -+dnl ICONV -+dnl ---- -+ HTTP_HAVE_PHP_EXT([iconv]) -+ -+dnl ---- -+dnl SESSION -+dnl ---- -+ HTTP_HAVE_PHP_EXT([session]) -+ -+dnl ---- -+dnl DONE -+dnl ---- -+ PHP_HTTP_SOURCES="missing.c http.c http_functions.c phpstr/phpstr.c \ -+ http_util_object.c http_message_object.c http_request_object.c http_request_pool_api.c \ -+ http_response_object.c http_exception_object.c http_requestpool_object.c \ -+ http_api.c http_cache_api.c http_request_api.c http_request_info.c http_date_api.c \ -+ http_headers_api.c http_message_api.c http_send_api.c http_url_api.c \ -+ http_info_api.c http_request_method_api.c http_encoding_api.c \ -+ http_filter_api.c http_request_body_api.c http_querystring_object.c \ -+ http_deflatestream_object.c http_inflatestream_object.c http_cookie_api.c \ -+ http_querystring_api.c http_request_datashare_api.c http_requestdatashare_object.c \ -+ http_persistent_handle_api.c" -+ -+ PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared) -+ -+ dnl shared extension deps -+ HTTP_SHARED_DEP([hash]) -+ HTTP_SHARED_DEP([iconv]) -+ HTTP_SHARED_DEP([session]) -+ -+ PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1) -+ PHP_SUBST([HTTP_SHARED_LIBADD]) -+ -+ PHP_HTTP_HEADERS="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \ -+ php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \ -+ php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h \ -+ php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.h \ -+ php_http_exception_object.h php_http_message_object.h php_http_request_object.h \ -+ php_http_requestpool_object.h php_http_response_object.h php_http_util_object.h \ -+ php_http_querystring_object.h php_http_deflatestream_object.h php_http_inflatestream_object.h \ -+ php_http_cookie_api.h php_http_querystring_api.h php_http_request_datashare_api.h php_http_requestdatashare_object.h \ -+ php_http_persistent_handle_api.h" -+ ifdef([PHP_INSTALL_HEADERS], [ -+ PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS) -+ ], [ -+ PHP_SUBST([PHP_HTTP_HEADERS]) -+ PHP_ADD_MAKEFILE_FRAGMENT -+ ]) -+ -+ AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support]) -+fi ---- /dev/null -+++ b/ext/http/docs/examples/tutorial.txt -@@ -0,0 +1,175 @@ -+ -+A Beginners Tutorial -+-------------------- -+$Revision: 208773 $ -+ -+ -+- GET Queries -+ -+ The HttpRequest class can be used to execute any HTTP request method. -+ The following example shows a simple GET request where a few query -+ parameters are supplied. Additionally potential cookies will be -+ read from and written to a file. -+ -+setOptions( -+ array( 'cookiestore' => 'google.txt', -+ ) -+); -+ -+$r->setQueryData( -+ array( 'q' => '+"pecl_http" -msg -cvs -list', -+ 'hl' => 'de' -+ ) -+); -+ -+// HttpRequest::send() returns an HttpMessage object -+// of type HttpMessage::TYPE_RESPONSE or throws an exception -+try { -+ print $r->send()->getBody(); -+} catch (HttpException $e) { -+ print $e; -+} -+?> -+ -+- Multipart Posts -+ -+ The following example shows an multipart POST request, with two form -+ fields and an image that's supposed to be uploaded to the server. -+ It's a bad habit as well as common practice to issue a redirect after -+ an received POST request, so we'll allow a redirect by enabling the -+ redirect option. -+ -+setOptions( -+ array( 'cookies' => array('MyCookie' => 'has a value'), -+ 'redirect' => true, -+ ) -+); -+ -+// common form data -+$r->setPostFields( -+ array( 'name' => 'Mike', -+ 'mail' => 'mike@php.net', -+ ) -+); -+// add the file to post (form name, file name, file type) -+touch('profile.jpg'); -+$r->addPostFile('image', 'profile.jpg', 'image/jpeg'); -+ -+try { -+ print $r->send()->getBody(); -+} catch (HttpException $e) { -+ print $e; -+} -+?> -+ -+- Parallel Requests -+ -+ It's possible to execute several HttpRequests in parallel with the -+ HttpRequestPool class. HttpRequests to send, do not need to perform -+ the same request method, but can only be attached to one HttpRequestPool -+ at the same time. -+ -+attach(new HttpRequest('http://pear.php.net', HTTP_METH_HEAD)); -+ $p->attach(new HttpRequest('http://pecl.php.net', HTTP_METH_HEAD)); -+} catch (HttpException $e) { -+ print $e; -+ exit; -+} -+ -+try { -+ $p->send(); -+ // HttpRequestPool implements an iterator over attached HttpRequest objects -+ foreach ($p as $r) { -+ echo "Checking ", $r->getUrl(), " reported ", $r->getResponseCode(), "\n"; -+ } -+} catch (HttpException $e) { -+ print $e; -+} -+?> -+ -+- Parallel Requests? -+ -+ You can use a more advanced approach by using the protected interface of -+ the HttpRequestPool class. This allows you to perform some other tasks -+ while the requests are executed. -+ -+socketPerform(); $i++) { -+ $i % 10 or print "."; -+ if (!$this->socketSelect()) { -+ throw new HttpException("Socket error!"); -+ } -+ } -+ print "\nDone!\n"; -+ } -+} -+ -+try { -+ foreach (new Pool as $r) { -+ echo "Checking ", $r->getUrl(), " reported ", $r->getResponseCode(), "\n"; -+ } -+} catch (HttpException $ex) { -+ print $e; -+} -+?> -+ -+- Cached Responses -+ -+ One of the main key features of HttpResponse is HTTP caching. HttpResponse -+ will calculate an ETag based on the http.etag_mode INI setting as well as -+ it will determine the last modification time of the sent entity. It uses -+ those two indicators to decide if the cache entry on the client side is -+ still valid and will emit an "304 Not Modified" response if applicable. -+ -+ -+ -+- Bandwidth Throttling -+ -+ HttpResponse supports a basic throttling mechanism, which is enabled by -+ setting a throttle delay and a buffer size. PHP will sleep the specified -+ amount of seconds after each sent chunk of specified bytes. -+ -+ ---- /dev/null -+++ b/ext/http/docs/http.ini -@@ -0,0 +1,61 @@ -+; example INI file for pecl/http -+; $Id: http.ini 229420 2007-02-09 14:19:40Z mike $ -+ -+[http] -+; enable if you want to transform all errors to exceptions (PHP >= 5 only) -+;http.only_exceptions = 1 -+ -+; disable if you don't want php to exit in case of redirects and cache hits; -+; a "NULL" output handler will be started instead, which discards all output -+;http.force_exit = 0 -+ -+; disable if you don't want 404 Not found status messages being sent, -+; if a file attempted to be sent with http_send_file() etc. cannot be found -+;http.send.not_found_404 = 0 -+ -+; the hashing algorithm with wich ETags are generated (MD5, SHA1, CRC32B); -+; if ext/hash is available, this can be set to any hash algorithm ext/hash supports -+; MD5 is the default and fallback algorithm -+;http.etag.mode = "MD5" -+ -+; allowed request methods -+; by default PHP ignores unkown request methods -+; PHP will exit with a response status of 405 and an Allow header -+; if it encounters a request method not contained in the specified list -+;http.request.methods.allowed = "HEAD, GET, POST" -+ -+; custom request methods -+;http.request.methods.custom = "KICK, BANN" -+ -+; log file for positive cache hits -+;http.log.cache = -+ -+; log file for redirects -+;http.log.redirect = -+ -+; log file for responses with http_send_file() etc. where the file's not been found -+;http.log.not_found = -+ -+; log file for requests with an unallowed request method -+;http.log.allowed_methods = -+ -+; composite log file (i.e. log all messages to this file) -+;http.log.composite = -+ -+; automatically deflate content if requested/supported by client -+;http.send.deflate.start_auto = 1 -+;http.send.deflate.start_flags = HTTP_DEFLATE_LEVEL_DEF -+ -+; automatically inflate sent content -+;http.send.inflate.start_auto = 0 -+;http.send.inflate.start_flags = -+ -+; global HttpRequestDataShare settings -+;http.request.datashare.cookie = 0 -+;http.request.datashare.dns = 1 -+ -+; limit of idle persistent handles per provider -+;http.persistent.handles.limit = -1 -+ -+; default ident of persistent handles -+;http.persistent.handles.ident = "GLOBAL" ---- /dev/null -+++ b/ext/http/http.c -@@ -0,0 +1,546 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http.c 300300 2010-06-09 07:29:35Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#define HTTP_WANT_CURL -+#define HTTP_WANT_EVENT -+#define HTTP_WANT_ZLIB -+#define HTTP_WANT_MAGIC -+#include "php_http.h" -+ -+#include "php_ini.h" -+#include "ext/standard/info.h" -+#include "zend_extensions.h" -+ -+#include "php_http_api.h" -+#include "php_http_cache_api.h" -+#include "php_http_cookie_api.h" -+#include "php_http_encoding_api.h" -+#include "php_http_filter_api.h" -+#include "php_http_message_api.h" -+#include "php_http_persistent_handle_api.h" -+#include "php_http_request_api.h" -+#include "php_http_request_datashare_api.h" -+#include "php_http_request_method_api.h" -+#include "php_http_request_pool_api.h" -+#include "php_http_send_api.h" -+#include "php_http_url_api.h" -+ -+#include "php_http_deflatestream_object.h" -+#include "php_http_exception_object.h" -+#include "php_http_inflatestream_object.h" -+#include "php_http_message_object.h" -+#include "php_http_querystring_object.h" -+#include "php_http_request_object.h" -+#include "php_http_requestdatashare_object.h" -+#include "php_http_requestpool_object.h" -+#include "php_http_response_object.h" -+#include "php_http_util_object.h" -+ -+ZEND_DECLARE_MODULE_GLOBALS(http); -+HTTP_DECLARE_ARG_PASS_INFO(); -+ -+#ifdef COMPILE_DL_HTTP -+ZEND_GET_MODULE(http) -+#endif -+ -+/* {{{ http_functions[] */ -+zend_function_entry http_functions[] = { -+ PHP_FE(http_date, NULL) -+ PHP_FE(http_build_url, http_arg_pass_ref_4) -+ PHP_FE(http_build_str, NULL) -+#ifndef ZEND_ENGINE_2 -+ PHP_FALIAS(http_build_query, http_build_str, NULL) -+#endif -+ PHP_FE(http_negotiate_language, http_arg_pass_ref_2) -+ PHP_FE(http_negotiate_charset, http_arg_pass_ref_2) -+ PHP_FE(http_negotiate_content_type, http_arg_pass_ref_2) -+ PHP_FE(http_negotiate, http_arg_pass_ref_3) -+ PHP_FE(http_redirect, NULL) -+ PHP_FE(http_throttle, NULL) -+ PHP_FE(http_send_status, NULL) -+ PHP_FE(http_send_last_modified, NULL) -+ PHP_FE(http_send_content_type, NULL) -+ PHP_FE(http_send_content_disposition, NULL) -+ PHP_FE(http_match_modified, NULL) -+ PHP_FE(http_match_etag, NULL) -+ PHP_FE(http_cache_last_modified, NULL) -+ PHP_FE(http_cache_etag, NULL) -+ PHP_FE(http_send_data, NULL) -+ PHP_FE(http_send_file, NULL) -+ PHP_FE(http_send_stream, NULL) -+ PHP_FE(http_chunked_decode, NULL) -+ PHP_FE(http_parse_message, NULL) -+ PHP_FE(http_parse_headers, NULL) -+ PHP_FE(http_parse_cookie, NULL) -+ PHP_FE(http_build_cookie, NULL) -+ PHP_FE(http_parse_params, NULL) -+ PHP_FE(http_get_request_headers, NULL) -+ PHP_FE(http_get_request_body, NULL) -+ PHP_FE(http_get_request_body_stream, NULL) -+ PHP_FE(http_match_request_header, NULL) -+ PHP_FE(http_persistent_handles_count, NULL) -+ PHP_FE(http_persistent_handles_clean, NULL) -+ PHP_FE(http_persistent_handles_ident, NULL) -+#ifdef HTTP_HAVE_CURL -+ PHP_FE(http_get, http_arg_pass_ref_3) -+ PHP_FE(http_head, http_arg_pass_ref_3) -+ PHP_FE(http_post_data, http_arg_pass_ref_4) -+ PHP_FE(http_post_fields, http_arg_pass_ref_5) -+ PHP_FE(http_put_data, http_arg_pass_ref_4) -+ PHP_FE(http_put_file, http_arg_pass_ref_4) -+ PHP_FE(http_put_stream, http_arg_pass_ref_4) -+ PHP_FE(http_request, http_arg_pass_ref_5) -+ PHP_FE(http_request_body_encode, NULL) -+#endif -+ PHP_FE(http_request_method_register, NULL) -+ PHP_FE(http_request_method_unregister, NULL) -+ PHP_FE(http_request_method_exists, NULL) -+ PHP_FE(http_request_method_name, NULL) -+ PHP_FE(ob_etaghandler, NULL) -+#ifdef HTTP_HAVE_ZLIB -+ PHP_FE(http_deflate, NULL) -+ PHP_FE(http_inflate, NULL) -+ PHP_FE(ob_deflatehandler, NULL) -+ PHP_FE(ob_inflatehandler, NULL) -+#endif -+ PHP_FE(http_support, NULL) -+ -+ EMPTY_FUNCTION_ENTRY -+}; -+/* }}} */ -+ -+PHP_MINIT_FUNCTION(http); -+PHP_MSHUTDOWN_FUNCTION(http); -+PHP_RINIT_FUNCTION(http); -+PHP_RSHUTDOWN_FUNCTION(http); -+PHP_MINFO_FUNCTION(http); -+ -+/* {{{ http_module_dep */ -+#if ZEND_EXTENSION_API_NO >= 220050617 -+static zend_module_dep http_module_deps[] = { -+# ifdef HTTP_HAVE_SPL -+ ZEND_MOD_REQUIRED("spl") -+# endif -+# ifdef HTTP_HAVE_HASH -+ ZEND_MOD_REQUIRED("hash") -+# endif -+# ifdef HTTP_HAVE_SESSION -+ ZEND_MOD_REQUIRED("session") -+# endif -+# ifdef HTTP_HAVE_ICONV -+ ZEND_MOD_REQUIRED("iconv") -+# endif -+# ifdef HTTP_HAVE_EVENT -+ ZEND_MOD_CONFLICTS("event") -+#endif -+ {NULL, NULL, NULL, 0} -+}; -+#endif -+/* }}} */ -+ -+/* {{{ http_module_entry */ -+zend_module_entry http_module_entry = { -+#if ZEND_EXTENSION_API_NO >= 220050617 -+ STANDARD_MODULE_HEADER_EX, NULL, -+ http_module_deps, -+#else -+ STANDARD_MODULE_HEADER, -+#endif -+ "http", -+ http_functions, -+ PHP_MINIT(http), -+ PHP_MSHUTDOWN(http), -+ PHP_RINIT(http), -+ PHP_RSHUTDOWN(http), -+ PHP_MINFO(http), -+ PHP_HTTP_VERSION, -+ STANDARD_MODULE_PROPERTIES -+}; -+/* }}} */ -+ -+int http_module_number; -+ -+/* {{{ http_globals */ -+static void http_globals_init_once(zend_http_globals *G) -+{ -+ memset(G, 0, sizeof(zend_http_globals)); -+} -+ -+#define http_globals_init(g) _http_globals_init((g) TSRMLS_CC) -+static inline void _http_globals_init(zend_http_globals *G TSRMLS_DC) -+{ -+#ifdef HTTP_HAVE_SAPI_RTIME -+ G->request.time = sapi_get_request_time(TSRMLS_C); -+#else -+ G->request.time = time(NULL); -+#endif -+ G->send.buffer_size = 0; -+ G->read_post_data = 0; -+} -+ -+#define http_globals_free(g) _http_globals_free((g) TSRMLS_CC) -+static inline void _http_globals_free(zend_http_globals *G TSRMLS_DC) -+{ -+ if (G->request.headers) { -+ zend_hash_destroy(G->request.headers); -+ FREE_HASHTABLE(G->request.headers); -+ G->request.headers = NULL; -+ } -+ STR_SET(G->send.content_type, NULL); -+ STR_SET(G->send.unquoted_etag, NULL); -+ if (G->server_var) { -+ zval_ptr_dtor(&G->server_var); -+ G->server_var = NULL; -+ } -+} -+ -+#if defined(ZTS) && defined(PHP_DEBUG) -+#if ZTS && PHP_DEBUG -+zend_http_globals *http_globals(void) -+{ -+ TSRMLS_FETCH(); -+ return HTTP_G; -+} -+#endif -+#endif -+/* }}} */ -+ -+/* {{{ static inline void http_check_allowed_methods(char *) */ -+#define http_check_allowed_methods(m) _http_check_allowed_methods((m) TSRMLS_CC) -+static inline void _http_check_allowed_methods(const char *methods TSRMLS_DC) -+{ -+ if (*methods && SG(request_info).request_method) { -+ if (SUCCESS != http_check_method_ex(SG(request_info).request_method, methods)) { -+ char *header; -+ spprintf(&header, 0, "Allow: %s", methods); -+ http_exit(405, header); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ PHP_INI */ -+PHP_INI_MH(http_update_allowed_methods) -+{ -+ if (*new_value) { -+ http_check_allowed_methods(new_value); -+ } -+ return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); -+} -+PHP_INI_MH(http_update_persistent_handle_ident) -+{ -+ HTTP_G->persistent.handles.ident.h = zend_hash_func(new_value, HTTP_G->persistent.handles.ident.l = new_value_length+1); -+ return OnUpdateString(entry, new_value, new_value_length, mh_arg1, mh_arg2, mh_arg3, stage TSRMLS_CC); -+} -+ -+#ifndef ZEND_ENGINE_2 -+# define OnUpdateLong OnUpdateInt -+#endif -+ -+PHP_INI_BEGIN() -+ HTTP_PHP_INI_ENTRY("http.etag.mode", "MD5", PHP_INI_ALL, OnUpdateString, etag.mode) -+ HTTP_PHP_INI_ENTRY("http.log.cache", "", PHP_INI_ALL, OnUpdateString, log.cache) -+ HTTP_PHP_INI_ENTRY("http.log.redirect", "", PHP_INI_ALL, OnUpdateString, log.redirect) -+ HTTP_PHP_INI_ENTRY("http.log.not_found", "", PHP_INI_ALL, OnUpdateString, log.not_found) -+ HTTP_PHP_INI_ENTRY("http.log.allowed_methods", "", PHP_INI_ALL, OnUpdateString, log.allowed_methods) -+ HTTP_PHP_INI_ENTRY("http.log.composite", "", PHP_INI_ALL, OnUpdateString, log.composite) -+ HTTP_PHP_INI_ENTRY("http.request.methods.allowed", "", PHP_INI_ALL, http_update_allowed_methods, request.methods.allowed) -+ HTTP_PHP_INI_ENTRY("http.request.methods.custom", "", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateString, request.methods.custom) -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) -+ HTTP_PHP_INI_ENTRY("http.request.datashare.cookie", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.cookie) -+ HTTP_PHP_INI_ENTRY("http.request.datashare.dns", "1", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.dns) -+ HTTP_PHP_INI_ENTRY("http.request.datashare.ssl", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.ssl) -+ HTTP_PHP_INI_ENTRY("http.request.datashare.connect", "0", PHP_INI_SYSTEM, OnUpdateBool, request.datashare.connect) -+#endif -+#ifdef HTTP_HAVE_ZLIB -+ HTTP_PHP_INI_ENTRY("http.send.inflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.inflate.start_auto) -+ HTTP_PHP_INI_ENTRY("http.send.inflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.inflate.start_flags) -+ HTTP_PHP_INI_ENTRY("http.send.deflate.start_auto", "0", PHP_INI_PERDIR|PHP_INI_SYSTEM, OnUpdateBool, send.deflate.start_auto) -+ HTTP_PHP_INI_ENTRY("http.send.deflate.start_flags", "0", PHP_INI_ALL, OnUpdateLong, send.deflate.start_flags) -+#endif -+ HTTP_PHP_INI_ENTRY("http.persistent.handles.limit", "-1", PHP_INI_SYSTEM, OnUpdateLong, persistent.handles.limit) -+ HTTP_PHP_INI_ENTRY("http.persistent.handles.ident", "GLOBAL", PHP_INI_ALL, http_update_persistent_handle_ident, persistent.handles.ident.s) -+ HTTP_PHP_INI_ENTRY("http.send.not_found_404", "1", PHP_INI_ALL, OnUpdateBool, send.not_found_404) -+#ifdef ZEND_ENGINE_2 -+ HTTP_PHP_INI_ENTRY("http.only_exceptions", "0", PHP_INI_ALL, OnUpdateBool, only_exceptions) -+#endif -+ HTTP_PHP_INI_ENTRY("http.force_exit", "1", PHP_INI_ALL, OnUpdateBool, force_exit) -+PHP_INI_END() -+/* }}} */ -+ -+/* {{{ PHP_MINIT_FUNCTION */ -+PHP_MINIT_FUNCTION(http) -+{ -+ http_module_number = module_number; -+ ZEND_INIT_MODULE_GLOBALS(http, http_globals_init_once, NULL); -+ REGISTER_INI_ENTRIES(); -+ -+ if (0 -+ || SUCCESS != PHP_MINIT_CALL(http_persistent_handle) /* first */ -+ || SUCCESS != PHP_MINIT_CALL(http_cookie) -+#ifdef HTTP_HAVE_ZLIB -+ || SUCCESS != PHP_MINIT_CALL(http_encoding) -+#endif -+#ifdef HTTP_HAVE_CURL -+ || SUCCESS != PHP_MINIT_CALL(http_request) -+# ifdef ZEND_ENGINE_2 -+# endif -+#endif -+ || SUCCESS != PHP_MINIT_CALL(http_request_method) -+ || SUCCESS != PHP_MINIT_CALL(http_send) -+ || SUCCESS != PHP_MINIT_CALL(http_support) -+ || SUCCESS != PHP_MINIT_CALL(http_url) -+ -+#ifdef ZEND_ENGINE_2 -+ || SUCCESS != PHP_MINIT_CALL(http_filter) -+ || SUCCESS != PHP_MINIT_CALL(http_exception_object) -+# ifdef HTTP_HAVE_ZLIB -+ || SUCCESS != PHP_MINIT_CALL(http_deflatestream_object) -+ || SUCCESS != PHP_MINIT_CALL(http_inflatestream_object) -+# endif -+ || SUCCESS != PHP_MINIT_CALL(http_message_object) -+ || SUCCESS != PHP_MINIT_CALL(http_querystring_object) -+# ifdef HTTP_HAVE_CURL -+ || SUCCESS != PHP_MINIT_CALL(http_request_datashare) -+ || SUCCESS != PHP_MINIT_CALL(http_request_pool) -+ || SUCCESS != PHP_MINIT_CALL(http_request_object) -+ || SUCCESS != PHP_MINIT_CALL(http_requestdatashare_object) -+ || SUCCESS != PHP_MINIT_CALL(http_requestpool_object) -+# endif -+# ifndef WONKY -+ || SUCCESS != PHP_MINIT_CALL(http_response_object) -+# endif -+ || SUCCESS != PHP_MINIT_CALL(http_util_object) -+#endif -+ ) { -+ return FAILURE; -+ } -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ PHP_MSHUTDOWN_FUNCTION */ -+PHP_MSHUTDOWN_FUNCTION(http) -+{ -+ UNREGISTER_INI_ENTRIES(); -+ -+ if (0 -+#ifdef HTTP_HAVE_CURL -+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_request) -+# ifdef ZEND_ENGINE_2 -+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_request_datashare) -+# endif -+#endif -+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_message_object) -+ || SUCCESS != PHP_MSHUTDOWN_CALL(http_persistent_handle) /* last */ -+ ) { -+ return FAILURE; -+ } -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ PHP_RINIT_FUNCTION */ -+PHP_RINIT_FUNCTION(http) -+{ -+ http_globals_init(HTTP_G); -+ -+ if (HTTP_G->request.methods.allowed && *HTTP_G->request.methods.allowed) { -+ http_check_allowed_methods(HTTP_G->request.methods.allowed); -+ } -+ -+ if (0 -+#ifdef HTTP_HAVE_ZLIB -+ || SUCCESS != PHP_RINIT_CALL(http_encoding) -+#endif -+#ifdef HTTP_HAVE_CURL -+# ifdef ZEND_ENGINE_2 -+# ifdef HTTP_HAVE_EVENT -+ || SUCCESS != PHP_RINIT_CALL(http_request_pool) -+# endif -+ || SUCCESS != PHP_RINIT_CALL(http_request_datashare) -+# endif -+#endif -+ || SUCCESS != PHP_RINIT_CALL(http_request_method) -+ ) { -+ return FAILURE; -+ } -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ PHP_RSHUTDOWN_FUNCTION */ -+PHP_RSHUTDOWN_FUNCTION(http) -+{ -+ STATUS status = SUCCESS; -+ -+ if (0 -+#ifdef HTTP_HAVE_ZLIB -+ || SUCCESS != PHP_RSHUTDOWN_CALL(http_encoding) -+#endif -+#ifdef HTTP_HAVE_CURL -+# ifdef ZEND_ENGINE_2 -+ || SUCCESS != PHP_RSHUTDOWN_CALL(http_request_datashare) -+# endif -+#endif -+ || SUCCESS != PHP_RSHUTDOWN_CALL(http_request_method) -+ ) { -+ status = FAILURE; -+ } -+ -+ http_globals_free(HTTP_G); -+ return status; -+} -+/* }}} */ -+ -+/* {{{ PHP_MINFO_FUNCTION */ -+PHP_MINFO_FUNCTION(http) -+{ -+ php_info_print_table_start(); -+ { -+ php_info_print_table_header(2, "HTTP Support", "enabled"); -+ php_info_print_table_row(2, "Extension Version", PHP_HTTP_VERSION); -+ php_info_print_table_row(2, "Registered Classes", -+#ifndef ZEND_ENGINE_2 -+ "none" -+#else -+ "HttpUtil, " -+ "HttpMessage, " -+# ifdef HTTP_HAVE_CURL -+ "HttpRequest, " -+ "HttpRequestPool, " -+ "HttpRequestDataShare, " -+# endif -+# ifdef HTTP_HAVE_ZLIB -+ "HttpDeflateStream, " -+ "HttpInflateStream, " -+# endif -+# ifndef WONKY -+ "HttpResponse, " -+# endif -+ "HttpQueryString" -+#endif -+ ); -+ php_info_print_table_row(2, "Output Handlers", "ob_deflatehandler, ob_inflatehandler, ob_etaghandler"); -+ php_info_print_table_row(2, "Stream Filters", -+#ifndef ZEND_ENGINE_2 -+ "none" -+#else -+ "http.chunked_decode, http.chunked_encode, http.deflate, http.inflate" -+#endif -+ ); -+ } -+ php_info_print_table_end(); -+ -+ php_info_print_table_start(); -+ php_info_print_table_header(3, "Used Library", "Compiled", "Linked"); -+ { -+#ifdef HTTP_HAVE_CURL -+ curl_version_info_data *cv = curl_version_info(CURLVERSION_NOW); -+ php_info_print_table_row(3, "libcurl", LIBCURL_VERSION, cv->version); -+#else -+ php_info_print_table_row(2, "libcurl", "disabled", "disabled"); -+#endif -+#ifdef HTTP_HAVE_EVENT -+ php_info_print_table_row(3, "libevent", HTTP_EVENT_VERSION, event_get_version()); -+#else -+ php_info_print_table_row(3, "libevent", "disabled", "disabled"); -+#endif -+#ifdef HTTP_HAVE_ZLIB -+ php_info_print_table_row(3, "libz", ZLIB_VERSION, zlibVersion()); -+#else -+ php_info_print_table_row(3, "libz", "disabled", "disabled"); -+#endif -+#if defined(HTTP_HAVE_MAGIC) -+ php_info_print_table_row(3, "libmagic", "unknown", "unknown"); -+#else -+ php_info_print_table_row(3, "libmagic", "disabled", "disabled"); -+#endif -+ } -+ php_info_print_table_end(); -+ -+ php_info_print_table_start(); -+ php_info_print_table_colspan_header(4, "Persistent Handles"); -+ php_info_print_table_header(4, "Provider", "Ident", "Used", "Free"); -+ { -+ HashTable *ht; -+ HashPosition pos1, pos2; -+ HashKey provider = initHashKey(0), ident = initHashKey(0); -+ zval **val, **sub, **zused, **zfree; -+ -+ if ((ht = http_persistent_handle_statall()) && zend_hash_num_elements(ht)) { -+ FOREACH_HASH_KEYVAL(pos1, ht, provider, val) { -+ if (zend_hash_num_elements(Z_ARRVAL_PP(val))) { -+ FOREACH_KEYVAL(pos2, *val, ident, sub) { -+ if ( SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("used"), (void *) &zused) && -+ SUCCESS == zend_hash_find(Z_ARRVAL_PP(sub), ZEND_STRS("free"), (void *) &zfree)) { -+ zval *used = http_zsep(IS_STRING, *zused); -+ zval *free = http_zsep(IS_STRING, *zfree); -+ php_info_print_table_row(4, provider.str, ident.str, Z_STRVAL_P(used), Z_STRVAL_P(free)); -+ zval_ptr_dtor(&used); -+ zval_ptr_dtor(&free); -+ } else { -+ php_info_print_table_row(4, provider.str, ident.str, "0", "0"); -+ } -+ } -+ } else { -+ php_info_print_table_row(4, provider.str, "N/A", "0", "0"); -+ } -+ } -+ } else { -+ php_info_print_table_row(4, "N/A", "N/A", "0", "0"); -+ } -+ if (ht) { -+ zend_hash_destroy(ht); -+ FREE_HASHTABLE(ht); -+ } -+ } -+ php_info_print_table_end(); -+ -+ php_info_print_table_start(); -+ php_info_print_table_colspan_header(2, "Request Methods"); -+ { -+ HashPosition pos; -+ phpstr *methods = phpstr_new(); -+ char **name; -+ -+ FOREACH_HASH_VAL(pos, &HTTP_G->request.methods.registered, name) { -+ if (pos->h) { -+ phpstr_appendf(methods, "%s, ", *name); -+ } -+ } -+ phpstr_fix(methods); -+ php_info_print_table_row(2, "Registered", PHPSTR_VAL(methods)); -+ php_info_print_table_row(2, "Allowed", *HTTP_G->request.methods.allowed ? HTTP_G->request.methods.allowed : "(ANY)"); -+ phpstr_free(&methods); -+ } -+ php_info_print_table_end(); -+ -+ DISPLAY_INI_ENTRIES(); -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http.dsp -@@ -0,0 +1,257 @@ -+# Microsoft Developer Studio Project File - Name="http" - Package Owner=<4> -+# Microsoft Developer Studio Generated Build File, Format Version 6.00 -+# ** DO NOT EDIT ** -+ -+# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102 -+ -+CFG=http - Win32 Release_TS -+!MESSAGE This is not a valid makefile. To build this project using NMAKE, -+!MESSAGE use the Export Makefile command and run -+!MESSAGE -+!MESSAGE NMAKE /f "http.mak". -+!MESSAGE -+!MESSAGE You can specify a configuration when running NMAKE -+!MESSAGE by defining the macro CFG on the command line. For example: -+!MESSAGE -+!MESSAGE NMAKE /f "http.mak" CFG="http - Win32 Release_TS" -+!MESSAGE -+!MESSAGE Possible choices for configuration are: -+!MESSAGE -+!MESSAGE "http - Win32 Release_TS" (based on "Win32 (x86) Dynamic-Link Library") -+!MESSAGE "http - Win32 Debug_TS" (based on "Win32 (x86) Dynamic-Link Library") -+!MESSAGE -+ -+# Begin Project -+# PROP AllowPerConfigDependencies 0 -+# PROP Scc_ProjName "" -+# PROP Scc_LocalPath "" -+CPP=cl.exe -+MTL=midl.exe -+RSC=rc.exe -+ -+!IF "$(CFG)" == "http - Win32 Release_TS" -+ -+# PROP BASE Use_MFC 0 -+# PROP BASE Use_Debug_Libraries 0 -+# PROP BASE Output_Dir "Release_TS" -+# PROP BASE Intermediate_Dir "Release_TS" -+# PROP BASE Ignore_Export_Lib 0 -+# PROP BASE Target_Dir "" -+# PROP Use_MFC 0 -+# PROP Use_Debug_Libraries 0 -+# PROP Output_Dir "Release_TS" -+# PROP Intermediate_Dir "Release_TS" -+# PROP Ignore_Export_Lib 0 -+# PROP Target_Dir "" -+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_HTTP" /D ZTS=1 /YX /FD /c -+# ADD CPP /nologo /Gd /MD /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=0 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HTTP_EXPORTS" /D "COMPILE_DL_HTTP" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_HTTP=1 /D HTTP_HAVE_CURL=1 /D HAVE_CURL_EASY_STRERROR=1 /D HAVE_CURL_SHARE_STRERROR=1 /D HAVE_CURL_MULTI_STRERROR=1 /D HAVE_CURL_EASY_RESET=1 /D HAVE_CURL_FORMGET=1 /D HAVE_GETHOSTNAME=1 /D HAVE_GETSERVBYPORT=1 /D HAVE_GETSERVBYNAME=1 /D "_WINSOCKAPI_=" /FR /YX /FD /c -+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -+# ADD BASE RSC /l 0x406 /d "NDEBUG" -+# ADD RSC /l 0x406 /d "NDEBUG" -+BSC32=bscmake.exe -+# ADD BASE BSC32 /nologo -+# ADD BSC32 /nologo -+LINK32=link.exe -+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -+# ADD LINK32 libcurl.lib ssleay32.lib libeay32.lib zlib.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Release_TS/php_http.dll" /libpath:"..\..\Release_TS" /libpath:"..\..\Release_TS_Inline" /libpath:"..\..\..\php_build\curl\lib" /libpath:"..\..\..\php4\Release_TS" /libpath:"..\..\..\php4\Release_TS_Inline" -+ -+!ELSEIF "$(CFG)" == "http - Win32 Debug_TS" -+ -+# PROP BASE Use_MFC 0 -+# PROP BASE Use_Debug_Libraries 0 -+# PROP BASE Output_Dir "Debug_TS" -+# PROP BASE Intermediate_Dir "Debug_TS" -+# PROP BASE Ignore_Export_Lib 0 -+# PROP BASE Target_Dir "" -+# PROP Use_MFC 0 -+# PROP Use_Debug_Libraries 0 -+# PROP Output_Dir "Debug_TS" -+# PROP Intermediate_Dir "Debug_TS" -+# PROP Ignore_Export_Lib 0 -+# PROP Target_Dir "" -+# ADD BASE CPP /nologo /MT /W3 /GX /O2 /I "..\.." /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "COMPILE_DL_HTTP" /D ZTS=1 /YX /FD /c -+# ADD CPP /nologo /MDd /W3 /GX /O2 /I "..\.." /I "..\..\main" /I "..\..\Zend" /I "..\..\..\bindlib_w32" /I "..\..\TSRM" /D ZEND_DEBUG=1 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "HTTP_EXPORTS" /D "COMPILE_DL_HTTP" /D ZTS=1 /D "ZEND_WIN32" /D "PHP_WIN32" /D HAVE_HTTP=1 /D HTTP_HAVE_CURL=1 /D HAVE_CURL_EASY_STRERROR=1 /D HAVE_CURL_SHARE_STRERROR=1 /D HAVE_CURL_MULTI_STRERROR=1 /D HAVE_CURL_EASY_RESET=1 /D HAVE_CURL_FORMGET=1 /D HAVE_GETHOSTNAME=1 /D HAVE_GETSERVBYPORT=1 /D HAVE_GETSERVBYNAME=1 /D "_WINSOCKAPI_=" /YX /FD /c -+# ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -+# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 -+# ADD BASE RSC /l 0x406 /d "NDEBUG" -+# ADD RSC /l 0x406 /d "NDEBUG" -+BSC32=bscmake.exe -+# ADD BASE BSC32 /nologo -+# ADD BSC32 /nologo -+LINK32=link.exe -+# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts.lib /nologo /dll /machine:I386 -+# ADD LINK32 libcurl.lib ssleay32.lib libeay32.lib zlib.lib winmm.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib php4ts_debug.lib wsock32.lib /nologo /dll /machine:I386 /out:"..\..\Debug_TS/http.dll" /libpath:"..\..\Debug_TS" /libpath:"..\..\..\php_build\curl\lib" /libpath:"..\..\..\php4\Release_TS" /libpath:"..\..\..\php4\Release_TS_Inline" -+ -+!ENDIF -+ -+# Begin Target -+ -+# Name "http - Win32 Release_TS" -+# Name "http - Win32 Debug_TS" -+# Begin Group "Source Files" -+ -+# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" -+# Begin Source File -+ -+SOURCE=.\http.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_encoding_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_request_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_request_info.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_request_body_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_request_method_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_functions.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_persistent_handle_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_cache_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_cookie_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_date_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_headers_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_message_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_send_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_url_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_querystring_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\http_info_api.c -+# End Source File -+# Begin Source File -+ -+SOURCE=.\phpstr\phpstr.c -+# End Source File -+# End Group -+# Begin Group "Header Files" -+ -+# PROP Default_Filter "h;hpp;hxx;hm;inl" -+# Begin Source File -+ -+SOURCE=.\php_http.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_encoding_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_request_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_request_int.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_request_body_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_request_method_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_persistent_handle_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_cache_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_cookie_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_date_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_message_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_send_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_headers_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_url_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_querystring_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_info_api.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\php_http_std_defs.h -+# End Source File -+# Begin Source File -+ -+SOURCE=.\phpstr\phpstr.h -+# End Source File -+# End Group -+# Begin Group "Resource Files" -+ -+# PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" -+# End Group -+# End Target -+# End Project ---- /dev/null -+++ b/ext/http/http_api.c -@@ -0,0 +1,745 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_api.c 310302 2011-04-18 08:24:49Z rrichards $ */ -+ -+#define HTTP_WANT_SAPI -+#include "php_http.h" -+ -+#include "php_output.h" -+#include "ext/standard/url.h" -+#include "ext/standard/php_lcg.h" -+ -+#include "php_http_api.h" -+#include "php_http_send_api.h" -+ -+#ifdef ZEND_ENGINE_2 -+# include "php_http_exception_object.h" -+#endif -+ -+PHP_MINIT_FUNCTION(http_support) -+{ -+ HTTP_LONG_CONSTANT("HTTP_SUPPORT", HTTP_SUPPORT); -+ HTTP_LONG_CONSTANT("HTTP_SUPPORT_REQUESTS", HTTP_SUPPORT_REQUESTS); -+ HTTP_LONG_CONSTANT("HTTP_SUPPORT_MAGICMIME", HTTP_SUPPORT_MAGICMIME); -+ HTTP_LONG_CONSTANT("HTTP_SUPPORT_ENCODINGS", HTTP_SUPPORT_ENCODINGS); -+ HTTP_LONG_CONSTANT("HTTP_SUPPORT_SSLREQUESTS", HTTP_SUPPORT_SSLREQUESTS); -+ HTTP_LONG_CONSTANT("HTTP_SUPPORT_EVENTS", HTTP_SUPPORT_EVENTS); -+ -+ HTTP_LONG_CONSTANT("HTTP_PARAMS_ALLOW_COMMA", HTTP_PARAMS_ALLOW_COMMA); -+ HTTP_LONG_CONSTANT("HTTP_PARAMS_ALLOW_FAILURE", HTTP_PARAMS_ALLOW_FAILURE); -+ HTTP_LONG_CONSTANT("HTTP_PARAMS_RAISE_ERROR", HTTP_PARAMS_RAISE_ERROR); -+ HTTP_LONG_CONSTANT("HTTP_PARAMS_DEFAULT", HTTP_PARAMS_DEFAULT); -+ -+ return SUCCESS; -+} -+ -+PHP_HTTP_API long _http_support(long feature) -+{ -+ long support = HTTP_SUPPORT; -+ -+#ifdef HTTP_HAVE_CURL -+ support |= HTTP_SUPPORT_REQUESTS; -+# ifdef HTTP_HAVE_SSL -+ support |= HTTP_SUPPORT_SSLREQUESTS; -+# endif -+# ifdef HTTP_HAVE_EVENT -+ support |= HTTP_SUPPORT_EVENTS; -+# endif -+#endif -+#ifdef HTTP_HAVE_MAGIC -+ support |= HTTP_SUPPORT_MAGICMIME; -+#endif -+#ifdef HTTP_HAVE_ZLIB -+ support |= HTTP_SUPPORT_ENCODINGS; -+#endif -+ -+ if (feature) { -+ return (feature == (support & feature)); -+ } -+ return support; -+} -+ -+/* char *pretty_key(char *, size_t, zend_bool, zend_bool) */ -+char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen) -+{ -+ size_t i; -+ int wasalpha; -+ -+ if (key && key_len) { -+ if ((wasalpha = HTTP_IS_CTYPE(alpha, key[0]))) { -+ key[0] = (char) (uctitle ? HTTP_TO_CTYPE(upper, key[0]) : HTTP_TO_CTYPE(lower, key[0])); -+ } -+ for (i = 1; i < key_len; i++) { -+ if (HTTP_IS_CTYPE(alpha, key[i])) { -+ key[i] = (char) (((!wasalpha) && uctitle) ? HTTP_TO_CTYPE(upper, key[i]) : HTTP_TO_CTYPE(lower, key[i])); -+ wasalpha = 1; -+ } else { -+ if (xhyphen && (key[i] == '_')) { -+ key[i] = '-'; -+ } -+ wasalpha = 0; -+ } -+ } -+ } -+ return key; -+} -+/* }}} */ -+ -+/* {{{ http_boundary(char *, size_t) */ -+size_t _http_boundary(char *buf, size_t buf_len TSRMLS_DC) -+{ -+ return snprintf(buf, buf_len, "%lu%0.9f", (ulong) HTTP_G->request.time, (float) php_combined_lcg(TSRMLS_C)); -+} -+/* }}} */ -+ -+/* {{{ void http_error(long, long, char*) */ -+void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...) -+{ -+ va_list args; -+ -+ va_start(args, format); -+#ifdef ZEND_ENGINE_2 -+ if ((type == E_THROW) || (GLOBAL_ERROR_HANDLING == EH_THROW)) { -+ char *message; -+ zend_class_entry *ce = http_exception_get_for_code(code); -+ -+ http_try { -+ vspprintf(&message, 0, format, args); -+ zend_throw_exception(ce, message, code TSRMLS_CC); -+ efree(message); -+ } http_catch(GLOBAL_EXCEPTION_CLASS ? GLOBAL_EXCEPTION_CLASS : HTTP_EX_DEF_CE); -+ } else -+#endif -+ php_verror(NULL, "", type, format, args TSRMLS_CC); -+ va_end(args); -+} -+/* }}} */ -+ -+#ifdef ZEND_ENGINE_2 -+static inline void copy_bt_args(zval *from, zval *to TSRMLS_DC) -+{ -+ zval **args, **trace_0, *old_trace_0, *trace = NULL; -+ -+ if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), from, "trace", lenof("trace"), 0 TSRMLS_CC))) { -+ if (Z_TYPE_P(trace) == IS_ARRAY && SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) { -+ old_trace_0 = *trace_0; -+ if (Z_TYPE_PP(trace_0) == IS_ARRAY && SUCCESS == zend_hash_find(Z_ARRVAL_PP(trace_0), "args", sizeof("args"), (void *) &args)) { -+ if ((trace = zend_read_property(ZEND_EXCEPTION_GET_DEFAULT(), to, "trace", lenof("trace"), 0 TSRMLS_CC))) { -+ if (Z_TYPE_P(trace) == IS_ARRAY && SUCCESS == zend_hash_index_find(Z_ARRVAL_P(trace), 0, (void *) &trace_0)) { -+ ZVAL_ADDREF(*args); -+ add_assoc_zval(*trace_0, "args", *args); -+ } -+ } -+ } -+ } -+ } -+} -+ -+/* {{{ zval *http_exception_wrap(zval *, zval *, zend_class_entry *) */ -+zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend_class_entry *ce TSRMLS_DC) -+{ -+ int inner = 1; -+ char *message; -+ zval *sub_exception, *tmp_exception; -+ -+ if (!new_exception) { -+ MAKE_STD_ZVAL(new_exception); -+ object_init_ex(new_exception, ce); -+ -+ zend_update_property(ce, new_exception, "innerException", lenof("innerException"), old_exception TSRMLS_CC); -+ copy_bt_args(old_exception, new_exception TSRMLS_CC); -+ -+ sub_exception = old_exception; -+ -+ while ((sub_exception = zend_read_property(Z_OBJCE_P(sub_exception), sub_exception, "innerException", lenof("innerException"), 0 TSRMLS_CC)) && Z_TYPE_P(sub_exception) == IS_OBJECT) { -+ ++inner; -+ } -+ -+ spprintf(&message, 0, "Exception caused by %d inner exception(s)", inner); -+ zend_update_property_string(ZEND_EXCEPTION_GET_DEFAULT(), new_exception, "message", lenof("message"), message TSRMLS_CC); -+ efree(message); -+ } else { -+ sub_exception = new_exception; -+ tmp_exception = new_exception; -+ -+ while ((tmp_exception = zend_read_property(Z_OBJCE_P(tmp_exception), tmp_exception, "innerException", lenof("innerException"), 0 TSRMLS_CC)) && Z_TYPE_P(tmp_exception) == IS_OBJECT) { -+ sub_exception = tmp_exception; -+ } -+ -+ zend_update_property(Z_OBJCE_P(sub_exception), sub_exception, "innerException", lenof("innerException"), old_exception TSRMLS_CC); -+ copy_bt_args(old_exception, new_exception TSRMLS_CC); -+ copy_bt_args(old_exception, sub_exception TSRMLS_CC); -+ } -+#if PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 3 -+ Z_ADDREF_P(old_exception); -+ zend_exception_set_previous(new_exception, old_exception TSRMLS_CC); -+#endif -+ zval_ptr_dtor(&old_exception); -+ return new_exception; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_object_new(zend_object_value *, const char *, uint, http_object_new_t, zend_class_entry *, void *, void **) */ -+STATUS _http_object_new(zend_object_value *ov, const char *cname_str, uint cname_len, http_object_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC) -+{ -+ zend_class_entry *ce = parent_ce; -+ -+ if (cname_str && cname_len) { -+ if (!(ce = zend_fetch_class(HTTP_ZAPI_CONST_CAST(char *) cname_str, cname_len, ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC))) { -+ return FAILURE; -+ } -+ if (!instanceof_function(ce, parent_ce TSRMLS_CC)) { -+ http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Class %s does not extend %s", cname_str, parent_ce->name); -+ return FAILURE; -+ } -+ } -+ -+ *ov = create(ce, intern_ptr, obj_ptr TSRMLS_CC); -+ return SUCCESS; -+} -+/* }}} */ -+#endif /* ZEND_ENGINE_2 */ -+ -+/* {{{ void http_log(char *, char *, char *) */ -+void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC) -+{ -+ time_t now; -+ struct tm nowtm; -+ char datetime[20] = {0}; -+ -+ now = HTTP_G->request.time; -+ strftime(datetime, sizeof(datetime), "%Y-%m-%d %H:%M:%S", php_localtime_r(&now, &nowtm)); -+ -+#define HTTP_LOG_WRITE(file, type, msg) \ -+ if (file && *file) { \ -+ php_stream *log = php_stream_open_wrapper_ex(file, "ab", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT); \ -+ \ -+ if (log) { \ -+ php_stream_printf(log TSRMLS_CC, "%s\t[%s]\t%s\t<%s>%s", datetime, type, msg, SG(request_info).request_uri, PHP_EOL); \ -+ php_stream_close(log); \ -+ } \ -+ \ -+ } -+ -+ HTTP_LOG_WRITE(file, ident, message); -+ HTTP_LOG_WRITE(HTTP_G->log.composite, ident, message); -+} -+/* }}} */ -+ -+static void http_ob_blackhole(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) -+{ -+ *handled_output = ecalloc(1,1); -+ *handled_output_len = 0; -+} -+ -+/* {{{ STATUS http_exit(int, char*, char*) */ -+STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC) -+{ -+ if ( (send_header && (SUCCESS != http_send_status_header(status, header))) || -+ (status && (SUCCESS != http_send_status(status)))) { -+ http_error_ex(HE_WARNING, HTTP_E_HEADER, "Failed to exit with status/header: %d - %s", status, STR_PTR(header)); -+ STR_FREE(header); -+ STR_FREE(body); -+ return FAILURE; -+ } -+ -+ if (!php_ob_handler_used("zlib output compression") && !php_ob_handler_used("ob_gzhandler") && !OG(ob_lock)) { -+ php_end_ob_buffers(0 TSRMLS_CC); -+ } -+ if ((SUCCESS == sapi_send_headers(TSRMLS_C)) && body) { -+ PHPWRITE(body, strlen(body)); -+ } -+ -+ switch (status) { -+ case 301: http_log(HTTP_G->log.redirect, "301-REDIRECT", header); break; -+ case 302: http_log(HTTP_G->log.redirect, "302-REDIRECT", header); break; -+ case 303: http_log(HTTP_G->log.redirect, "303-REDIRECT", header); break; -+ case 305: http_log(HTTP_G->log.redirect, "305-REDIRECT", header); break; -+ case 307: http_log(HTTP_G->log.redirect, "307-REDIRECT", header); break; -+ case 304: http_log(HTTP_G->log.cache, "304-CACHE", header); break; -+ case 404: http_log(HTTP_G->log.not_found, "404-NOTFOUND", NULL); break; -+ case 405: http_log(HTTP_G->log.allowed_methods, "405-ALLOWED", header); break; -+ default: http_log(NULL, header, body); break; -+ } -+ -+ STR_FREE(header); -+ STR_FREE(body); -+ -+ if (HTTP_G->force_exit) { -+ zend_bailout(); -+ } else { -+ php_ob_set_internal_handler(http_ob_blackhole, 4096, "blackhole", 0 TSRMLS_CC); -+ } -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_check_method(char *) */ -+STATUS _http_check_method_ex(const char *method, const char *methods) -+{ -+ const char *found; -+ -+ if ( (found = strstr(methods, method)) && -+ (found == method || !HTTP_IS_CTYPE(alpha, found[-1])) && -+ (strlen(found) >= strlen(method) && !HTTP_IS_CTYPE(alpha, found[strlen(method)]))) { -+ return SUCCESS; -+ } -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ zval *http_get_server_var_ex(char *, size_t) */ -+PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_len, zend_bool check TSRMLS_DC) -+{ -+ zval **hsv, **var; -+ char *env; -+ -+ /* if available, this is a lot faster than accessing $_SERVER */ -+ if (sapi_module.getenv) { -+ if ((!(env = sapi_module.getenv((char *) key, key_len TSRMLS_CC))) || (check && !*env)) { -+ return NULL; -+ } -+ if (HTTP_G->server_var) { -+ zval_ptr_dtor(&HTTP_G->server_var); -+ } -+ MAKE_STD_ZVAL(HTTP_G->server_var); -+ ZVAL_STRING(HTTP_G->server_var, env, 1); -+ return HTTP_G->server_var; -+ } -+ -+#ifdef ZEND_ENGINE_2 -+ zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC); -+#endif -+ -+ if ((SUCCESS != zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv)) || (Z_TYPE_PP(hsv) != IS_ARRAY)) { -+ return NULL; -+ } -+ if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(hsv), HTTP_ZAPI_CONST_CAST(char *) key, key_len + 1, (void *) &var))) { -+ return NULL; -+ } -+ if (check && !((Z_TYPE_PP(var) == IS_STRING) && Z_STRVAL_PP(var) && Z_STRLEN_PP(var))) { -+ return NULL; -+ } -+ return *var; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_get_request_body(char **, size_t *) */ -+PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_bool dup TSRMLS_DC) -+{ -+ *length = 0; -+ *body = NULL; -+ -+ if (SG(request_info).raw_post_data) { -+ *length = SG(request_info).raw_post_data_length; -+ *body = SG(request_info).raw_post_data; -+ -+ if (dup) { -+ *body = estrndup(*body, *length); -+ } -+ return SUCCESS; -+ } else if (sapi_module.read_post && !HTTP_G->read_post_data) { -+ char *buf = emalloc(4096); -+ int len; -+ -+ HTTP_G->read_post_data = 1; -+ -+ while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) { -+ SG(read_post_bytes) += len; -+ *body = erealloc(*body, *length + len + 1); -+ memcpy(*body + *length, buf, len); -+ *length += len; -+ (*body)[*length] = '\0'; -+ if (len < 4096) { -+ break; -+ } -+ } -+ efree(buf); -+ -+ /* check for error */ -+ if (len < 0) { -+ STR_FREE(*body); -+ *length = 0; -+ return FAILURE; -+ } -+ -+ SG(request_info).raw_post_data = *body; -+ SG(request_info).raw_post_data_length = *length; -+ -+ if (dup) { -+ *body = estrndup(*body, *length); -+ } -+ return SUCCESS; -+ } -+ -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ php_stream *http_get_request_body_stream(void) */ -+PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D) -+{ -+ php_stream *s = NULL; -+ -+ if (SG(request_info).raw_post_data) { -+ s = php_stream_open_wrapper("php://input", "rb", 0, NULL); -+ } else if (sapi_module.read_post && !HTTP_G->read_post_data) { -+ HTTP_G->read_post_data = 1; -+ -+ if ((s = php_stream_temp_new())) { -+ char *buf = emalloc(4096); -+ int len; -+ -+ while (0 < (len = sapi_module.read_post(buf, 4096 TSRMLS_CC))) { -+ php_stream_write(s, buf, len); -+ if (len < 4096) { -+ break; -+ } -+ } -+ efree(buf); -+ -+ if (len < 0) { -+ php_stream_close(s); -+ s = NULL; -+ } else { -+ php_stream_rewind(s); -+ } -+ } -+ } -+ -+ return s; -+} -+/* }}} */ -+ -+/* {{{ void http_parse_params_default_callback(...) */ -+PHP_HTTP_API void _http_parse_params_default_callback(void *arg, const char *key, int keylen, const char *val, int vallen TSRMLS_DC) -+{ -+ char *kdup; -+ zval tmp, *entry; -+ HashTable *ht = (HashTable *) arg; -+ -+ if (ht) { -+ INIT_ZARR(tmp, ht); -+ -+ if (vallen) { -+ MAKE_STD_ZVAL(entry); -+ array_init(entry); -+ if (keylen) { -+ kdup = estrndup(key, keylen); -+ add_assoc_stringl_ex(entry, kdup, keylen + 1, (char *) val, vallen, 1); -+ efree(kdup); -+ } else { -+ add_next_index_stringl(entry, (char *) val, vallen, 1); -+ } -+ add_next_index_zval(&tmp, entry); -+ } else { -+ add_next_index_stringl(&tmp, (char *) key, keylen, 1); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ STATUS http_parse_params(const char *, HashTable *) */ -+PHP_HTTP_API STATUS _http_parse_params_ex(const char *param, int flags, http_parse_params_callback cb, void *cb_arg TSRMLS_DC) -+{ -+#define ST_QUOTE 1 -+#define ST_VALUE 2 -+#define ST_KEY 3 -+#define ST_ASSIGN 4 -+#define ST_ADD 5 -+ -+ int st = ST_KEY, keylen = 0, vallen = 0; -+ char *s, *c, *key = NULL, *val = NULL; -+ -+ for(c = s = estrdup(param);;) { -+ continued: -+#if 0 -+ { -+ char *tk = NULL, *tv = NULL; -+ -+ if (key) { -+ if (keylen) { -+ tk= estrndup(key, keylen); -+ } else { -+ tk = ecalloc(1, 7); -+ memcpy(tk, key, 3); -+ tk[3]='.'; tk[4]='.'; tk[5]='.'; -+ } -+ } -+ if (val) { -+ if (vallen) { -+ tv = estrndup(val, vallen); -+ } else { -+ tv = ecalloc(1, 7); -+ memcpy(tv, val, 3); -+ tv[3]='.'; tv[4]='.'; tv[5]='.'; -+ } -+ } -+ fprintf(stderr, "[%6s] %c \"%s=%s\"\n", -+ ( -+ st == ST_QUOTE ? "QUOTE" : -+ st == ST_VALUE ? "VALUE" : -+ st == ST_KEY ? "KEY" : -+ st == ST_ASSIGN ? "ASSIGN" : -+ st == ST_ADD ? "ADD": -+ "HUH?" -+ ), *c?*c:'0', tk, tv -+ ); -+ STR_FREE(tk); STR_FREE(tv); -+ } -+#endif -+ switch (st) { -+ case ST_QUOTE: -+ quote: -+ if (*c == '"') { -+ if (*(c-1) == '\\') { -+ memmove(c-1, c, strlen(c)+1); -+ goto quote; -+ } else { -+ goto add; -+ } -+ } else { -+ if (!val) { -+ val = c; -+ } -+ if (!*c) { -+ --val; -+ st = ST_ADD; -+ } -+ } -+ break; -+ -+ case ST_VALUE: -+ switch (*c) { -+ case '"': -+ if (!val) { -+ st = ST_QUOTE; -+ } -+ break; -+ -+ case ' ': -+ break; -+ -+ case ';': -+ case '\0': -+ goto add; -+ break; -+ case ',': -+ if (flags & HTTP_PARAMS_ALLOW_COMMA) { -+ goto add; -+ } -+ default: -+ if (!val) { -+ val = c; -+ } -+ break; -+ } -+ break; -+ -+ case ST_KEY: -+ switch (*c) { -+ case ',': -+ if (flags & HTTP_PARAMS_ALLOW_COMMA) { -+ goto allow_comma; -+ } -+ case '\r': -+ case '\n': -+ case '\t': -+ case '\013': -+ case '\014': -+ goto failure; -+ break; -+ -+ case ' ': -+ if (key) { -+ keylen = c - key; -+ st = ST_ASSIGN; -+ } -+ break; -+ -+ case ';': -+ case '\0': -+ allow_comma: -+ if (key) { -+ keylen = c-- - key; -+ st = ST_ADD; -+ } -+ break; -+ -+ case ':': -+ if (!(flags & HTTP_PARAMS_COLON_SEPARATOR)) { -+ goto not_separator; -+ } -+ if (key) { -+ keylen = c - key; -+ st = ST_VALUE; -+ } else { -+ goto failure; -+ } -+ break; -+ -+ case '=': -+ if (flags & HTTP_PARAMS_COLON_SEPARATOR) { -+ goto not_separator; -+ } -+ if (key) { -+ keylen = c - key; -+ st = ST_VALUE; -+ } else { -+ goto failure; -+ } -+ break; -+ -+ default: -+ not_separator: -+ if (!key) { -+ key = c; -+ } -+ break; -+ } -+ break; -+ -+ case ST_ASSIGN: -+ if (*c == '=') { -+ st = ST_VALUE; -+ } else if (!*c || *c == ';' || ((flags & HTTP_PARAMS_ALLOW_COMMA) && *c == ',')) { -+ st = ST_ADD; -+ } else if (*c != ' ') { -+ goto failure; -+ } -+ break; -+ -+ case ST_ADD: -+ add: -+ if (val) { -+ vallen = c - val; -+ if (st != ST_QUOTE) { -+ while (val[vallen-1] == ' ') --vallen; -+ } -+ } else { -+ val = ""; -+ vallen = 0; -+ } -+ -+ cb(cb_arg, key, keylen, val, vallen TSRMLS_CC); -+ -+ st = ST_KEY; -+ key = val = NULL; -+ keylen = vallen = 0; -+ break; -+ } -+ if (*c) { -+ ++c; -+ } else if (st == ST_ADD) { -+ goto add; -+ } else { -+ break; -+ } -+ } -+ -+ efree(s); -+ return SUCCESS; -+ -+failure: -+ if (flags & HTTP_PARAMS_RAISE_ERROR) { -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Unexpected character (%c) at pos %tu of %zu", *c, c-s, strlen(s)); -+ } -+ if (flags & HTTP_PARAMS_ALLOW_FAILURE) { -+ if (st == ST_KEY) { -+ if (key) { -+ keylen = c - key; -+ } else { -+ key = c; -+ } -+ } else { -+ --c; -+ } -+ st = ST_ADD; -+ goto continued; -+ } -+ efree(s); -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ array_join */ -+int apply_array_append_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) -+{ -+ int flags; -+ char *key = NULL; -+ HashTable *dst; -+ zval **data = NULL, **value = (zval **) pDest; -+ -+ dst = va_arg(args, HashTable *); -+ flags = va_arg(args, int); -+ -+ if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->nKeyLength) { -+ if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) { -+ key = pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1); -+ zend_hash_find(dst, key, hash_key->nKeyLength, (void *) &data); -+ } else { -+ zend_hash_quick_find(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) &data); -+ } -+ -+ ZVAL_ADDREF(*value); -+ if (data) { -+ add_next_index_zval(http_zset(IS_ARRAY, *data), *value); -+ } else if (key) { -+ zend_hash_add(dst, key, hash_key->nKeyLength, value, sizeof(zval *), NULL); -+ } else { -+ zend_hash_quick_add(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, value, sizeof(zval *), NULL); -+ } -+ -+ if (key) { -+ efree(key); -+ } -+ } -+ -+ return ZEND_HASH_APPLY_KEEP; -+} -+ -+int apply_array_merge_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key) -+{ -+ int flags; -+ char *key = NULL; -+ HashTable *dst; -+ zval **value = (zval **) pDest; -+ -+ dst = va_arg(args, HashTable *); -+ flags = va_arg(args, int); -+ -+ if ((!(flags & ARRAY_JOIN_STRONLY)) || hash_key->nKeyLength) { -+ ZVAL_ADDREF(*value); -+ if ((flags & ARRAY_JOIN_PRETTIFY) && hash_key->nKeyLength) { -+ key = pretty_key(estrndup(hash_key->arKey, hash_key->nKeyLength - 1), hash_key->nKeyLength - 1, 1, 1); -+ zend_hash_update(dst, key, hash_key->nKeyLength, (void *) value, sizeof(zval *), NULL); -+ efree(key); -+ } else { -+ zend_hash_quick_update(dst, hash_key->arKey, hash_key->nKeyLength, hash_key->h, (void *) value, sizeof(zval *), NULL); -+ } -+ } -+ -+ return ZEND_HASH_APPLY_KEEP; -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_cache_api.c -@@ -0,0 +1,256 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_cache_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#include "php_http.h" -+ -+#include "php_output.h" -+#include "php_streams.h" -+ -+#include "php_http_api.h" -+#include "php_http_cache_api.h" -+#include "php_http_date_api.h" -+#include "php_http_send_api.h" -+ -+/* {{{ char *http_etag(void *, size_t, http_send_mode) */ -+PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC) -+{ -+ void *ctx = http_etag_init(); -+ -+ if (data_mode == SEND_DATA) { -+ http_etag_update(ctx, data_ptr, data_len); -+ } else { -+ STATUS ss = FAILURE; -+ php_stream_statbuf ssb; -+ -+ if (data_mode == SEND_RSRC) { -+ ss = php_stream_stat((php_stream *) data_ptr, &ssb); -+ } else { -+ ss = php_stream_stat_path((char *) data_ptr, &ssb); -+ } -+ -+ if (SUCCESS != ss) { -+ efree(ctx); -+ return NULL; -+ } else { -+ size_t ssb_len; -+ char ssb_buf[128]; -+ -+ ssb_len = snprintf(ssb_buf, sizeof(ssb_buf), "%ld=%ld=%ld", (long) ssb.sb.st_mtime, -+ (long) ssb.sb.st_ino, -+ (long) ssb.sb.st_size); -+ http_etag_update(ctx, ssb_buf, ssb_len); -+ } -+ } -+ -+ return http_etag_finish(ctx); -+} -+/* }}} */ -+ -+/* {{{ time_t http_last_modified(void *, http_send_mode) */ -+PHP_HTTP_API time_t _http_last_modified(const void *data_ptr, http_send_mode data_mode TSRMLS_DC) -+{ -+ php_stream_statbuf ssb; -+ -+ switch (data_mode) { -+ case SEND_DATA: return HTTP_G->request.time; -+ case SEND_RSRC: return php_stream_stat((php_stream *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime; -+ default: return php_stream_stat_path((char *) data_ptr, &ssb) ? 0 : ssb.sb.st_mtime; -+ } -+} -+/* }}} */ -+ -+/* {{{ zend_bool http_match_last_modified(char *, time_t) */ -+PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC) -+{ -+ zend_bool retval; -+ zval *zmodified; -+ char *modified, *chr_ptr; -+ -+ if (!(zmodified = http_get_server_var(entry, 1))) { -+ return !enforce_presence; -+ } -+ -+ modified = estrndup(Z_STRVAL_P(zmodified), Z_STRLEN_P(zmodified)); -+ if ((chr_ptr = strrchr(modified, ';'))) { -+ chr_ptr = 0; -+ } -+ -+ retval = (t <= http_parse_date_ex(modified, 1)); -+ efree(modified); -+ return retval; -+} -+/* }}} */ -+ -+/* {{{ zend_bool http_match_etag(char *, char *) */ -+PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC) -+{ -+ zval *zetag; -+ char *quoted_etag; -+ zend_bool result; -+ -+ if (!(zetag = http_get_server_var_ex(entry, strlen(entry)+1, 1))) { -+ return !enforce_presence; -+ } -+ -+ if (NULL != strchr(Z_STRVAL_P(zetag), '*')) { -+ return 1; -+ } -+ -+ spprintf("ed_etag, 0, "\"%s\"", etag); -+ if (!strchr(Z_STRVAL_P(zetag), ',')) { -+ result = !strcmp(Z_STRVAL_P(zetag), quoted_etag); -+ } else { -+ result = (NULL != strstr(Z_STRVAL_P(zetag), quoted_etag)); -+ } -+ efree(quoted_etag); -+ -+ return result; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_cache_last_modified(time_t, time_t, char *, size_t) */ -+PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified, -+ time_t send_modified, const char *cache_control, size_t cc_len TSRMLS_DC) -+{ -+ char *sent_header = NULL; -+ -+ if (SG(headers_sent)) { -+ return FAILURE; -+ } -+ -+ if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) { -+ return FAILURE; -+ } -+ -+ if (SUCCESS != http_send_last_modified_ex(send_modified, &sent_header)) { -+ return FAILURE; -+ } -+ -+ if (http_match_last_modified("HTTP_IF_MODIFIED_SINCE", last_modified)) { -+ http_exit_ex(304, sent_header, NULL, 0); -+ } else { -+ STR_FREE(sent_header); -+ } -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_cache_etag(char *, size_t, char *, size_t) */ -+PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, -+ const char *cache_control, size_t cc_len TSRMLS_DC) -+{ -+ char *sent_header = NULL; -+ -+ if (SG(headers_sent)) { -+ return FAILURE; -+ } -+ -+ if (cc_len && (SUCCESS != http_send_cache_control(cache_control, cc_len))) { -+ return FAILURE; -+ } -+ -+ if (etag_len) { -+ if (SUCCESS != http_send_etag_ex(etag, etag_len, &sent_header)) { -+ return FAILURE; -+ } -+ if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { -+ http_exit_ex(304, sent_header, NULL, 0); -+ } else { -+ STR_FREE(sent_header); -+ } -+ return SUCCESS; -+ } -+ -+ /* start ob_etaghandler */ -+ return http_start_ob_etaghandler(); -+} -+/* }}} */ -+ -+PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D) -+{ -+ /* already running? */ -+ if (php_ob_handler_used("ob_etaghandler" TSRMLS_CC)) { -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "ob_etaghandler can only be used once"); -+ return FAILURE; -+ } -+ -+ HTTP_G->etag.started = 1; -+ return php_start_ob_buffer_named("ob_etaghandler", HTTP_G->send.buffer_size, 0 TSRMLS_CC); -+} -+ -+PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D) -+{ -+ if (HTTP_G->etag.started) { -+ HTTP_G->etag.started = 0; -+ if (HTTP_G->etag.ctx) { -+ efree(HTTP_G->etag.ctx); -+ HTTP_G->etag.ctx = NULL; -+ } -+ return 1; -+ } -+ return 0; -+} -+ -+/* {{{ void http_ob_etaghandler(char *, uint, char **, uint *, int) */ -+void _http_ob_etaghandler(char *output, uint output_len, -+ char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) -+{ -+ /* passthru */ -+ *handled_output_len = output_len; -+ *handled_output = estrndup(output, output_len); -+ -+ /* are we supposed to run? */ -+ if (HTTP_G->etag.started) { -+ /* initialize the etag context */ -+ if (mode & PHP_OUTPUT_HANDLER_START) { -+ HTTP_G->etag.ctx = http_etag_init(); -+ } -+ -+ /* update */ -+ http_etag_update(HTTP_G->etag.ctx, output, output_len); -+ -+ /* finish */ -+ if (mode & PHP_OUTPUT_HANDLER_END) { -+ char *sent_header = NULL; -+ char *etag = http_etag_finish(HTTP_G->etag.ctx); -+ -+ HTTP_G->etag.ctx = NULL; -+ -+ http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)); -+ http_send_etag_ex(etag, strlen(etag), &sent_header); -+ -+ if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { -+ /* force exit; ob within ob does not work */ -+ HTTP_G->force_exit = 1; -+ http_exit_ex(304, sent_header, etag, 0); -+ } -+ -+ STR_FREE(sent_header); -+ STR_FREE(etag); -+ } -+ } -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: sw=4 ts=4 fdm=marker -+ * vim<600: sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_cookie_api.c -@@ -0,0 +1,371 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_cookie_api.c 298662 2010-04-27 13:42:32Z mike $ */ -+ -+#include "php_http.h" -+#include "php_http_api.h" -+#include "php_http_date_api.h" -+#include "php_http_cookie_api.h" -+ -+#include "ext/standard/url.h" -+ -+/* {{{ PHP_MINIT_FUNCTION(http_cookie) */ -+PHP_MINIT_FUNCTION(http_cookie) -+{ -+ HTTP_LONG_CONSTANT("HTTP_COOKIE_PARSE_RAW", HTTP_COOKIE_PARSE_RAW); -+ HTTP_LONG_CONSTANT("HTTP_COOKIE_SECURE", HTTP_COOKIE_SECURE); -+ HTTP_LONG_CONSTANT("HTTP_COOKIE_HTTPONLY", HTTP_COOKIE_HTTPONLY); -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ http_cookie_list *http_cookie_list_init(http_cookie_list *) */ -+PHP_HTTP_API http_cookie_list *_http_cookie_list_init(http_cookie_list *list ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ if (!list) { -+ list = emalloc_rel(sizeof(http_cookie_list)); -+ } -+ -+ zend_hash_init(&list->cookies, 0, NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_init(&list->extras, 0, NULL, ZVAL_PTR_DTOR, 0); -+ -+ list->path = NULL; -+ list->domain = NULL; -+ list->expires = 0; -+ list->flags = 0; -+ -+ return list; -+} -+/* }}} */ -+ -+/* {{{ void http_cookie_list_dtor(http_cookie_list *) */ -+PHP_HTTP_API void _http_cookie_list_dtor(http_cookie_list *list TSRMLS_DC) -+{ -+ if (list) { -+ zend_hash_destroy(&list->cookies); -+ zend_hash_destroy(&list->extras); -+ -+ STR_SET(list->path, NULL); -+ STR_SET(list->domain, NULL); -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_cookie_list_free(http_cookie_list **) */ -+PHP_HTTP_API void _http_cookie_list_free(http_cookie_list **list TSRMLS_DC) -+{ -+ if (list) { -+ http_cookie_list_dtor(*list); -+ efree(*list); -+ *list = NULL; -+ } -+} -+/* }}} */ -+ -+/* {{{ const char *http_cookie_list_get_cookie(http_cookie_list *, const char*, size_t) */ -+PHP_HTTP_API const char *_http_cookie_list_get_cookie(http_cookie_list *list, const char *name, size_t name_len TSRMLS_DC) -+{ -+ zval **cookie = NULL; -+ if ((SUCCESS != zend_hash_find(&list->cookies, HTTP_ZAPI_CONST_CAST(char *) name, name_len + 1, (void *) &cookie)) || (Z_TYPE_PP(cookie) != IS_STRING)) { -+ return NULL; -+ } -+ return Z_STRVAL_PP(cookie); -+} -+/* }}} */ -+ -+/* {{{ const char *http_cookie_list_get_extra(http_cookie_list *, const char *, size_t) */ -+PHP_HTTP_API const char *_http_cookie_list_get_extra(http_cookie_list *list, const char *name, size_t name_len TSRMLS_DC) -+{ -+ zval **extra = NULL; -+ if ((SUCCESS != zend_hash_find(&list->extras, HTTP_ZAPI_CONST_CAST(char *) name, name_len + 1, (void *) &extra)) || (Z_TYPE_PP(extra) != IS_STRING)) { -+ return NULL; -+ } -+ return Z_STRVAL_PP(extra); -+} -+/* }}} */ -+ -+/* {{{ void http_cookie_list_add_cookie(http_cookie_list *, const char *, size_t, const char *, size_t) */ -+PHP_HTTP_API void _http_cookie_list_add_cookie(http_cookie_list *list, const char *name, size_t name_len, const char *value, size_t value_len TSRMLS_DC) -+{ -+ zval *cookie_value; -+ char *key = estrndup(name, name_len); -+ MAKE_STD_ZVAL(cookie_value); -+ ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0); -+ zend_hash_update(&list->cookies, key, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL); -+ efree(key); -+} -+/* }}} */ -+ -+/* {{{ void http_cookie_list_add_extr(http_cookie_list *, const char *, size_t, const char *, size_t) */ -+PHP_HTTP_API void _http_cookie_list_add_extra(http_cookie_list *list, const char *name, size_t name_len, const char *value, size_t value_len TSRMLS_DC) -+{ -+ zval *cookie_value; -+ char *key = estrndup(name, name_len); -+ MAKE_STD_ZVAL(cookie_value); -+ ZVAL_STRINGL(cookie_value, estrndup(value, value_len), value_len, 0); -+ zend_hash_update(&list->extras, key, name_len + 1, (void *) &cookie_value, sizeof(zval *), NULL); -+ efree(key); -+} -+/* }}} */ -+ -+typedef struct _http_parse_param_cb_arg_t { -+ http_cookie_list *list; -+ long flags; -+ char **allowed_extras; -+} http_parse_param_cb_arg; -+ -+/* {{{ static void http_parse_cookie_callback */ -+static void http_parse_cookie_callback(void *ptr, const char *key, int keylen, const char *val, int vallen TSRMLS_DC) -+{ -+ http_parse_param_cb_arg *arg = (http_parse_param_cb_arg *) ptr; -+ -+#define _KEY_IS(s) (keylen == lenof(s) && !strncasecmp(key, (s), keylen)) -+ if _KEY_IS("path") { -+ STR_SET(arg->list->path, estrndup(val, vallen)); -+ } else if _KEY_IS("domain") { -+ STR_SET(arg->list->domain, estrndup(val, vallen)); -+ } else if _KEY_IS("expires") { -+ char *date = estrndup(val, vallen); -+ arg->list->expires = http_parse_date(date); -+ efree(date); -+ } else if _KEY_IS("secure") { -+ arg->list->flags |= HTTP_COOKIE_SECURE; -+ } else if _KEY_IS("httpOnly") { -+ arg->list->flags |= HTTP_COOKIE_HTTPONLY; -+ } else { -+ /* check for extra */ -+ if (arg->allowed_extras) { -+ char **ae = arg->allowed_extras; -+ -+ for (; *ae; ++ae) { -+ if ((size_t) keylen == strlen(*ae) && !strncasecmp(key, *ae, keylen)) { -+ if (arg->flags & HTTP_COOKIE_PARSE_RAW) { -+ http_cookie_list_add_extra(arg->list, key, keylen, val, vallen); -+ } else { -+ char *dec = estrndup(val, vallen); -+ int declen = php_url_decode(dec, vallen); -+ -+ http_cookie_list_add_extra(arg->list, key, keylen, dec, declen); -+ efree(dec); -+ } -+ return; -+ } -+ } -+ } -+ /* new cookie */ -+ if (arg->flags & HTTP_COOKIE_PARSE_RAW) { -+ http_cookie_list_add_cookie(arg->list, key, keylen, val, vallen); -+ } else { -+ char *dec = estrndup(val, vallen); -+ int declen = php_url_decode(dec, vallen); -+ -+ http_cookie_list_add_cookie(arg->list, key, keylen, dec, declen); -+ efree(dec); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ http_cookie_list *http_parse_cookie(char *, long) */ -+PHP_HTTP_API http_cookie_list *_http_parse_cookie_ex(http_cookie_list *list, const char *string, long flags, char **allowed_extras TSRMLS_DC) -+{ -+ int free_list = !list; -+ http_parse_param_cb_arg arg; -+ -+ list = http_cookie_list_init(list); -+ -+ arg.list = list; -+ arg.flags = flags; -+ arg.allowed_extras = allowed_extras; -+ -+ if (SUCCESS != http_parse_params_ex(string, HTTP_PARAMS_RAISE_ERROR, http_parse_cookie_callback, &arg)) { -+ if (free_list) { -+ http_cookie_list_free(&list); -+ } else { -+ http_cookie_list_dtor(list); -+ } -+ list = NULL; -+ } -+ -+ return list; -+} -+/* }}} */ -+ -+/* {{{ void http_cookie_list_tostruct(http_cookie_list *, zval *) */ -+PHP_HTTP_API void _http_cookie_list_tostruct(http_cookie_list *list, zval *strct TSRMLS_DC) -+{ -+ zval array, *cookies, *extras; -+ -+ INIT_ZARR(array, HASH_OF(strct)); -+ -+ MAKE_STD_ZVAL(cookies); -+ array_init(cookies); -+ zend_hash_copy(Z_ARRVAL_P(cookies), &list->cookies, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ add_assoc_zval(&array, "cookies", cookies); -+ -+ MAKE_STD_ZVAL(extras); -+ array_init(extras); -+ zend_hash_copy(Z_ARRVAL_P(extras), &list->extras, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ add_assoc_zval(&array, "extras", extras); -+ -+ add_assoc_long(&array, "flags", list->flags); -+ add_assoc_long(&array, "expires", (long) list->expires); -+ add_assoc_string(&array, "path", STR_PTR(list->path), 1); -+ add_assoc_string(&array, "domain", STR_PTR(list->domain), 1); -+} -+/* }}} */ -+ -+/* {{{ http_cookie_list *http_cookie_list_fromstruct(http_cookie_list *, zval *strct) */ -+PHP_HTTP_API http_cookie_list *_http_cookie_list_fromstruct(http_cookie_list *list, zval *strct TSRMLS_DC) -+{ -+ zval **tmp, *cpy; -+ HashTable *ht = HASH_OF(strct); -+ -+ list = http_cookie_list_init(list); -+ -+ if (SUCCESS == zend_hash_find(ht, "cookies", sizeof("cookies"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_ARRAY) { -+ zend_hash_copy(&list->cookies, Z_ARRVAL_PP(tmp), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ } -+ if (SUCCESS == zend_hash_find(ht, "extras", sizeof("extras"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_ARRAY) { -+ zend_hash_copy(&list->extras, Z_ARRVAL_PP(tmp), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ } -+ if (SUCCESS == zend_hash_find(ht, "flags", sizeof("flags"), (void *) &tmp)) { -+ switch (Z_TYPE_PP(tmp)) { -+ case IS_LONG: -+ list->flags = Z_LVAL_PP(tmp); -+ break; -+ case IS_DOUBLE: -+ list->flags = (long) Z_DVAL_PP(tmp); -+ break; -+ case IS_STRING: -+ cpy = http_zsep(IS_LONG, *tmp); -+ list->flags = Z_LVAL_P(cpy); -+ zval_ptr_dtor(&cpy); -+ break; -+ default: -+ break; -+ } -+ } -+ if (SUCCESS == zend_hash_find(ht, "expires", sizeof("expires"), (void *) &tmp)) { -+ switch (Z_TYPE_PP(tmp)) { -+ case IS_LONG: -+ list->expires = Z_LVAL_PP(tmp); -+ break; -+ case IS_DOUBLE: -+ list->expires = (long) Z_DVAL_PP(tmp); -+ break; -+ case IS_STRING: -+ cpy = http_zsep(IS_LONG, *tmp); -+ if (Z_LVAL_P(cpy)) { -+ list->expires = Z_LVAL_P(cpy); -+ } else { -+ time_t expires = http_parse_date(Z_STRVAL_PP(tmp)); -+ if (expires > 0) { -+ list->expires = expires; -+ } -+ } -+ zval_ptr_dtor(&cpy); -+ break; -+ default: -+ break; -+ } -+ } -+ if (SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_STRING) { -+ list->path = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp)); -+ } -+ if (SUCCESS == zend_hash_find(ht, "domain", sizeof("domain"), (void *) &tmp) && Z_TYPE_PP(tmp) == IS_STRING) { -+ list->domain = estrndup(Z_STRVAL_PP(tmp), Z_STRLEN_PP(tmp)); -+ } -+ -+ return list; -+} -+/* }}} */ -+ -+/* {{{ inline append_encoded */ -+static inline void append_encoded(phpstr *buf, const char *key, size_t key_len, const char *val, size_t val_len) -+{ -+ char *enc_str[2]; -+ int enc_len[2]; -+ -+ enc_str[0] = php_url_encode(key, key_len, &enc_len[0]); -+ enc_str[1] = php_url_encode(val, val_len, &enc_len[1]); -+ -+ phpstr_append(buf, enc_str[0], enc_len[0]); -+ phpstr_appends(buf, "="); -+ phpstr_append(buf, enc_str[1], enc_len[1]); -+ phpstr_appends(buf, "; "); -+ -+ efree(enc_str[0]); -+ efree(enc_str[1]); -+} -+/* }}} */ -+ -+/* {{{ void http_cookie_list_tostring(http_cookie_list *, char **, size_t *) */ -+PHP_HTTP_API void _http_cookie_list_tostring(http_cookie_list *list, char **str, size_t *len TSRMLS_DC) -+{ -+ phpstr buf; -+ zval **val; -+ HashKey key = initHashKey(0); -+ HashPosition pos; -+ -+ phpstr_init(&buf); -+ -+ FOREACH_HASH_KEYVAL(pos, &list->cookies, key, val) { -+ if (key.type == HASH_KEY_IS_STRING && key.len) { -+ zval *tmp = http_zsep(IS_STRING, *val); -+ append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); -+ zval_ptr_dtor(&tmp); -+ } -+ } -+ -+ if (list->domain && *list->domain) { -+ phpstr_appendf(&buf, "domain=%s; ", list->domain); -+ } -+ if (list->path && *list->path) { -+ phpstr_appendf(&buf, "path=%s; ", list->path); -+ } -+ if (list->expires) { -+ char *date = http_date(list->expires); -+ phpstr_appendf(&buf, "expires=%s; ", date); -+ efree(date); -+ } -+ -+ FOREACH_HASH_KEYVAL(pos, &list->extras, key, val) { -+ if (key.type == HASH_KEY_IS_STRING && key.len) { -+ zval *tmp = http_zsep(IS_STRING, *val); -+ append_encoded(&buf, key.str, key.len-1, Z_STRVAL_P(tmp), Z_STRLEN_P(tmp)); -+ } -+ } -+ -+ if (list->flags & HTTP_COOKIE_SECURE) { -+ phpstr_appends(&buf, "secure; "); -+ } -+ if (list->flags & HTTP_COOKIE_HTTPONLY) { -+ phpstr_appends(&buf, "httpOnly; "); -+ } -+ -+ phpstr_fix(&buf); -+ *str = PHPSTR_VAL(&buf); -+ *len = PHPSTR_LEN(&buf); -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/http_date_api.c -@@ -0,0 +1,357 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_date_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#include "php_http.h" -+ -+#include "php_http_api.h" -+#include "php_http_date_api.h" -+ -+static inline int check_day(const char *day, size_t len); -+static inline int check_month(const char *month); -+static inline int check_tzone(const char *tzone); -+static inline time_t parse_date(const char *month); -+ -+/* {{{ day/month names */ -+static const char *days[] = { -+ "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat" -+}; -+static const char *wkdays[] = { -+ "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun" -+}; -+static const char *weekdays[] = { -+ "Monday", "Tuesday", "Wednesday", -+ "Thursday", "Friday", "Saturday", "Sunday" -+}; -+static const char *months[] = { -+ "Jan", "Feb", "Mar", "Apr", "May", "Jun", -+ "Jul", "Aug", "Sep", "Oct", "Nov", "Dec" -+}; -+enum assume_next { -+ DATE_MDAY, -+ DATE_YEAR, -+ DATE_TIME -+}; -+#define DS -60 -+static const struct time_zone { -+ const char *name; -+ const int offset; -+} time_zones[] = { -+ {"GMT", 0}, /* Greenwich Mean */ -+ {"UTC", 0}, /* Universal (Coordinated) */ -+ {"WET", 0}, /* Western European */ -+ {"BST", 0 DS}, /* British Summer */ -+ {"WAT", 60}, /* West Africa */ -+ {"AST", 240}, /* Atlantic Standard */ -+ {"ADT", 240 DS},/* Atlantic Daylight */ -+ {"EST", 300}, /* Eastern Standard */ -+ {"EDT", 300 DS},/* Eastern Daylight */ -+ {"CST", 360}, /* Central Standard */ -+ {"CDT", 360 DS},/* Central Daylight */ -+ {"MST", 420}, /* Mountain Standard */ -+ {"MDT", 420 DS},/* Mountain Daylight */ -+ {"PST", 480}, /* Pacific Standard */ -+ {"PDT", 480 DS},/* Pacific Daylight */ -+ {"YST", 540}, /* Yukon Standard */ -+ {"YDT", 540 DS},/* Yukon Daylight */ -+ {"HST", 600}, /* Hawaii Standard */ -+ {"HDT", 600 DS},/* Hawaii Daylight */ -+ {"CAT", 600}, /* Central Alaska */ -+ {"AHST", 600}, /* Alaska-Hawaii Standard */ -+ {"NT", 660}, /* Nome */ -+ {"IDLW", 720}, /* International Date Line West */ -+ {"CET", -60}, /* Central European */ -+ {"MET", -60}, /* Middle European */ -+ {"MEWT", -60}, /* Middle European Winter */ -+ {"MEST", -60 DS},/* Middle European Summer */ -+ {"CEST", -60 DS},/* Central European Summer */ -+ {"MESZ", -60 DS},/* Middle European Summer */ -+ {"FWT", -60}, /* French Winter */ -+ {"FST", -60 DS},/* French Summer */ -+ {"EET", -120}, /* Eastern Europe, USSR Zone 1 */ -+ {"WAST", -420}, /* West Australian Standard */ -+ {"WADT", -420 DS},/* West Australian Daylight */ -+ {"CCT", -480}, /* China Coast, USSR Zone 7 */ -+ {"JST", -540}, /* Japan Standard, USSR Zone 8 */ -+ {"EAST", -600}, /* Eastern Australian Standard */ -+ {"EADT", -600 DS},/* Eastern Australian Daylight */ -+ {"GST", -600}, /* Guam Standard, USSR Zone 9 */ -+ {"NZT", -720}, /* New Zealand */ -+ {"NZST", -720}, /* New Zealand Standard */ -+ {"NZDT", -720 DS},/* New Zealand Daylight */ -+ {"IDLE", -720}, /* International Date Line East */ -+}; -+/* }}} */ -+ -+/* {{{ Day/Month/TZ checks for http_parse_date() -+ Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. */ -+static inline int check_day(const char *day, size_t len) -+{ -+ int i; -+ const char * const *check = (len > 3) ? &weekdays[0] : &wkdays[0]; -+ for (i = 0; i < 7; i++) { -+ if (!strcmp(day, check[0])) { -+ return i; -+ } -+ check++; -+ } -+ return -1; -+} -+ -+static inline int check_month(const char *month) -+{ -+ int i; -+ const char * const *check = &months[0]; -+ for (i = 0; i < 12; i++) { -+ if (!strcmp(month, check[0])) { -+ return i; -+ } -+ check++; -+ } -+ return -1; -+} -+ -+/* return the time zone offset between GMT and the input one, in number -+ of seconds or -1 if the timezone wasn't found/legal */ -+ -+static inline int check_tzone(const char *tzone) -+{ -+ unsigned i; -+ const struct time_zone *check = time_zones; -+ for (i = 0; i < sizeof(time_zones) / sizeof(time_zones[0]); i++) { -+ if (!strcmp(tzone, check->name)) { -+ return check->offset * 60; -+ } -+ check++; -+ } -+ return -1; -+} -+/* }}} */ -+ -+/* {{{ char *http_date(time_t) */ -+PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC) -+{ -+ char *date = NULL; -+ struct tm *gmtime = NULL, tmbuf; -+ -+ memset(&tmbuf, 0, sizeof(tmbuf)); -+ if ((gmtime = php_gmtime_r(&t, &tmbuf))) { -+ spprintf(&date, 0, -+ "%s, %02d %s %04d %02d:%02d:%02d GMT", -+ days[gmtime->tm_wday], gmtime->tm_mday, -+ months[gmtime->tm_mon], gmtime->tm_year + 1900, -+ gmtime->tm_hour, gmtime->tm_min, gmtime->tm_sec -+ ); -+ } -+ -+ return date; -+} -+/* }}} */ -+ -+/* {{{ time_t http_parse_date(char *) */ -+PHP_HTTP_API time_t _http_parse_date_ex(const char *date, zend_bool silent TSRMLS_DC) -+{ -+ time_t t = parse_date(date); -+ -+ if (-1 == t && !silent) { -+ http_error_ex(HE_NOTICE, HTTP_E_RUNTIME, "Could not parse date: %s", date); -+ } -+ -+ return t; -+} -+/* }}} */ -+ -+/* time_t parse_date(char *) -+ Originally by libcurl, Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. */ -+static inline time_t parse_date(const char *date) -+{ -+ time_t t = 0; -+ int tz_offset = -1, year = -1, month = -1, monthday = -1, weekday = -1, -+ hours = -1, minutes = -1, seconds = -1; -+ struct tm tm; -+ enum assume_next dignext = DATE_MDAY; -+ const char *indate = date; -+ -+ int part = 0; /* max 6 parts */ -+ -+ while (*date && (part < 6)) { -+ int found = 0; -+ -+ while (*date && !HTTP_IS_CTYPE(alnum, *date)) { -+ date++; -+ } -+ -+ if (HTTP_IS_CTYPE(alpha, *date)) { -+ /* a name coming up */ -+ char buf[32] = ""; -+ size_t len; -+ sscanf(date, "%31[A-Za-z]", buf); -+ len = strlen(buf); -+ -+ if (weekday == -1) { -+ weekday = check_day(buf, len); -+ if (weekday != -1) { -+ found = 1; -+ } -+ } -+ -+ if (!found && (month == -1)) { -+ month = check_month(buf); -+ if (month != -1) { -+ found = 1; -+ } -+ } -+ -+ if (!found && (tz_offset == -1)) { -+ /* this just must be a time zone string */ -+ tz_offset = check_tzone(buf); -+ if (tz_offset != -1) { -+ found = 1; -+ } -+ } -+ -+ if (!found) { -+ return -1; /* bad string */ -+ } -+ date += len; -+ } -+ else if (HTTP_IS_CTYPE(digit, *date)) { -+ /* a digit */ -+ int val; -+ char *end; -+ if ((seconds == -1) && -+ (3 == sscanf(date, "%02d:%02d:%02d", &hours, &minutes, &seconds))) { -+ /* time stamp! */ -+ date += 8; -+ found = 1; -+ } -+ else { -+ val = (int) strtol(date, &end, 10); -+ -+ if ((tz_offset == -1) && ((end - date) == 4) && (val < 1300) && -+ (indate < date) && ((date[-1] == '+' || date[-1] == '-'))) { -+ /* four digits and a value less than 1300 and it is preceeded with -+ a plus or minus. This is a time zone indication. */ -+ found = 1; -+ tz_offset = (val / 100 * 60 + val % 100) * 60; -+ -+ /* the + and - prefix indicates the local time compared to GMT, -+ this we need ther reversed math to get what we want */ -+ tz_offset = date[-1] == '+' ? -tz_offset : tz_offset; -+ } -+ -+ if (((end - date) == 8) && (year == -1) && (month == -1) && (monthday == -1)) { -+ /* 8 digits, no year, month or day yet. This is YYYYMMDD */ -+ found = 1; -+ year = val / 10000; -+ month = (val % 10000) / 100 - 1; /* month is 0 - 11 */ -+ monthday = val % 100; -+ } -+ -+ if (!found && (dignext == DATE_MDAY) && (monthday == -1)) { -+ if ((val > 0) && (val < 32)) { -+ monthday = val; -+ found = 1; -+ } -+ dignext = DATE_YEAR; -+ } -+ -+ if (!found && (dignext == DATE_YEAR) && (year == -1)) { -+ year = val; -+ found = 1; -+ if (year < 1900) { -+ year += year > 70 ? 1900 : 2000; -+ } -+ if(monthday == -1) { -+ dignext = DATE_MDAY; -+ } -+ } -+ -+ if (!found) { -+ return -1; -+ } -+ -+ date = end; -+ } -+ } -+ -+ part++; -+ } -+ -+ if (-1 == seconds) { -+ seconds = minutes = hours = 0; /* no time, make it zero */ -+ } -+ -+ if ((-1 == monthday) || (-1 == month) || (-1 == year)) { -+ /* lacks vital info, fail */ -+ return -1; -+ } -+ -+ if (sizeof(time_t) < 5) { -+ /* 32 bit time_t can only hold dates to the beginning of 2038 */ -+ if (year > 2037) { -+ return 0x7fffffff; -+ } -+ } -+ -+ tm.tm_sec = seconds; -+ tm.tm_min = minutes; -+ tm.tm_hour = hours; -+ tm.tm_mday = monthday; -+ tm.tm_mon = month; -+ tm.tm_year = year - 1900; -+ tm.tm_wday = 0; -+ tm.tm_yday = 0; -+ tm.tm_isdst = 0; -+ -+ t = mktime(&tm); -+ -+ /* time zone adjust */ -+ if (t != -1) { -+ struct tm *gmt, keeptime2; -+ long delta; -+ time_t t2; -+ -+ if((gmt = php_gmtime_r(&t, &keeptime2))) { -+ tm = *gmt; /* MSVC quirks */ -+ } else { -+ return -1; /* illegal date/time */ -+ } -+ -+ t2 = mktime(&tm); -+ -+ /* Add the time zone diff (between the given timezone and GMT) and the -+ diff between the local time zone and GMT. */ -+ delta = (tz_offset != -1 ? tz_offset : 0) + (t - t2); -+ -+ if((delta > 0) && (t + delta < t)) { -+ return -1; /* time_t overflow */ -+ } -+ -+ t += delta; -+ } -+ -+ return t; -+} -+/* }}} */ -+ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: sw=4 ts=4 fdm=marker -+ * vim<600: sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_deflatestream_object.c -@@ -0,0 +1,312 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_deflatestream_object.c 300299 2010-06-09 06:23:16Z mike $ */ -+ -+#define HTTP_WANT_ZLIB -+#include "php_http.h" -+ -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_ZLIB) -+ -+#include "php_http_api.h" -+#include "php_http_encoding_api.h" -+#include "php_http_exception_object.h" -+#include "php_http_deflatestream_object.h" -+ -+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpDeflateStream, method, 0, req_args) -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpDeflateStream, method, 0) -+#define HTTP_DEFLATE_ME(method, visibility) PHP_ME(HttpDeflateStream, method, HTTP_ARGS(HttpDeflateStream, method), visibility) -+ -+HTTP_BEGIN_ARGS(__construct, 0) -+ HTTP_ARG_VAL(flags, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(factory, 0) -+ HTTP_ARG_VAL(flags, 0) -+ HTTP_ARG_VAL(class_name, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(update, 1) -+ HTTP_ARG_VAL(data, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(flush, 0) -+ HTTP_ARG_VAL(data, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(finish, 0) -+ HTTP_ARG_VAL(data, 0) -+HTTP_END_ARGS; -+ -+#define THIS_CE http_deflatestream_object_ce -+zend_class_entry *http_deflatestream_object_ce; -+zend_function_entry http_deflatestream_object_fe[] = { -+ HTTP_DEFLATE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -+ HTTP_DEFLATE_ME(update, ZEND_ACC_PUBLIC) -+ HTTP_DEFLATE_ME(flush, ZEND_ACC_PUBLIC) -+ HTTP_DEFLATE_ME(finish, ZEND_ACC_PUBLIC) -+ -+ HTTP_DEFLATE_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+ -+ EMPTY_FUNCTION_ENTRY -+}; -+static zend_object_handlers http_deflatestream_object_handlers; -+ -+PHP_MINIT_FUNCTION(http_deflatestream_object) -+{ -+ HTTP_REGISTER_CLASS_EX(HttpDeflateStream, http_deflatestream_object, NULL, 0); -+ http_deflatestream_object_handlers.clone_obj = _http_deflatestream_object_clone_obj; -+ -+#ifndef WONKY -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_GZIP")-1, HTTP_DEFLATE_TYPE_GZIP TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_ZLIB")-1, HTTP_DEFLATE_TYPE_ZLIB TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_RAW")-1, HTTP_DEFLATE_TYPE_RAW TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("LEVEL_DEF")-1, HTTP_DEFLATE_LEVEL_DEF TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("LEVEL_MIN")-1, HTTP_DEFLATE_LEVEL_MIN TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("LEVEL_MAX")-1, HTTP_DEFLATE_LEVEL_MAX TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("STRATEGY_DEF")-1, HTTP_DEFLATE_STRATEGY_DEF TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("STRATEGY_FILT")-1, HTTP_DEFLATE_STRATEGY_FILT TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("STRATEGY_HUFF")-1, HTTP_DEFLATE_STRATEGY_HUFF TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("STRATEGY_RLE")-1, HTTP_DEFLATE_STRATEGY_RLE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("STRATEGY_FIXED")-1, HTTP_DEFLATE_STRATEGY_FIXED TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("FLUSH_NONE")-1, HTTP_ENCODING_STREAM_FLUSH_NONE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("FLUSH_SYNC")-1, HTTP_ENCODING_STREAM_FLUSH_SYNC TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("FLUSH_FULL")-1, HTTP_ENCODING_STREAM_FLUSH_FULL TSRMLS_CC); -+#endif -+ -+ return SUCCESS; -+} -+ -+zend_object_value _http_deflatestream_object_new(zend_class_entry *ce TSRMLS_DC) -+{ -+ return http_deflatestream_object_new_ex(ce, NULL, NULL); -+} -+ -+zend_object_value _http_deflatestream_object_new_ex(zend_class_entry *ce, http_encoding_stream *s, http_deflatestream_object **ptr TSRMLS_DC) -+{ -+ zend_object_value ov; -+ http_deflatestream_object *o; -+ -+ o = ecalloc(1, sizeof(http_deflatestream_object)); -+ o->zo.ce = ce; -+ -+ if (ptr) { -+ *ptr = o; -+ } -+ -+ if (s) { -+ o->stream = s; -+ } -+ -+ ALLOC_HASHTABLE(OBJ_PROP(o)); -+ zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ -+ ov.handle = putObject(http_deflatestream_object, o); -+ ov.handlers = &http_deflatestream_object_handlers; -+ -+ return ov; -+} -+ -+zend_object_value _http_deflatestream_object_clone_obj(zval *this_ptr TSRMLS_DC) -+{ -+ http_encoding_stream *s; -+ zend_object_value new_ov; -+ http_deflatestream_object *new_obj = NULL; -+ getObject(http_deflatestream_object, old_obj); -+ -+ s = ecalloc(1, sizeof(http_encoding_stream)); -+ s->flags = old_obj->stream->flags; -+ deflateCopy(&s->stream, &old_obj->stream->stream); -+ s->stream.opaque = phpstr_dup(s->stream.opaque); -+ -+ new_ov = http_deflatestream_object_new_ex(old_obj->zo.ce, s, &new_obj); -+ zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); -+ -+ return new_ov; -+} -+ -+void _http_deflatestream_object_free(zend_object *object TSRMLS_DC) -+{ -+ http_deflatestream_object *o = (http_deflatestream_object *) object; -+ -+ if (o->stream) { -+ http_encoding_deflate_stream_free(&o->stream); -+ } -+ freeObject(o); -+} -+ -+/* {{{ proto void HttpDeflateStream::__construct([int flags = 0]) -+ Creates a new HttpDeflateStream object instance. */ -+PHP_METHOD(HttpDeflateStream, __construct) -+{ -+ long flags = 0; -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags)) { -+ getObject(http_deflatestream_object, obj); -+ -+ if (!obj->stream) { -+ obj->stream = http_encoding_deflate_stream_init(NULL, flags & 0x0fffffff); -+ } else { -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "HttpDeflateStream cannot be initialized twice"); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto HttpDeflateStream HttpDeflateStream::factory([int flags[, string class = "HttpDeflateStream"]]) -+ Creates a new HttpDeflateStream object instance. */ -+PHP_METHOD(HttpDeflateStream, factory) -+{ -+ long flags = 0; -+ char *cn = NULL; -+ int cl = 0; -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ls", &flags, &cn, &cl)) { -+ zend_object_value ov; -+ http_encoding_stream *s = http_encoding_deflate_stream_init(NULL, flags & 0x0fffffff); -+ -+ if (SUCCESS == http_object_new(&ov, cn, cl, _http_deflatestream_object_new_ex, http_deflatestream_object_ce, s, NULL)) { -+ RETVAL_OBJVAL(ov, 0); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto string HttpDeflateStream::update(string data) -+ Passes more data through the deflate stream. */ -+PHP_METHOD(HttpDeflateStream, update) -+{ -+ int data_len; -+ size_t encoded_len = 0; -+ char *data, *encoded = NULL; -+ getObject(http_deflatestream_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (!obj->stream && !(obj->stream = http_encoding_deflate_stream_init(NULL, 0))) { -+ RETURN_FALSE; -+ } -+ -+ if (SUCCESS == http_encoding_deflate_stream_update(obj->stream, data, data_len, &encoded, &encoded_len)) { -+ RETURN_STRINGL(encoded, encoded_len, 0); -+ } else { -+ RETURN_FALSE; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpDeflateStream::flush([string data]) -+ Flushes the deflate stream. */ -+PHP_METHOD(HttpDeflateStream, flush) -+{ -+ int data_len = 0; -+ size_t updated_len = 0, encoded_len = 0; -+ char *updated = NULL, *encoded = NULL, *data = NULL; -+ getObject(http_deflatestream_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (!obj->stream && !(obj->stream = http_encoding_deflate_stream_init(NULL, 0))) { -+ RETURN_FALSE; -+ } -+ -+ if (data_len) { -+ if (SUCCESS != http_encoding_deflate_stream_update(obj->stream, data, data_len, &updated, &updated_len)) { -+ RETURN_FALSE; -+ } -+ } -+ -+ if (SUCCESS == http_encoding_deflate_stream_flush(obj->stream, &encoded, &encoded_len)) { -+ if (updated_len) { -+ updated = erealloc(updated, updated_len + encoded_len + 1); -+ updated[updated_len + encoded_len] = '\0'; -+ memcpy(updated + updated_len, encoded, encoded_len); -+ STR_FREE(encoded); -+ updated_len += encoded_len; -+ RETURN_STRINGL(updated, updated_len, 0); -+ } else if (encoded) { -+ RETVAL_STRINGL(encoded, encoded_len, 0); -+ } else { -+ RETVAL_NULL(); -+ } -+ } else { -+ RETVAL_FALSE; -+ } -+ STR_FREE(updated); -+} -+/* }}} */ -+ -+/* {{{ proto string HttpDeflateStream::finish([string data]) -+ Finalizes the deflate stream. The deflate stream can be reused after finalizing. */ -+PHP_METHOD(HttpDeflateStream, finish) -+{ -+ int data_len = 0; -+ size_t updated_len = 0, encoded_len = 0; -+ char *updated = NULL, *encoded = NULL, *data = NULL; -+ getObject(http_deflatestream_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (!obj->stream && !(obj->stream = http_encoding_deflate_stream_init(NULL, 0))) { -+ RETURN_FALSE; -+ } -+ -+ if (data_len) { -+ if (SUCCESS != http_encoding_deflate_stream_update(obj->stream, data, data_len, &updated, &updated_len)) { -+ RETURN_FALSE; -+ } -+ } -+ -+ if (SUCCESS == http_encoding_deflate_stream_finish(obj->stream, &encoded, &encoded_len)) { -+ if (updated_len) { -+ updated = erealloc(updated, updated_len + encoded_len + 1); -+ updated[updated_len + encoded_len] = '\0'; -+ memcpy(updated + updated_len, encoded, encoded_len); -+ STR_FREE(encoded); -+ updated_len += encoded_len; -+ RETVAL_STRINGL(updated, updated_len, 0); -+ } else { -+ STR_FREE(updated); -+ RETVAL_STRINGL(encoded, encoded_len, 0); -+ } -+ } else { -+ STR_FREE(updated); -+ RETVAL_FALSE; -+ } -+ -+ http_encoding_deflate_stream_dtor(obj->stream); -+ http_encoding_deflate_stream_init(obj->stream, obj->stream->flags); -+} -+/* }}} */ -+ -+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_ZLIB*/ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_encoding_api.c -@@ -0,0 +1,780 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_encoding_api.c 305668 2010-11-22 20:17:41Z iliaa $ */ -+ -+#define HTTP_WANT_ZLIB -+#include "php_http.h" -+ -+#include "php_http_api.h" -+#include "php_http_encoding_api.h" -+#include "php_http_send_api.h" -+#include "php_http_headers_api.h" -+ -+/* {{{ */ -+#ifdef HTTP_HAVE_ZLIB -+PHP_MINIT_FUNCTION(http_encoding) -+{ -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_LEVEL_DEF", HTTP_DEFLATE_LEVEL_DEF); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_LEVEL_MIN", HTTP_DEFLATE_LEVEL_MIN); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_LEVEL_MAX", HTTP_DEFLATE_LEVEL_MAX); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_TYPE_ZLIB", HTTP_DEFLATE_TYPE_ZLIB); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_TYPE_GZIP", HTTP_DEFLATE_TYPE_GZIP); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_TYPE_RAW", HTTP_DEFLATE_TYPE_RAW); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_DEF", HTTP_DEFLATE_STRATEGY_DEF); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_FILT", HTTP_DEFLATE_STRATEGY_FILT); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_HUFF", HTTP_DEFLATE_STRATEGY_HUFF); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_RLE", HTTP_DEFLATE_STRATEGY_RLE); -+ HTTP_LONG_CONSTANT("HTTP_DEFLATE_STRATEGY_FIXED", HTTP_DEFLATE_STRATEGY_FIXED); -+ -+ HTTP_LONG_CONSTANT("HTTP_ENCODING_STREAM_FLUSH_NONE", HTTP_ENCODING_STREAM_FLUSH_NONE); -+ HTTP_LONG_CONSTANT("HTTP_ENCODING_STREAM_FLUSH_SYNC", HTTP_ENCODING_STREAM_FLUSH_SYNC); -+ HTTP_LONG_CONSTANT("HTTP_ENCODING_STREAM_FLUSH_FULL", HTTP_ENCODING_STREAM_FLUSH_FULL); -+ -+ return SUCCESS; -+} -+ -+PHP_RINIT_FUNCTION(http_encoding) -+{ -+ if (HTTP_G->send.inflate.start_auto) { -+ php_ob_set_internal_handler(_http_ob_inflatehandler, HTTP_INFLATE_BUFFER_SIZE, "http inflate", 0 TSRMLS_CC); -+ } -+ if (HTTP_G->send.deflate.start_auto) { -+ php_ob_set_internal_handler(_http_ob_deflatehandler, HTTP_DEFLATE_BUFFER_SIZE, "http deflate", 0 TSRMLS_CC); -+ } -+ return SUCCESS; -+} -+ -+PHP_RSHUTDOWN_FUNCTION(http_encoding) -+{ -+ if (HTTP_G->send.deflate.stream) { -+ http_encoding_deflate_stream_free((http_encoding_stream **) &HTTP_G->send.deflate.stream); -+ } -+ if (HTTP_G->send.inflate.stream) { -+ http_encoding_inflate_stream_free((http_encoding_stream **) &HTTP_G->send.inflate.stream); -+ } -+ return SUCCESS; -+} -+#endif -+/* }}} */ -+ -+/* {{{ eol_match(char **, int *) */ -+static inline int eol_match(char **line, int *eol_len) -+{ -+ char *ptr = *line; -+ -+ while (' ' == *ptr) ++ptr; -+ -+ if (ptr == http_locate_eol(*line, eol_len)) { -+ *line = ptr; -+ return 1; -+ } else { -+ return 0; -+ } -+} -+/* }}} */ -+ -+/* {{{ char *http_encoding_dechunk(char *, size_t, char **, size_t *) */ -+PHP_HTTP_API const char *_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC) -+{ -+ int eol_len = 0; -+ char *n_ptr = NULL; -+ const char *e_ptr = encoded; -+ -+ *decoded_len = 0; -+ *decoded = ecalloc(1, encoded_len); -+ -+ while ((encoded + encoded_len - e_ptr) > 0) { -+ ulong chunk_len = 0, rest; -+ -+ chunk_len = strtoul(e_ptr, &n_ptr, 16); -+ -+ /* we could not read in chunk size */ -+ if (n_ptr == e_ptr) { -+ /* -+ * if this is the first turn and there doesn't seem to be a chunk -+ * size at the begining of the body, do not fail on apparently -+ * not encoded data and return a copy -+ */ -+ if (e_ptr == encoded) { -+ http_error(HE_NOTICE, HTTP_E_ENCODING, "Data does not seem to be chunked encoded"); -+ memcpy(*decoded, encoded, encoded_len); -+ *decoded_len = encoded_len; -+ return encoded + encoded_len; -+ } else { -+ efree(*decoded); -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Expected chunk size at pos %tu of %zu but got trash", n_ptr - encoded, encoded_len); -+ return NULL; -+ } -+ } -+ -+ /* reached the end */ -+ if (!chunk_len) { -+ /* move over '0' chunked encoding terminator */ -+ while (*e_ptr == '0') ++e_ptr; -+ break; -+ } -+ -+ /* there should be CRLF after the chunk size, but we'll ignore SP+ too */ -+ if (*n_ptr && !eol_match(&n_ptr, &eol_len)) { -+ if (eol_len == 2) { -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Expected CRLF at pos %tu of %zu but got 0x%02X 0x%02X", n_ptr - encoded, encoded_len, *n_ptr, *(n_ptr + 1)); -+ } else { -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Expected LF at pos %tu of %zu but got 0x%02X", n_ptr - encoded, encoded_len, *n_ptr); -+ } -+ } -+ n_ptr += eol_len; -+ -+ /* chunk size pretends more data than we actually got, so it's probably a truncated message */ -+ if (chunk_len > (rest = encoded + encoded_len - n_ptr)) { -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Truncated message: chunk size %lu exceeds remaining data size %lu at pos %tu of %zu", chunk_len, rest, n_ptr - encoded, encoded_len); -+ chunk_len = rest; -+ } -+ -+ /* copy the chunk */ -+ memcpy(*decoded + *decoded_len, n_ptr, chunk_len); -+ *decoded_len += chunk_len; -+ -+ if (chunk_len == rest) { -+ e_ptr = n_ptr + chunk_len; -+ break; -+ } else { -+ /* advance to next chunk */ -+ e_ptr = n_ptr + chunk_len + eol_len; -+ } -+ } -+ -+ return e_ptr; -+} -+/* }}} */ -+ -+/* {{{ int http_encoding_response_start(size_t) */ -+PHP_HTTP_API int _http_encoding_response_start(size_t content_length, zend_bool ignore_http_ohandler TSRMLS_DC) -+{ -+ int response = HTTP_G->send.deflate.response; -+ int ohandler = php_ob_handler_used("ob_gzhandler" TSRMLS_CC) || php_ob_handler_used("zlib output compression" TSRMLS_CC); -+ -+ if (!ohandler && !ignore_http_ohandler) { -+ ohandler = php_ob_handler_used("ob_deflatehandler" TSRMLS_CC) || php_ob_handler_used("http deflate" TSRMLS_CC); -+ } -+ -+ if (response && !ohandler) { -+#ifdef HTTP_HAVE_ZLIB -+ HashTable *selected; -+ zval zsupported; -+ -+ HTTP_G->send.deflate.encoding = 0; -+ -+ INIT_PZVAL(&zsupported); -+ array_init(&zsupported); -+ add_next_index_stringl(&zsupported, "gzip", lenof("gzip"), 1); -+ add_next_index_stringl(&zsupported, "x-gzip", lenof("x-gzip"), 1); -+ add_next_index_stringl(&zsupported, "deflate", lenof("deflate"), 1); -+ -+ if ((selected = http_negotiate_encoding(&zsupported))) { -+ STATUS hs = FAILURE; -+ char *encoding = NULL; -+ ulong idx; -+ -+ if (HASH_KEY_IS_STRING == zend_hash_get_current_key(selected, &encoding, &idx, 0) && encoding) { -+ if (!strcmp(encoding, "gzip") || !strcmp(encoding, "x-gzip")) { -+ if (SUCCESS == (hs = http_send_header_string("Content-Encoding: gzip"))) { -+ HTTP_G->send.deflate.encoding = HTTP_ENCODING_GZIP; -+ } -+ } else if (!strcmp(encoding, "deflate")) { -+ if (SUCCESS == (hs = http_send_header_string("Content-Encoding: deflate"))) { -+ HTTP_G->send.deflate.encoding = HTTP_ENCODING_DEFLATE; -+ } -+ } -+ if (SUCCESS == hs) { -+ http_send_header_string("Vary: Accept-Encoding"); -+ } -+ } -+ -+ zend_hash_destroy(selected); -+ FREE_HASHTABLE(selected); -+ } -+ -+ zval_dtor(&zsupported); -+#else -+ HTTP_G->send.deflate.encoding = 0; -+ php_start_ob_buffer_named("ob_gzhandler", 0, 0 TSRMLS_CC); -+#endif /* HTTP_HAVE_ZLIB */ -+ } else if (content_length && !ohandler) { -+ /* emit a content-length header */ -+ phpstr header; -+ -+ phpstr_init(&header); -+ phpstr_appendf(&header, "Content-Length: %zu", content_length); -+ phpstr_fix(&header); -+ http_send_header_string_ex(PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1); -+ phpstr_dtor(&header); -+ } else { -+ HTTP_G->send.deflate.encoding = 0; -+ } -+ -+ return HTTP_G->send.deflate.encoding; -+} -+/* }}} */ -+ -+#ifdef HTTP_HAVE_ZLIB -+ -+/* {{{ inline int http_inflate_rounds */ -+static inline int http_inflate_rounds(z_stream *Z, int flush, char **buf, size_t *len) -+{ -+ int status = 0, round = 0; -+ phpstr buffer; -+ -+ *buf = NULL; -+ *len = 0; -+ -+ phpstr_init_ex(&buffer, Z->avail_in, PHPSTR_INIT_PREALLOC); -+ -+ do { -+ if (PHPSTR_NOMEM == phpstr_resize_ex(&buffer, buffer.size, 0, 1)) { -+ status = Z_MEM_ERROR; -+ } else { -+ Z->avail_out = buffer.free; -+ Z->next_out = (Bytef *) buffer.data + buffer.used; -+#if 0 -+ fprintf(stderr, "\n%3d: %3d PRIOR: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out); -+#endif -+ status = inflate(Z, flush); -+ -+ buffer.used += buffer.free - Z->avail_out; -+ buffer.free = Z->avail_out; -+#if 0 -+ fprintf(stderr, "%3d: %3d AFTER: size=%7lu,\tfree=%7lu,\tused=%7lu,\tavail_in=%7lu,\tavail_out=%7lu\n", round, status, buffer.size, buffer.free, buffer.used, Z->avail_in, Z->avail_out); -+#endif -+ HTTP_INFLATE_BUFFER_SIZE_ALIGN(buffer.size); -+ } -+ } while ((Z_BUF_ERROR == status || (Z_OK == status && Z->avail_in)) && ++round < HTTP_INFLATE_ROUNDS); -+ -+ if (status == Z_OK || status == Z_STREAM_END) { -+ phpstr_shrink(&buffer); -+ phpstr_fix(&buffer); -+ *buf = buffer.data; -+ *len = buffer.used; -+ } else { -+ phpstr_dtor(&buffer); -+ } -+ -+ return status; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_encoding_deflate(int, char *, size_t, char **, size_t *) */ -+PHP_HTTP_API STATUS _http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ int status, level, wbits, strategy; -+ z_stream Z; -+ -+ HTTP_DEFLATE_LEVEL_SET(flags, level); -+ HTTP_DEFLATE_WBITS_SET(flags, wbits); -+ HTTP_DEFLATE_STRATEGY_SET(flags, strategy); -+ -+ memset(&Z, 0, sizeof(z_stream)); -+ *encoded = NULL; -+ *encoded_len = 0; -+ -+ status = deflateInit2(&Z, level, Z_DEFLATED, wbits, MAX_MEM_LEVEL, strategy); -+ if (Z_OK == status) { -+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE_GUESS(data_len); -+ *encoded = emalloc_rel(*encoded_len); -+ -+ Z.next_in = (Bytef *) data; -+ Z.next_out = (Bytef *) *encoded; -+ Z.avail_in = data_len; -+ Z.avail_out = *encoded_len; -+ -+ status = deflate(&Z, Z_FINISH); -+ deflateEnd(&Z); -+ -+ if (Z_STREAM_END == status) { -+ /* size buffer down to actual length */ -+ *encoded = erealloc_rel(*encoded, Z.total_out + 1); -+ (*encoded)[*encoded_len = Z.total_out] = '\0'; -+ return SUCCESS; -+ } else { -+ STR_SET(*encoded, NULL); -+ *encoded_len = 0; -+ } -+ } -+ -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not deflate data: %s", zError(status)); -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_encoding_inflate(char *, size_t, char **, size_t) */ -+PHP_HTTP_API STATUS _http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ z_stream Z; -+ int status, wbits = HTTP_WINDOW_BITS_ANY; -+ -+ memset(&Z, 0, sizeof(z_stream)); -+ -+retry_raw_inflate: -+ status = inflateInit2(&Z, wbits); -+ if (Z_OK == status) { -+ Z.next_in = (Bytef *) data; -+ Z.avail_in = data_len; -+ -+ switch (status = http_inflate_rounds(&Z, Z_NO_FLUSH, decoded, decoded_len)) { -+ case Z_STREAM_END: -+ inflateEnd(&Z); -+ return SUCCESS; -+ -+ case Z_OK: -+ status = Z_DATA_ERROR; -+ break; -+ -+ case Z_DATA_ERROR: -+ /* raw deflated data? */ -+ if (HTTP_WINDOW_BITS_ANY == wbits) { -+ inflateEnd(&Z); -+ wbits = HTTP_WINDOW_BITS_RAW; -+ goto retry_raw_inflate; -+ } -+ } -+ inflateEnd(&Z); -+ } -+ -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not inflate data: %s", zError(status)); -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ http_encoding_stream *_http_encoding_deflate_stream_init(http_encoding_stream *, int) */ -+PHP_HTTP_API http_encoding_stream *_http_encoding_deflate_stream_init(http_encoding_stream *s, int flags ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ int status, level, wbits, strategy, free_stream; -+ -+ if ((free_stream = !s)) { -+ s = pemalloc_rel(sizeof(http_encoding_stream), (flags & HTTP_ENCODING_STREAM_PERSISTENT)); -+ } -+ memset(s, 0, sizeof(http_encoding_stream)); -+ s->flags = flags; -+ -+ HTTP_DEFLATE_LEVEL_SET(flags, level); -+ HTTP_DEFLATE_WBITS_SET(flags, wbits); -+ HTTP_DEFLATE_STRATEGY_SET(flags, strategy); -+ -+ if (Z_OK == (status = deflateInit2(&s->stream, level, Z_DEFLATED, wbits, MAX_MEM_LEVEL, strategy))) { -+ int p = (flags & HTTP_ENCODING_STREAM_PERSISTENT) ? PHPSTR_INIT_PERSISTENT:0; -+ -+ if ((s->stream.opaque = phpstr_init_ex(NULL, HTTP_DEFLATE_BUFFER_SIZE, p))) { -+ return s; -+ } -+ deflateEnd(&s->stream); -+ status = Z_MEM_ERROR; -+ } -+ -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to initialize deflate encoding stream: %s", zError(status)); -+ if (free_stream) { -+ efree(s); -+ } -+ return NULL; -+} -+/* }}} */ -+ -+/* {{{ http_encoding_stream *http_encoding_inflate_stream_init(http_encoding_stream *, int) */ -+PHP_HTTP_API http_encoding_stream *_http_encoding_inflate_stream_init(http_encoding_stream *s, int flags ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ int status, wbits, free_stream; -+ -+ if ((free_stream = !s)) { -+ s = pemalloc_rel(sizeof(http_encoding_stream), (flags & HTTP_ENCODING_STREAM_PERSISTENT)); -+ } -+ memset(s, 0, sizeof(http_encoding_stream)); -+ s->flags = flags; -+ -+ HTTP_INFLATE_WBITS_SET(flags, wbits); -+ -+ if (Z_OK == (status = inflateInit2(&s->stream, wbits))) { -+ int p = (flags & HTTP_ENCODING_STREAM_PERSISTENT) ? PHPSTR_INIT_PERSISTENT:0; -+ -+ if ((s->stream.opaque = phpstr_init_ex(NULL, HTTP_DEFLATE_BUFFER_SIZE, p))) { -+ return s; -+ } -+ inflateEnd(&s->stream); -+ status = Z_MEM_ERROR; -+ } -+ -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to initialize inflate stream: %s", zError(status)); -+ if (free_stream) { -+ efree(s); -+ } -+ return NULL; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_encoding_deflate_stream_update(http_encoding_stream *, char *, size_t, char **, size_t *) */ -+PHP_HTTP_API STATUS _http_encoding_deflate_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ int status; -+ -+ /* append input to our buffer */ -+ phpstr_append(PHPSTR(s->stream.opaque), data, data_len); -+ -+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque); -+ s->stream.avail_in = PHPSTR_LEN(s->stream.opaque); -+ -+ /* deflate */ -+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE_GUESS(data_len); -+ *encoded = emalloc_rel(*encoded_len); -+ s->stream.avail_out = *encoded_len; -+ s->stream.next_out = (Bytef *) *encoded; -+ -+ switch (status = deflate(&s->stream, HTTP_ENCODING_STREAM_FLUSH_FLAG(s->flags))) { -+ case Z_OK: -+ case Z_STREAM_END: -+ /* cut processed chunk off the buffer */ -+ if (s->stream.avail_in) { -+ phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in); -+ } else { -+ phpstr_reset(PHPSTR(s->stream.opaque)); -+ } -+ -+ /* size buffer down to actual size */ -+ *encoded_len -= s->stream.avail_out; -+ *encoded = erealloc_rel(*encoded, *encoded_len + 1); -+ (*encoded)[*encoded_len] = '\0'; -+ return SUCCESS; -+ } -+ -+ STR_SET(*encoded, NULL); -+ *encoded_len = 0; -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to update deflate stream: %s", zError(status)); -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_encoding_inflate_stream_update(http_encoding_stream *, char *, size_t, char **, size_t *) */ -+PHP_HTTP_API STATUS _http_encoding_inflate_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ int status; -+ -+ /* append input to buffer */ -+ phpstr_append(PHPSTR(s->stream.opaque), data, data_len); -+ -+retry_raw_inflate: -+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque); -+ s->stream.avail_in = PHPSTR_LEN(s->stream.opaque); -+ -+ switch (status = http_inflate_rounds(&s->stream, HTTP_ENCODING_STREAM_FLUSH_FLAG(s->flags), decoded, decoded_len)) { -+ case Z_OK: -+ case Z_STREAM_END: -+ /* cut off */ -+ if (s->stream.avail_in) { -+ phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in); -+ } else { -+ phpstr_reset(PHPSTR(s->stream.opaque)); -+ } -+ return SUCCESS; -+ -+ case Z_DATA_ERROR: -+ /* raw deflated data ? */ -+ if (!(s->flags & HTTP_INFLATE_TYPE_RAW) && !s->stream.total_out) { -+ inflateEnd(&s->stream); -+ s->flags |= HTTP_INFLATE_TYPE_RAW; -+ inflateInit2(&s->stream, HTTP_WINDOW_BITS_RAW); -+ goto retry_raw_inflate; -+ } -+ } -+ -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to update inflate stream: %s", zError(status)); -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_encoding_deflate_stream_flush(http_encoding_stream *, char **, size_t *) */ -+PHP_HTTP_API STATUS _http_encoding_deflate_stream_flush(http_encoding_stream *s, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ int status; -+ -+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE; -+ *encoded = emalloc_rel(*encoded_len); -+ -+ s->stream.avail_in = 0; -+ s->stream.next_in = NULL; -+ s->stream.avail_out = *encoded_len; -+ s->stream.next_out = (Bytef *) *encoded; -+ -+ switch (status = deflate(&s->stream, Z_FULL_FLUSH)) { -+ case Z_OK: -+ case Z_STREAM_END: -+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE - s->stream.avail_out; -+ *encoded = erealloc_rel(*encoded, *encoded_len + 1); -+ (*encoded)[*encoded_len] = '\0'; -+ return SUCCESS; -+ } -+ -+ STR_SET(*encoded, NULL); -+ *encoded_len = 0; -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to flush deflate stream: %s", zError(status)); -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_encoding_inflate_straem_flush(http_encoding_stream *, char **, size_t *) */ -+PHP_HTTP_API STATUS _http_encoding_inflate_stream_flush(http_encoding_stream *s, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ /* noop */ -+ *decoded = estrndup("", *decoded_len = 0); -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_encoding_deflate_stream_finish(http_encoding_stream *, char **, size_t *) */ -+PHP_HTTP_API STATUS _http_encoding_deflate_stream_finish(http_encoding_stream *s, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ int status; -+ -+ *encoded_len = HTTP_DEFLATE_BUFFER_SIZE; -+ *encoded = emalloc_rel(*encoded_len); -+ -+ /* deflate remaining input */ -+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque); -+ s->stream.avail_in = PHPSTR_LEN(s->stream.opaque); -+ -+ s->stream.avail_out = *encoded_len; -+ s->stream.next_out = (Bytef *) *encoded; -+ -+ do { -+ status = deflate(&s->stream, Z_FINISH); -+ } while (Z_OK == status); -+ -+ if (Z_STREAM_END == status) { -+ /* cut processed intp off */ -+ phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in); -+ -+ /* size down */ -+ *encoded_len -= s->stream.avail_out; -+ *encoded = erealloc_rel(*encoded, *encoded_len + 1); -+ (*encoded)[*encoded_len] = '\0'; -+ return SUCCESS; -+ } -+ -+ STR_SET(*encoded, NULL); -+ *encoded_len = 0; -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to finish deflate stream: %s", zError(status)); -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_encoding_inflate_stream_finish(http_encoding_stream *, char **, size_t *) */ -+PHP_HTTP_API STATUS _http_encoding_inflate_stream_finish(http_encoding_stream *s, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ int status; -+ -+ if (!PHPSTR_LEN(s->stream.opaque)) { -+ *decoded = NULL; -+ *decoded_len = 0; -+ return SUCCESS; -+ } -+ -+ *decoded_len = (PHPSTR_LEN(s->stream.opaque) + 1) * HTTP_INFLATE_ROUNDS; -+ *decoded = emalloc_rel(*decoded_len); -+ -+ /* inflate remaining input */ -+ s->stream.next_in = (Bytef *) PHPSTR_VAL(s->stream.opaque); -+ s->stream.avail_in = PHPSTR_LEN(s->stream.opaque); -+ -+ s->stream.avail_out = *decoded_len; -+ s->stream.next_out = (Bytef *) *decoded; -+ -+ if (Z_STREAM_END == (status = inflate(&s->stream, Z_FINISH))) { -+ /* cut processed input off */ -+ phpstr_cut(PHPSTR(s->stream.opaque), 0, PHPSTR_LEN(s->stream.opaque) - s->stream.avail_in); -+ -+ /* size down */ -+ *decoded_len -= s->stream.avail_out; -+ *decoded = erealloc_rel(*decoded, *decoded_len + 1); -+ (*decoded)[*decoded_len] = '\0'; -+ return SUCCESS; -+ } -+ -+ STR_SET(*decoded, NULL); -+ *decoded_len = 0; -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Failed to finish inflate stream: %s", zError(status)); -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ void http_encoding_deflate_stream_dtor(http_encoding_stream *) */ -+PHP_HTTP_API void _http_encoding_deflate_stream_dtor(http_encoding_stream *s TSRMLS_DC) -+{ -+ if (s) { -+ if (s->stream.opaque) { -+ phpstr_free((phpstr **) &s->stream.opaque); -+ } -+ deflateEnd(&s->stream); -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_encoding_inflate_stream_dtor(http_encoding_stream *) */ -+PHP_HTTP_API void _http_encoding_inflate_stream_dtor(http_encoding_stream *s TSRMLS_DC) -+{ -+ if (s) { -+ if (s->stream.opaque) { -+ phpstr_free((phpstr **) &s->stream.opaque); -+ } -+ inflateEnd(&s->stream); -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_encoding_deflate_stream_free(http_encoding_stream **) */ -+PHP_HTTP_API void _http_encoding_deflate_stream_free(http_encoding_stream **s TSRMLS_DC) -+{ -+ if (s) { -+ http_encoding_deflate_stream_dtor(*s); -+ if (*s) { -+ pefree(*s, (*s)->flags & HTTP_ENCODING_STREAM_PERSISTENT); -+ } -+ *s = NULL; -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_encoding_inflate_stream_free(http_encoding_stream **) */ -+PHP_HTTP_API void _http_encoding_inflate_stream_free(http_encoding_stream **s TSRMLS_DC) -+{ -+ if (s) { -+ http_encoding_inflate_stream_dtor(*s); -+ if (*s) { -+ pefree(*s, (*s)->flags & HTTP_ENCODING_STREAM_PERSISTENT); -+ } -+ *s = NULL; -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_ob_deflatehandler(char *, uint, char **, uint *, int) */ -+void _http_ob_deflatehandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) -+{ -+ int encoding; -+ -+ *handled_output = NULL; -+ *handled_output_len = 0; -+ -+ if (mode & PHP_OUTPUT_HANDLER_START) { -+ int flags; -+ -+ if (HTTP_G->send.deflate.stream) { -+ zend_error(E_ERROR, "ob_deflatehandler() can only be used once"); -+ return; -+ } -+ -+ HTTP_G->send.deflate.response = 1; -+ encoding = http_encoding_response_start(0, 1); -+ HTTP_G->send.deflate.response = 0; -+ -+ switch (encoding) { -+ case HTTP_ENCODING_GZIP: -+ flags = HTTP_DEFLATE_TYPE_GZIP; -+ break; -+ -+ case HTTP_ENCODING_DEFLATE: -+ flags = HTTP_DEFLATE_TYPE_ZLIB; -+ break; -+ -+ default: -+ goto deflate_passthru_plain; -+ } -+ -+ flags |= (HTTP_G->send.deflate.start_flags &~ 0xf0); -+ HTTP_G->send.deflate.stream = http_encoding_deflate_stream_init(NULL, flags); -+ } -+ -+ if (HTTP_G->send.deflate.stream) { -+ if (output_len) { -+ size_t tmp_len; -+ -+ http_encoding_deflate_stream_update((http_encoding_stream *) HTTP_G->send.deflate.stream, output, output_len, handled_output, &tmp_len); -+ *handled_output_len = tmp_len; -+ } -+ -+ if (mode & PHP_OUTPUT_HANDLER_END) { -+ char *remaining = NULL; -+ size_t remaining_len = 0; -+ -+ http_encoding_deflate_stream_finish((http_encoding_stream *) HTTP_G->send.deflate.stream, &remaining, &remaining_len); -+ http_encoding_deflate_stream_free((http_encoding_stream **) &HTTP_G->send.deflate.stream); -+ if (remaining) { -+ *handled_output = erealloc(*handled_output, *handled_output_len + remaining_len + 1); -+ memcpy(*handled_output + *handled_output_len, remaining, remaining_len); -+ (*handled_output)[*handled_output_len += remaining_len] = '\0'; -+ efree(remaining); -+ } -+ } -+ } else { -+deflate_passthru_plain: -+ *handled_output = estrndup(output, *handled_output_len = output_len); -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_ob_inflatehandler(char *, uint, char **, uint *, int) */ -+void _http_ob_inflatehandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC) -+{ -+ *handled_output = NULL; -+ *handled_output_len = 0; -+ -+ if (mode & PHP_OUTPUT_HANDLER_START) { -+ if (HTTP_G->send.inflate.stream) { -+ zend_error(E_ERROR, "ob_inflatehandler() can only be used once"); -+ return; -+ } -+ HTTP_G->send.inflate.stream = http_encoding_inflate_stream_init(NULL, (HTTP_G->send.inflate.start_flags &~ 0xf0)); -+ } -+ -+ if (HTTP_G->send.inflate.stream) { -+ if (output_len) { -+ size_t tmp_len; -+ -+ http_encoding_inflate_stream_update((http_encoding_stream *) HTTP_G->send.inflate.stream, output, output_len, handled_output, &tmp_len); -+ *handled_output_len = tmp_len; -+ } -+ -+ if (mode & PHP_OUTPUT_HANDLER_END) { -+ char *remaining = NULL; -+ size_t remaining_len = 0; -+ -+ http_encoding_inflate_stream_finish((http_encoding_stream *) HTTP_G->send.inflate.stream, &remaining, &remaining_len); -+ http_encoding_inflate_stream_free((http_encoding_stream **) &HTTP_G->send.inflate.stream); -+ if (remaining) { -+ *handled_output = erealloc(*handled_output, *handled_output_len + remaining_len + 1); -+ memcpy(*handled_output + *handled_output_len, remaining, remaining_len); -+ (*handled_output)[*handled_output_len += remaining_len] = '\0'; -+ efree(remaining); -+ } -+ } -+ } else { -+ *handled_output = estrndup(output, *handled_output_len = output_len); -+ } -+} -+/* }}} */ -+ -+#endif /* HTTP_HAVE_ZLIB */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_exception_object.c -@@ -0,0 +1,186 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_exception_object.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#include "php_http.h" -+ -+#ifdef ZEND_ENGINE_2 -+ -+#ifndef HTTP_DBG_EXCEPTIONS -+# define HTTP_DBG_EXCEPTIONS 0 -+#endif -+ -+#include "zend_interfaces.h" -+#include "zend_exceptions.h" -+#include "php_http_exception_object.h" -+ -+zend_class_entry *http_exception_object_ce; -+zend_class_entry *HTTP_EX_CE(runtime); -+zend_class_entry *HTTP_EX_CE(header); -+zend_class_entry *HTTP_EX_CE(malformed_headers); -+zend_class_entry *HTTP_EX_CE(request_method); -+zend_class_entry *HTTP_EX_CE(message_type); -+zend_class_entry *HTTP_EX_CE(invalid_param); -+zend_class_entry *HTTP_EX_CE(encoding); -+zend_class_entry *HTTP_EX_CE(request); -+zend_class_entry *HTTP_EX_CE(request_pool); -+zend_class_entry *HTTP_EX_CE(socket); -+zend_class_entry *HTTP_EX_CE(response); -+zend_class_entry *HTTP_EX_CE(url); -+zend_class_entry *HTTP_EX_CE(querystring); -+ -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpException, method, 0) -+#define HTTP_EXCEPTION_ME(method, visibility) PHP_ME(HttpException, method, HTTP_ARGS(HttpException, method), visibility) -+ -+HTTP_EMPTY_ARGS(__toString); -+ -+zend_function_entry http_exception_object_fe[] = { -+ HTTP_EXCEPTION_ME(__toString, ZEND_ACC_PUBLIC) -+ -+ EMPTY_FUNCTION_ENTRY -+}; -+ -+#if HTTP_DBG_EXCEPTIONS -+static void http_exception_hook(zval *ex TSRMLS_DC) -+{ -+ if (ex) { -+ zval *m = zend_read_property(Z_OBJCE_P(ex), ex, "message", lenof("message"), 0 TSRMLS_CC); -+ fprintf(stderr, "*** Threw exception '%s'\n", Z_STRVAL_P(m)); -+ } else { -+ fprintf(stderr, "*** Threw NULL exception\n"); -+ } -+} -+#endif -+ -+PHP_MINIT_FUNCTION(http_exception_object) -+{ -+ HTTP_REGISTER_CLASS(HttpException, http_exception_object, ZEND_EXCEPTION_GET_DEFAULT(), 0); -+ -+ zend_declare_property_null(HTTP_EX_DEF_CE, "innerException", lenof("innerException"), ZEND_ACC_PUBLIC TSRMLS_CC); -+ -+ HTTP_REGISTER_EXCEPTION(HttpRuntimeException, HTTP_EX_CE(runtime), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpInvalidParamException, HTTP_EX_CE(invalid_param), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpHeaderException, HTTP_EX_CE(header), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpMalformedHeadersException, HTTP_EX_CE(malformed_headers), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpRequestMethodException, HTTP_EX_CE(request_method), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpMessageTypeException, HTTP_EX_CE(message_type), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpEncodingException, HTTP_EX_CE(encoding), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpRequestException, HTTP_EX_CE(request), HTTP_EX_DEF_CE); -+ -+ zend_declare_property_long(HTTP_EX_CE(request), "curlCode", lenof("curlCode"), 0, ZEND_ACC_PUBLIC TSRMLS_CC); -+ -+ HTTP_REGISTER_EXCEPTION(HttpRequestPoolException, HTTP_EX_CE(request_pool), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpSocketException, HTTP_EX_CE(socket), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpResponseException, HTTP_EX_CE(response), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpUrlException, HTTP_EX_CE(url), HTTP_EX_DEF_CE); -+ HTTP_REGISTER_EXCEPTION(HttpQueryStringException, HTTP_EX_CE(querystring), HTTP_EX_DEF_CE); -+ -+ HTTP_LONG_CONSTANT("HTTP_E_RUNTIME", HTTP_E_RUNTIME); -+ HTTP_LONG_CONSTANT("HTTP_E_INVALID_PARAM", HTTP_E_INVALID_PARAM); -+ HTTP_LONG_CONSTANT("HTTP_E_HEADER", HTTP_E_HEADER); -+ HTTP_LONG_CONSTANT("HTTP_E_MALFORMED_HEADERS", HTTP_E_MALFORMED_HEADERS); -+ HTTP_LONG_CONSTANT("HTTP_E_REQUEST_METHOD", HTTP_E_REQUEST_METHOD); -+ HTTP_LONG_CONSTANT("HTTP_E_MESSAGE_TYPE", HTTP_E_MESSAGE_TYPE); -+ HTTP_LONG_CONSTANT("HTTP_E_ENCODING", HTTP_E_ENCODING); -+ HTTP_LONG_CONSTANT("HTTP_E_REQUEST", HTTP_E_REQUEST); -+ HTTP_LONG_CONSTANT("HTTP_E_REQUEST_POOL", HTTP_E_REQUEST_POOL); -+ HTTP_LONG_CONSTANT("HTTP_E_SOCKET", HTTP_E_SOCKET); -+ HTTP_LONG_CONSTANT("HTTP_E_RESPONSE", HTTP_E_RESPONSE); -+ HTTP_LONG_CONSTANT("HTTP_E_URL", HTTP_E_URL); -+ HTTP_LONG_CONSTANT("HTTP_E_QUERYSTRING", HTTP_E_QUERYSTRING); -+ -+#if HTTP_DBG_EXCEPTIONS -+ zend_throw_exception_hook=http_exception_hook; -+#endif -+ -+ return SUCCESS; -+} -+ -+zend_class_entry *_http_exception_get_default() -+{ -+ return http_exception_object_ce; -+} -+ -+zend_class_entry *_http_exception_get_for_code(long code) -+{ -+ zend_class_entry *ex = http_exception_object_ce; -+ -+ switch (code) { -+ case HTTP_E_RUNTIME: ex = HTTP_EX_CE(runtime); break; -+ case HTTP_E_INVALID_PARAM: ex = HTTP_EX_CE(invalid_param); break; -+ case HTTP_E_HEADER: ex = HTTP_EX_CE(header); break; -+ case HTTP_E_MALFORMED_HEADERS: ex = HTTP_EX_CE(malformed_headers); break; -+ case HTTP_E_REQUEST_METHOD: ex = HTTP_EX_CE(request_method); break; -+ case HTTP_E_MESSAGE_TYPE: ex = HTTP_EX_CE(message_type); break; -+ case HTTP_E_ENCODING: ex = HTTP_EX_CE(encoding); break; -+ case HTTP_E_REQUEST: ex = HTTP_EX_CE(request); break; -+ case HTTP_E_REQUEST_POOL: ex = HTTP_EX_CE(request_pool); break; -+ case HTTP_E_SOCKET: ex = HTTP_EX_CE(socket); break; -+ case HTTP_E_RESPONSE: ex = HTTP_EX_CE(response); break; -+ case HTTP_E_URL: ex = HTTP_EX_CE(url); break; -+ case HTTP_E_QUERYSTRING: ex = HTTP_EX_CE(querystring); break; -+ } -+ -+ return ex; -+} -+ -+PHP_METHOD(HttpException, __toString) -+{ -+ phpstr full_str; -+ zend_class_entry *ce; -+ zval *zobj = getThis(), *retval = NULL, *m, *f, *l; -+ -+ phpstr_init(&full_str); -+ -+ do { -+ ce = Z_OBJCE_P(zobj); -+ -+ m = zend_read_property(ce, zobj, "message", lenof("message"), 0 TSRMLS_CC); -+ f = zend_read_property(ce, zobj, "file", lenof("file"), 0 TSRMLS_CC); -+ l = zend_read_property(ce, zobj, "line", lenof("line"), 0 TSRMLS_CC); -+ -+ if (m && f && l && Z_TYPE_P(m) == IS_STRING && Z_TYPE_P(f) == IS_STRING && Z_TYPE_P(l) == IS_LONG) { -+ if (zobj != getThis()) { -+ phpstr_appends(&full_str, " inner "); -+ } -+ -+ phpstr_appendf(&full_str, "exception '%.*s' with message '%.*s' in %.*s:%ld" PHP_EOL, -+ ce->name_length, ce->name, Z_STRLEN_P(m), Z_STRVAL_P(m), Z_STRLEN_P(f), Z_STRVAL_P(f), Z_LVAL_P(l) -+ ); -+ } else { -+ break; -+ } -+ -+ zobj = zend_read_property(ce, zobj, "innerException", lenof("innerException"), 0 TSRMLS_CC); -+ } while (Z_TYPE_P(zobj) == IS_OBJECT); -+ -+ if (zend_call_method_with_0_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "gettraceasstring", &retval) && Z_TYPE_P(retval) == IS_STRING) { -+ phpstr_appends(&full_str, "Stack trace:" PHP_EOL); -+ phpstr_append(&full_str, Z_STRVAL_P(retval), Z_STRLEN_P(retval)); -+ zval_ptr_dtor(&retval); -+ } -+ -+ RETURN_PHPSTR_VAL(&full_str); -+} -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_filter_api.c -@@ -0,0 +1,534 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_filter_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#define HTTP_WANT_ZLIB -+#include "php_http.h" -+ -+#ifdef ZEND_ENGINE_2 -+ -+#include "php_streams.h" -+#include "php_http_api.h" -+#include "php_http_encoding_api.h" -+#include "php_http_filter_api.h" -+ -+PHP_MINIT_FUNCTION(http_filter) -+{ -+ php_stream_filter_register_factory("http.*", &http_filter_factory TSRMLS_CC); -+ return SUCCESS; -+} -+ -+/* -+ - -+*/ -+ -+#define HTTP_FILTER_PARAMS \ -+ php_stream *stream, \ -+ php_stream_filter *this, \ -+ php_stream_bucket_brigade *buckets_in, \ -+ php_stream_bucket_brigade *buckets_out, \ -+ size_t *bytes_consumed, int flags \ -+ TSRMLS_DC -+#define HTTP_FILTER_OP(filter) \ -+ http_filter_op_ ##filter -+#define HTTP_FILTER_OPS(filter) \ -+ php_stream_filter_ops HTTP_FILTER_OP(filter) -+#define HTTP_FILTER_DTOR(filter) \ -+ http_filter_ ##filter## _dtor -+#define HTTP_FILTER_DESTRUCTOR(filter) \ -+ void HTTP_FILTER_DTOR(filter)(php_stream_filter *this TSRMLS_DC) -+#define HTTP_FILTER_FUNC(filter) \ -+ http_filter_ ##filter -+#define HTTP_FILTER_FUNCTION(filter) \ -+ php_stream_filter_status_t HTTP_FILTER_FUNC(filter)(HTTP_FILTER_PARAMS) -+#define HTTP_FILTER_BUFFER(filter) \ -+ http_filter_ ##filter## _buffer -+ -+#define NEW_BUCKET(data, length) \ -+ { \ -+ char *__data; \ -+ php_stream_bucket *__buck; \ -+ \ -+ __data = pemalloc(length, this->is_persistent); \ -+ if (!__data) { \ -+ return PSFS_ERR_FATAL; \ -+ } \ -+ memcpy(__data, data, length); \ -+ \ -+ __buck = php_stream_bucket_new(stream, __data, length, 1, this->is_persistent TSRMLS_CC); \ -+ if (!__buck) { \ -+ pefree(__data, this->is_persistent); \ -+ return PSFS_ERR_FATAL; \ -+ } \ -+ \ -+ php_stream_bucket_append(buckets_out, __buck TSRMLS_CC); \ -+ } -+ -+typedef struct _http_chunked_decode_filter_buffer_t { -+ phpstr buffer; -+ ulong hexlen; -+} HTTP_FILTER_BUFFER(chunked_decode); -+ -+#ifdef HTTP_HAVE_ZLIB -+typedef http_encoding_stream HTTP_FILTER_BUFFER(deflate); -+typedef http_encoding_stream HTTP_FILTER_BUFFER(inflate); -+#endif /* HTTP_HAVE_ZLIB */ -+ -+ -+static HTTP_FILTER_FUNCTION(chunked_decode) -+{ -+ int out_avail = 0; -+ php_stream_bucket *ptr, *nxt; -+ HTTP_FILTER_BUFFER(chunked_decode) *buffer = (HTTP_FILTER_BUFFER(chunked_decode) *) (this->abstract); -+ -+ if (bytes_consumed) { -+ *bytes_consumed = 0; -+ } -+ -+ /* new data available? */ -+ if (buckets_in->head) { -+ -+ /* fetch available bucket data */ -+ for (ptr = buckets_in->head; ptr; ptr = nxt) { -+ nxt = ptr->next; -+ if (bytes_consumed) { -+ *bytes_consumed += ptr->buflen; -+ } -+ -+ if (PHPSTR_NOMEM == phpstr_append(PHPSTR(buffer), ptr->buf, ptr->buflen)) { -+ return PSFS_ERR_FATAL; -+ } -+ -+ php_stream_bucket_unlink(ptr TSRMLS_CC); -+ php_stream_bucket_delref(ptr TSRMLS_CC); -+ } -+ } -+ if (!phpstr_fix(PHPSTR(buffer))) { -+ return PSFS_ERR_FATAL; -+ } -+ -+ /* we have data in our buffer */ -+ while (PHPSTR_LEN(buffer)) { -+ -+ /* we already know the size of the chunk and are waiting for data */ -+ if (buffer->hexlen) { -+ -+ /* not enough data buffered */ -+ if (PHPSTR_LEN(buffer) < buffer->hexlen) { -+ -+ /* flush anyway? */ -+ if (flags & PSFS_FLAG_FLUSH_INC) { -+ -+ /* flush all data (should only be chunk data) */ -+ out_avail = 1; -+ NEW_BUCKET(PHPSTR_VAL(buffer), PHPSTR_LEN(buffer)); -+ -+ /* waiting for less data now */ -+ buffer->hexlen -= PHPSTR_LEN(buffer); -+ /* no more buffered data */ -+ phpstr_reset(PHPSTR(buffer)); -+ /* break */ -+ } -+ -+ /* we have too less data and don't need to flush */ -+ else { -+ break; -+ } -+ } -+ -+ /* we seem to have all data of the chunk */ -+ else { -+ out_avail = 1; -+ NEW_BUCKET(PHPSTR_VAL(buffer), buffer->hexlen); -+ -+ /* remove outgoing data from the buffer */ -+ phpstr_cut(PHPSTR(buffer), 0, buffer->hexlen); -+ /* reset hexlen */ -+ buffer->hexlen = 0; -+ /* continue */ -+ } -+ } -+ -+ /* we don't know the length of the chunk yet */ -+ else { -+ size_t off = 0; -+ -+ /* ignore preceeding CRLFs (too loose?) */ -+ while (off < PHPSTR_LEN(buffer) && ( -+ PHPSTR_VAL(buffer)[off] == '\n' || -+ PHPSTR_VAL(buffer)[off] == '\r')) { -+ ++off; -+ } -+ if (off) { -+ phpstr_cut(PHPSTR(buffer), 0, off); -+ } -+ -+ /* still data there? */ -+ if (PHPSTR_LEN(buffer)) { -+ int eollen; -+ const char *eolstr; -+ -+ /* we need eol, so we can be sure we have all hex digits */ -+ phpstr_fix(PHPSTR(buffer)); -+ if ((eolstr = http_locate_eol(PHPSTR_VAL(buffer), &eollen))) { -+ char *stop = NULL; -+ -+ /* read in chunk size */ -+ buffer->hexlen = strtoul(PHPSTR_VAL(buffer), &stop, 16); -+ -+ /* if strtoul() stops at the beginning of the buffered data -+ there's domething oddly wrong, i.e. bad input */ -+ if (stop == PHPSTR_VAL(buffer)) { -+ return PSFS_ERR_FATAL; -+ } -+ -+ /* cut out */ -+ phpstr_cut(PHPSTR(buffer), 0, eolstr + eollen - PHPSTR_VAL(buffer)); -+ /* buffer->hexlen is 0 now or contains the size of the next chunk */ -+ /* continue */ -+ } else { -+ /* we have not enough data buffered to read in chunk size */ -+ break; -+ } -+ } -+ /* break */ -+ } -+ } -+ -+ /* flush before close, but only if we are already waiting for more data */ -+ if ((flags & PSFS_FLAG_FLUSH_CLOSE) && buffer->hexlen && PHPSTR_LEN(buffer)) { -+ out_avail = 1; -+ NEW_BUCKET(PHPSTR_VAL(buffer), PHPSTR_LEN(buffer)); -+ phpstr_reset(PHPSTR(buffer)); -+ buffer->hexlen = 0; -+ } -+ -+ return out_avail ? PSFS_PASS_ON : PSFS_FEED_ME; -+} -+ -+static HTTP_FILTER_DESTRUCTOR(chunked_decode) -+{ -+ HTTP_FILTER_BUFFER(chunked_decode) *b = (HTTP_FILTER_BUFFER(chunked_decode) *) (this->abstract); -+ -+ phpstr_dtor(PHPSTR(b)); -+ pefree(b, this->is_persistent); -+} -+ -+static HTTP_FILTER_FUNCTION(chunked_encode) -+{ -+ int out_avail = 0; -+ php_stream_bucket *ptr, *nxt; -+ -+ if (bytes_consumed) { -+ *bytes_consumed = 0; -+ } -+ -+ /* new data available? */ -+ if (buckets_in->head) { -+ phpstr buf; -+ out_avail = 1; -+ -+ phpstr_init(&buf); -+ -+ /* fetch available bucket data */ -+ for (ptr = buckets_in->head; ptr; ptr = nxt) { -+ nxt = ptr->next; -+ if (bytes_consumed) { -+ *bytes_consumed += ptr->buflen; -+ } -+ -+ phpstr_appendf(&buf, "%x" HTTP_CRLF, ptr->buflen); -+ phpstr_append(&buf, ptr->buf, ptr->buflen); -+ phpstr_appends(&buf, HTTP_CRLF); -+ -+ /* pass through */ -+ NEW_BUCKET(PHPSTR_VAL(&buf), PHPSTR_LEN(&buf)); -+ /* reset */ -+ phpstr_reset(&buf); -+ -+ php_stream_bucket_unlink(ptr TSRMLS_CC); -+ php_stream_bucket_delref(ptr TSRMLS_CC); -+ } -+ -+ /* free buffer */ -+ phpstr_dtor(&buf); -+ } -+ -+ /* terminate with "0" */ -+ if (flags & PSFS_FLAG_FLUSH_CLOSE) { -+ out_avail = 1; -+ NEW_BUCKET("0" HTTP_CRLF, lenof("0" HTTP_CRLF)); -+ } -+ -+ return out_avail ? PSFS_PASS_ON : PSFS_FEED_ME; -+} -+ -+static HTTP_FILTER_OPS(chunked_decode) = { -+ HTTP_FILTER_FUNC(chunked_decode), -+ HTTP_FILTER_DTOR(chunked_decode), -+ "http.chunked_decode" -+}; -+ -+static HTTP_FILTER_OPS(chunked_encode) = { -+ HTTP_FILTER_FUNC(chunked_encode), -+ NULL, -+ "http.chunked_encode" -+}; -+ -+#ifdef HTTP_HAVE_ZLIB -+ -+static HTTP_FILTER_FUNCTION(deflate) -+{ -+ int out_avail = 0; -+ php_stream_bucket *ptr, *nxt; -+ HTTP_FILTER_BUFFER(inflate) *buffer = (HTTP_FILTER_BUFFER(deflate) *) this->abstract; -+ -+ if (bytes_consumed) { -+ *bytes_consumed = 0; -+ } -+ -+ /* new data available? */ -+ if (buckets_in->head) { -+ -+ /* fetch available bucket data */ -+ for (ptr = buckets_in->head; ptr; ptr = nxt) { -+ char *encoded = NULL; -+ size_t encoded_len = 0; -+ -+ nxt = ptr->next; -+ if (bytes_consumed) { -+ *bytes_consumed += ptr->buflen; -+ } -+ -+ if (ptr->buflen) { -+ http_encoding_deflate_stream_update(buffer, ptr->buf, ptr->buflen, &encoded, &encoded_len); -+ if (encoded) { -+ if (encoded_len) { -+ out_avail = 1; -+ NEW_BUCKET(encoded, encoded_len); -+ } -+ efree(encoded); -+ } -+ } -+ -+ php_stream_bucket_unlink(ptr TSRMLS_CC); -+ php_stream_bucket_delref(ptr TSRMLS_CC); -+ } -+ } -+ -+ /* flush & close */ -+ if (flags & PSFS_FLAG_FLUSH_INC) { -+ char *encoded = NULL; -+ size_t encoded_len = 0; -+ -+ http_encoding_deflate_stream_flush(buffer, &encoded, &encoded_len); -+ if (encoded) { -+ if (encoded_len) { -+ out_avail = 1; -+ NEW_BUCKET(encoded, encoded_len); -+ } -+ efree(encoded); -+ } -+ } -+ -+ if (flags & PSFS_FLAG_FLUSH_CLOSE) { -+ char *encoded = NULL; -+ size_t encoded_len = 0; -+ -+ http_encoding_deflate_stream_finish(buffer, &encoded, &encoded_len); -+ if (encoded) { -+ if (encoded_len) { -+ out_avail = 1; -+ NEW_BUCKET(encoded, encoded_len); -+ } -+ efree(encoded); -+ } -+ } -+ -+ return out_avail ? PSFS_PASS_ON : PSFS_FEED_ME; -+} -+ -+static HTTP_FILTER_FUNCTION(inflate) -+{ -+ int out_avail = 0; -+ php_stream_bucket *ptr, *nxt; -+ HTTP_FILTER_BUFFER(inflate) *buffer = (HTTP_FILTER_BUFFER(inflate) *) this->abstract; -+ -+ if (bytes_consumed) { -+ *bytes_consumed = 0; -+ } -+ -+ /* new data available? */ -+ if (buckets_in->head) { -+ -+ /* fetch available bucket data */ -+ for (ptr = buckets_in->head; ptr; ptr = nxt) { -+ char *decoded = NULL; -+ size_t decoded_len = 0; -+ -+ nxt = ptr->next; -+ if (bytes_consumed) { -+ *bytes_consumed += ptr->buflen; -+ } -+ -+ if (ptr->buflen) { -+ http_encoding_inflate_stream_update(buffer, ptr->buf, ptr->buflen, &decoded, &decoded_len); -+ if (decoded) { -+ if (decoded_len) { -+ out_avail = 1; -+ NEW_BUCKET(decoded, decoded_len); -+ } -+ efree(decoded); -+ } -+ } -+ -+ php_stream_bucket_unlink(ptr TSRMLS_CC); -+ php_stream_bucket_delref(ptr TSRMLS_CC); -+ } -+ } -+ -+ /* flush & close */ -+ if (flags & PSFS_FLAG_FLUSH_INC) { -+ char *decoded = NULL; -+ size_t decoded_len = 0; -+ -+ http_encoding_inflate_stream_flush(buffer, &decoded, &decoded_len); -+ if (decoded) { -+ if (decoded_len) { -+ out_avail = 1; -+ NEW_BUCKET(decoded, decoded_len); -+ } -+ efree(decoded); -+ } -+ } -+ -+ if (flags & PSFS_FLAG_FLUSH_CLOSE) { -+ char *decoded = NULL; -+ size_t decoded_len = 0; -+ -+ http_encoding_inflate_stream_finish(buffer, &decoded, &decoded_len); -+ if (decoded) { -+ if (decoded_len) { -+ out_avail = 1; -+ NEW_BUCKET(decoded, decoded_len); -+ } -+ efree(decoded); -+ } -+ } -+ -+ return out_avail ? PSFS_PASS_ON : PSFS_FEED_ME; -+} -+ -+static HTTP_FILTER_DESTRUCTOR(deflate) -+{ -+ HTTP_FILTER_BUFFER(deflate) *buffer = (HTTP_FILTER_BUFFER(deflate) *) this->abstract; -+ http_encoding_deflate_stream_free(&buffer); -+} -+ -+static HTTP_FILTER_DESTRUCTOR(inflate) -+{ -+ HTTP_FILTER_BUFFER(inflate) *buffer = (HTTP_FILTER_BUFFER(inflate) *) this->abstract; -+ http_encoding_inflate_stream_free(&buffer); -+} -+ -+static HTTP_FILTER_OPS(deflate) = { -+ HTTP_FILTER_FUNC(deflate), -+ HTTP_FILTER_DTOR(deflate), -+ "http.deflate" -+}; -+ -+static HTTP_FILTER_OPS(inflate) = { -+ HTTP_FILTER_FUNC(inflate), -+ HTTP_FILTER_DTOR(inflate), -+ "http.inflate" -+}; -+ -+#endif /* HTTP_HAVE_ZLIB */ -+ -+static php_stream_filter *http_filter_create(const char *name, zval *params, int p TSRMLS_DC) -+{ -+ zval **tmp = ¶ms; -+ php_stream_filter *f = NULL; -+ -+ if (!strcasecmp(name, "http.chunked_decode")) { -+ HTTP_FILTER_BUFFER(chunked_decode) *b = NULL; -+ -+ if ((b = pecalloc(1, sizeof(HTTP_FILTER_BUFFER(chunked_decode)), p))) { -+ phpstr_init_ex(PHPSTR(b), 4096, p ? PHPSTR_INIT_PERSISTENT : 0); -+ if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(chunked_decode), b, p))) { -+ pefree(b, p); -+ } -+ } -+ } else -+ -+ if (!strcasecmp(name, "http.chunked_encode")) { -+ f = php_stream_filter_alloc(&HTTP_FILTER_OP(chunked_encode), NULL, p); -+#ifdef HTTP_HAVE_ZLIB -+ } else -+ -+ if (!strcasecmp(name, "http.inflate")) { -+ int flags = p ? HTTP_ENCODING_STREAM_PERSISTENT : 0; -+ HTTP_FILTER_BUFFER(inflate) *b = NULL; -+ -+ if ((b = http_encoding_inflate_stream_init(NULL, flags))) { -+ if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(inflate), b, p))) { -+ http_encoding_inflate_stream_free(&b); -+ } -+ } -+ } else -+ -+ if (!strcasecmp(name, "http.deflate")) { -+ int flags = p ? HTTP_ENCODING_STREAM_PERSISTENT : 0; -+ HTTP_FILTER_BUFFER(deflate) *b = NULL; -+ -+ if (params) { -+ switch (Z_TYPE_P(params)) { -+ case IS_ARRAY: -+ case IS_OBJECT: -+ if (SUCCESS != zend_hash_find(HASH_OF(params), "flags", sizeof("flags"), (void *) &tmp)) { -+ break; -+ } -+ default: -+ { -+ zval *num = http_zsep(IS_LONG, *tmp); -+ -+ flags |= (Z_LVAL_P(num) & 0x0fffffff); -+ zval_ptr_dtor(&num); -+ } -+ } -+ } -+ if ((b = http_encoding_deflate_stream_init(NULL, flags))) { -+ if (!(f = php_stream_filter_alloc(&HTTP_FILTER_OP(deflate), b, p))) { -+ http_encoding_deflate_stream_free(&b); -+ } -+ } -+#endif /* HTTP_HAVE_ZLIB */ -+ } -+ -+ return f; -+} -+ -+php_stream_filter_factory http_filter_factory = { -+ http_filter_create -+}; -+ -+#endif /* ZEND_ENGINE_2 */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/http_functions.c -@@ -0,0 +1,1424 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_functions.c 300301 2010-06-09 08:30:34Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#define HTTP_WANT_CURL -+#define HTTP_WANT_ZLIB -+#include "php_http.h" -+ -+#include "php_ini.h" -+#include "ext/standard/php_string.h" -+#include "zend_operators.h" -+ -+#ifdef HTTP_HAVE_SESSION -+# include "ext/session/php_session.h" -+#endif -+ -+#include "php_http_api.h" -+#include "php_http_cache_api.h" -+#include "php_http_cookie_api.h" -+#include "php_http_date_api.h" -+#include "php_http_encoding_api.h" -+#include "php_http_headers_api.h" -+#include "php_http_message_api.h" -+#include "php_http_request_api.h" -+#include "php_http_request_method_api.h" -+#include "php_http_persistent_handle_api.h" -+#include "php_http_send_api.h" -+#include "php_http_url_api.h" -+ -+/* {{{ proto string http_date([int timestamp]) -+ Compose a valid HTTP date regarding RFC 1123 looking like: "Wed, 22 Dec 2004 11:34:47 GMT" */ -+PHP_FUNCTION(http_date) -+{ -+ long t = -1; -+ char *date; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (t == -1) { -+ t = HTTP_G->request.time; -+ } -+ -+ if (!(date = http_date(t))) { -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Could not compose date of timestamp %ld", t); -+ RETURN_FALSE; -+ } -+ -+ RETURN_STRING(date, 0); -+} -+/* }}} */ -+ -+/* {{{ proto string http_build_url([mixed url[, mixed parts[, int flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV[, array &new_url]]]]) -+ Build an URL. */ -+PHP_FUNCTION(http_build_url) -+{ -+ char *url_str = NULL; -+ size_t url_len = 0; -+ long flags = HTTP_URL_REPLACE|HTTP_URL_FROM_ENV; -+ zval *z_old_url = NULL, *z_new_url = NULL, *z_composed_url = NULL; -+ php_url *old_url = NULL, *new_url = NULL, *composed_url = NULL; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|z!/z!/lz", &z_old_url, &z_new_url, &flags, &z_composed_url) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (z_new_url) { -+ if (Z_TYPE_P(z_new_url) == IS_ARRAY || Z_TYPE_P(z_new_url) == IS_OBJECT) { -+ new_url = http_url_from_struct(NULL, HASH_OF(z_new_url)); -+ } else { -+ convert_to_string(z_new_url); -+ if (!(new_url = php_url_parse_ex(Z_STRVAL_P(z_new_url), Z_STRLEN_P(z_new_url)))) { -+ http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", Z_STRVAL_P(z_new_url)); -+ RETURN_FALSE; -+ } -+ } -+ } -+ -+ if (z_old_url) { -+ if (Z_TYPE_P(z_old_url) == IS_ARRAY || Z_TYPE_P(z_old_url) == IS_OBJECT) { -+ old_url = http_url_from_struct(NULL, HASH_OF(z_old_url)); -+ } else { -+ convert_to_string(z_old_url); -+ if (!(old_url = php_url_parse_ex(Z_STRVAL_P(z_old_url), Z_STRLEN_P(z_old_url)))) { -+ if (new_url) { -+ php_url_free(new_url); -+ } -+ http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", Z_STRVAL_P(z_old_url)); -+ RETURN_FALSE; -+ } -+ } -+ } -+ -+ if (z_composed_url) { -+ http_build_url(flags, old_url, new_url, &composed_url, &url_str, &url_len); -+ http_url_tostruct(composed_url, z_composed_url); -+ php_url_free(composed_url); -+ } else { -+ http_build_url(flags, old_url, new_url, NULL, &url_str, &url_len); -+ } -+ -+ if (new_url) { -+ php_url_free(new_url); -+ } -+ if (old_url) { -+ php_url_free(old_url); -+ } -+ -+ RETURN_STRINGL(url_str, url_len, 0); -+} -+/* }}} */ -+ -+/* {{{ proto string http_build_str(array query [, string prefix[, string arg_separator]]) -+ Opponent to parse_str(). */ -+PHP_FUNCTION(http_build_str) -+{ -+ zval *formdata; -+ char *prefix = NULL, *arg_sep = INI_STR("arg_separator.output"); -+ int prefix_len = 0, arg_sep_len = strlen(arg_sep); -+ phpstr formstr; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|ss", &formdata, &prefix, &prefix_len, &arg_sep, &arg_sep_len) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (!arg_sep_len) { -+ arg_sep = HTTP_URL_ARGSEP; -+ arg_sep_len = lenof(HTTP_URL_ARGSEP); -+ } -+ -+ phpstr_init(&formstr); -+ if (SUCCESS != http_urlencode_hash_recursive(HASH_OF(formdata), &formstr, arg_sep, arg_sep_len, prefix, prefix_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (!formstr.used) { -+ phpstr_dtor(&formstr); -+ RETURN_NULL(); -+ } -+ -+ RETURN_PHPSTR_VAL(&formstr); -+} -+/* }}} */ -+ -+#define HTTP_DO_NEGOTIATE_DEFAULT(supported) \ -+ { \ -+ zval **value; \ -+ \ -+ zend_hash_internal_pointer_reset(Z_ARRVAL_P(supported)); \ -+ if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(supported), (void *) &value)) { \ -+ RETVAL_ZVAL(*value, 1, 0); \ -+ } else { \ -+ RETVAL_NULL(); \ -+ } \ -+ } -+ -+#define HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array) \ -+ HTTP_DO_NEGOTIATE_DEFAULT(supported); \ -+ if (rs_array) { \ -+ HashPosition pos; \ -+ zval **value_ptr; \ -+ \ -+ FOREACH_VAL(pos, supported, value_ptr) { \ -+ zval *value = http_zsep(IS_STRING, *value_ptr); \ -+ add_assoc_double(rs_array, Z_STRVAL_P(value), 1.0); \ -+ zval_ptr_dtor(&value); \ -+ } \ -+ } -+ -+#define HTTP_DO_NEGOTIATE_HANDLE_RESULT(result, supported, rs_array) \ -+ { \ -+ char *key; \ -+ uint key_len; \ -+ ulong idx; \ -+ \ -+ if (zend_hash_num_elements(result) && HASH_KEY_IS_STRING == zend_hash_get_current_key_ex(result, &key, &key_len, &idx, 1, NULL)) { \ -+ RETVAL_STRINGL(key, key_len-1, 0); \ -+ } else { \ -+ HTTP_DO_NEGOTIATE_DEFAULT(supported); \ -+ } \ -+ \ -+ if (rs_array) { \ -+ zend_hash_copy(Z_ARRVAL_P(rs_array), result, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); \ -+ } \ -+ \ -+ zend_hash_destroy(result); \ -+ FREE_HASHTABLE(result); \ -+ } -+ -+#define HTTP_DO_NEGOTIATE(type, supported, rs_array) \ -+ { \ -+ HashTable *result; \ -+ if ((result = http_negotiate_ ##type(supported))) { \ -+ HTTP_DO_NEGOTIATE_HANDLE_RESULT(result, supported, rs_array); \ -+ } else { \ -+ HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array); \ -+ } \ -+ } -+ -+/* {{{ proto string http_negotiate_language(array supported[, array &result]) -+ Negotiate the clients preferred language. */ -+PHP_FUNCTION(http_negotiate_language) -+{ -+ zval *supported, *rs_array = NULL; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|z", &supported, &rs_array) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (rs_array) { -+ zval_dtor(rs_array); -+ array_init(rs_array); -+ } -+ -+ HTTP_DO_NEGOTIATE(language, supported, rs_array); -+} -+/* }}} */ -+ -+/* {{{ proto string http_negotiate_charset(array supported[, array &result]) -+ Negotiate the clients preferred charset. */ -+PHP_FUNCTION(http_negotiate_charset) -+{ -+ zval *supported, *rs_array = NULL; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|z", &supported, &rs_array) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (rs_array) { -+ zval_dtor(rs_array); -+ array_init(rs_array); -+ } -+ -+ HTTP_DO_NEGOTIATE(charset, supported, rs_array); -+} -+/* }}} */ -+ -+/* {{{ proto string http_negotiate_content_type(array supported[, array &result]) -+ Negotiate the clients preferred content type. */ -+PHP_FUNCTION(http_negotiate_content_type) -+{ -+ zval *supported, *rs_array = NULL; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|z", &supported, &rs_array)) { -+ RETURN_FALSE; -+ } -+ -+ if (rs_array) { -+ zval_dtor(rs_array); -+ array_init(rs_array); -+ } -+ -+ HTTP_DO_NEGOTIATE(content_type, supported, rs_array); -+} -+/* }}} */ -+ -+/* {{{ proto string http_negotiate(mixed value, array supported[, array &result]) -+ Negotiate the user supplied value. */ -+PHP_FUNCTION(http_negotiate) -+{ -+ zval *value, *supported, *rs_array = NULL; -+ HashTable *rs; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "za|z", &value, &supported, &rs_array)) { -+ RETURN_FALSE; -+ } -+ -+ if (rs_array) { -+ zval_dtor(rs_array); -+ array_init(rs_array); -+ } -+ -+ if ((rs = http_negotiate_z(value, Z_ARRVAL_P(supported), http_negotiate_default_func))) { -+ HTTP_DO_NEGOTIATE_HANDLE_RESULT(rs, supported, rs_array); -+ } else { -+ HTTP_DO_NEGOTIATE_HANDLE_DEFAULT(supported, rs_array); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool http_send_status(int status) -+ Send HTTP status code. */ -+PHP_FUNCTION(http_send_status) -+{ -+ long status = 0; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &status) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ if (status < 100 || status > 510) { -+ http_error_ex(HE_WARNING, HTTP_E_HEADER, "Invalid HTTP status code (100-510): %d", status); -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(http_send_status(status)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_send_last_modified([int timestamp]) -+ Send a "Last-Modified" header with a valid HTTP date. */ -+PHP_FUNCTION(http_send_last_modified) -+{ -+ long t = -1; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &t) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (t == -1) { -+ t = HTTP_G->request.time; -+ } -+ -+ RETURN_SUCCESS(http_send_last_modified(t)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_send_content_type([string content_type = 'application/x-octetstream']) -+ Send the Content-Type of the sent entity. This is particularly important if you use the http_send() API. */ -+PHP_FUNCTION(http_send_content_type) -+{ -+ char *ct = "application/x-octetstream"; -+ int ct_len = lenof("application/x-octetstream"); -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ct, &ct_len) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(http_send_content_type(ct, ct_len)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_send_content_disposition(string filename[, bool inline = false]) -+ Send the Content-Disposition. */ -+PHP_FUNCTION(http_send_content_disposition) -+{ -+ char *filename; -+ int f_len; -+ zend_bool send_inline = 0; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &filename, &f_len, &send_inline) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ RETURN_SUCCESS(http_send_content_disposition(filename, f_len, send_inline)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_match_modified([int timestamp[, bool for_range = false]]) -+ Matches the given unix timestamp against the clients "If-Modified-Since" resp. "If-Unmodified-Since" HTTP headers. */ -+PHP_FUNCTION(http_match_modified) -+{ -+ long t = -1; -+ zend_bool for_range = 0; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|lb", &t, &for_range) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ // current time if not supplied (senseless though) -+ if (t == -1) { -+ t = HTTP_G->request.time; -+ } -+ -+ if (for_range) { -+ RETURN_BOOL(http_match_last_modified("HTTP_IF_UNMODIFIED_SINCE", t)); -+ } -+ RETURN_BOOL(http_match_last_modified("HTTP_IF_MODIFIED_SINCE", t)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_match_etag(string etag[, bool for_range = false]) -+ Matches the given ETag against the clients "If-Match" resp. "If-None-Match" HTTP headers. */ -+PHP_FUNCTION(http_match_etag) -+{ -+ int etag_len; -+ char *etag; -+ zend_bool for_range = 0; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &etag, &etag_len, &for_range) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (for_range) { -+ RETURN_BOOL(http_match_etag("HTTP_IF_MATCH", etag)); -+ } -+ RETURN_BOOL(http_match_etag("HTTP_IF_NONE_MATCH", etag)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_cache_last_modified([int timestamp_or_expires]]) -+ Attempts to cache the sent entity by its last modification date. */ -+PHP_FUNCTION(http_cache_last_modified) -+{ -+ long last_modified = 0, send_modified = 0, t; -+ zval *zlm; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &last_modified) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); -+ -+ t = HTTP_G->request.time; -+ -+ /* 0 or omitted */ -+ if (!last_modified) { -+ /* does the client have? (att: caching "forever") */ -+ if ((zlm = http_get_server_var("HTTP_IF_MODIFIED_SINCE", 1))) { -+ last_modified = send_modified = http_parse_date(Z_STRVAL_P(zlm)); -+ /* send current time */ -+ } else { -+ send_modified = t; -+ } -+ /* negative value is supposed to be expiration time */ -+ } else if (last_modified < 0) { -+ last_modified += t; -+ send_modified = t; -+ /* send supplied time explicitly */ -+ } else { -+ send_modified = last_modified; -+ } -+ -+ RETURN_SUCCESS(http_cache_last_modified(last_modified, send_modified, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL))); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_cache_etag([string etag]) -+ Attempts to cache the sent entity by its ETag, either supplied or generated by the hash algorithm specified by the INI setting "http.etag.mode". */ -+PHP_FUNCTION(http_cache_etag) -+{ -+ char *etag = NULL; -+ int etag_len = 0; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &etag, &etag_len) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); -+ -+ RETURN_SUCCESS(http_cache_etag(etag, etag_len, HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL))); -+} -+/* }}} */ -+ -+/* {{{ proto string ob_etaghandler(string data, int mode) -+ For use with ob_start(). Output buffer handler generating an ETag with the hash algorithm specified with the INI setting "http.etag.mode". */ -+PHP_FUNCTION(ob_etaghandler) -+{ -+ char *data; -+ int data_len; -+ long mode; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &data, &data_len, &mode)) { -+ RETURN_FALSE; -+ } -+ -+ Z_TYPE_P(return_value) = IS_STRING; -+ http_ob_etaghandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode); -+} -+/* }}} */ -+ -+/* {{{ proto void http_throttle(double sec[, int bytes = 40960]) -+ Sets the throttle delay and send buffer size for use with http_send() API. */ -+PHP_FUNCTION(http_throttle) -+{ -+ long chunk_size = HTTP_SENDBUF_SIZE; -+ double interval; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d|l", &interval, &chunk_size)) { -+ return; -+ } -+ -+ HTTP_G->send.throttle_delay = interval; -+ HTTP_G->send.buffer_size = chunk_size; -+} -+/* }}} */ -+ -+/* {{{ proto void http_redirect([string url[, array params[, bool session = false[, int status = 302]]]]) -+ Redirect to the given url. */ -+PHP_FUNCTION(http_redirect) -+{ -+ int url_len = 0; -+ size_t query_len = 0; -+ zend_bool session = 0, free_params = 0; -+ zval *params = NULL; -+ long status = HTTP_REDIRECT; -+ char *query = NULL, *url = NULL, *URI, *LOC, *RED = NULL; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sa!/bl", &url, &url_len, ¶ms, &session, &status) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+#ifdef HTTP_HAVE_SESSION -+ /* append session info */ -+ if (session) { -+ if (!params) { -+ free_params = 1; -+ MAKE_STD_ZVAL(params); -+ array_init(params); -+ } -+ if (PS(session_status) == php_session_active) { -+ if (add_assoc_string(params, PS(session_name), PS(id), 1) != SUCCESS) { -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not append session information"); -+ } -+ } -+ } -+#endif -+ -+ /* treat params array with http_build_query() */ -+ if (params) { -+ if (SUCCESS != http_urlencode_hash_ex(Z_ARRVAL_P(params), 0, NULL, 0, &query, &query_len)) { -+ if (free_params) { -+ zval_dtor(params); -+ FREE_ZVAL(params); -+ } -+ if (query) { -+ efree(query); -+ } -+ RETURN_FALSE; -+ } -+ } -+ -+ URI = http_absolute_url_ex(url, HTTP_URL_FROM_ENV); -+ -+ if (query_len) { -+ spprintf(&LOC, 0, "Location: %s?%s", URI, query); -+ if (status != 300) { -+ spprintf(&RED, 0, "Redirecting to %s?%s.\n", URI, query, URI, query); -+ } -+ } else { -+ spprintf(&LOC, 0, "Location: %s", URI); -+ if (status != 300) { -+ spprintf(&RED, 0, "Redirecting to %s.\n", URI, URI); -+ } -+ } -+ -+ efree(URI); -+ if (query) { -+ efree(query); -+ } -+ if (free_params) { -+ zval_dtor(params); -+ FREE_ZVAL(params); -+ } -+ -+ switch (status) { -+ case 300: -+ RETVAL_SUCCESS(http_send_status_header(status, LOC)); -+ efree(LOC); -+ return; -+ -+ case HTTP_REDIRECT_PERM: -+ case HTTP_REDIRECT_FOUND: -+ case HTTP_REDIRECT_POST: -+ case HTTP_REDIRECT_PROXY: -+ case HTTP_REDIRECT_TEMP: -+ break; -+ -+ case 306: -+ default: -+ http_error_ex(HE_NOTICE, HTTP_E_RUNTIME, "Unsupported redirection status code: %ld", status); -+ case HTTP_REDIRECT: -+ if ( SG(request_info).request_method && -+ strcasecmp(SG(request_info).request_method, "HEAD") && -+ strcasecmp(SG(request_info).request_method, "GET")) { -+ status = HTTP_REDIRECT_POST; -+ } else { -+ status = HTTP_REDIRECT_FOUND; -+ } -+ break; -+ } -+ -+ RETURN_SUCCESS(http_exit_ex(status, LOC, RED, 1)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_send_data(string data) -+ Sends raw data with support for (multiple) range requests. */ -+PHP_FUNCTION(http_send_data) -+{ -+ int data_len; -+ char *data_buf; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data_buf, &data_len) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(http_send_data(data_buf, data_len)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_send_file(string file) -+ Sends a file with support for (multiple) range requests. */ -+PHP_FUNCTION(http_send_file) -+{ -+ char *file; -+ int flen = 0; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &file, &flen) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ if (!flen) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(http_send_file(file)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_send_stream(resource stream) -+ Sends an already opened stream with support for (multiple) range requests. */ -+PHP_FUNCTION(http_send_stream) -+{ -+ zval *zstream; -+ php_stream *file; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &zstream) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ php_stream_from_zval(file, &zstream); -+ RETURN_SUCCESS(http_send_stream(file)); -+} -+/* }}} */ -+ -+/* {{{ proto string http_chunked_decode(string encoded) -+ Decodes a string that was HTTP-chunked encoded. */ -+PHP_FUNCTION(http_chunked_decode) -+{ -+ char *encoded = NULL, *decoded = NULL; -+ size_t decoded_len = 0; -+ int encoded_len = 0; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &encoded, &encoded_len) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (NULL != http_encoding_dechunk(encoded, encoded_len, &decoded, &decoded_len)) { -+ RETURN_STRINGL(decoded, (int) decoded_len, 0); -+ } else { -+ RETURN_FALSE; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto object http_parse_message(string message) -+ Parses (a) http_message(s) into a simple recursive object structure. */ -+PHP_FUNCTION(http_parse_message) -+{ -+ char *message; -+ int message_len; -+ http_message *msg = NULL; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &message, &message_len)) { -+ RETURN_NULL(); -+ } -+ -+ if ((msg = http_message_parse(message, message_len))) { -+ object_init(return_value); -+ http_message_tostruct_recursive(msg, return_value); -+ http_message_free(&msg); -+ } else { -+ RETURN_NULL(); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto array http_parse_headers(string header) -+ Parses HTTP headers into an associative array. */ -+PHP_FUNCTION(http_parse_headers) -+{ -+ char *header; -+ int header_len; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &header, &header_len)) { -+ RETURN_FALSE; -+ } -+ -+ array_init(return_value); -+ if (SUCCESS != http_parse_headers(header, return_value)) { -+ zval_dtor(return_value); -+ http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse headers"); -+ RETURN_FALSE; -+ } -+} -+/* }}}*/ -+ -+/* {{{ proto object http_parse_cookie(string cookie[, int flags[, array allowed_extras]]) -+ Parses HTTP cookies like sent in a response into a struct. */ -+PHP_FUNCTION(http_parse_cookie) -+{ -+ char *cookie, **allowed_extras = NULL; -+ int i = 0, cookie_len; -+ long flags = 0; -+ zval *allowed_extras_array = NULL, **entry = NULL; -+ HashPosition pos; -+ http_cookie_list list; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|la!", &cookie, &cookie_len, &flags, &allowed_extras_array)) { -+ RETURN_FALSE; -+ } -+ -+ if (allowed_extras_array) { -+ allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); -+ FOREACH_VAL(pos, allowed_extras_array, entry) { -+ zval *data = http_zsep(IS_STRING, *entry); -+ allowed_extras[i++] = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data)); -+ zval_ptr_dtor(&data); -+ } -+ } -+ -+ if (http_parse_cookie_ex(&list, cookie, flags, allowed_extras)) { -+ object_init(return_value); -+ http_cookie_list_tostruct(&list, return_value); -+ http_cookie_list_dtor(&list); -+ } else { -+ RETVAL_FALSE; -+ } -+ -+ if (allowed_extras) { -+ for (i = 0; allowed_extras[i]; ++i) { -+ efree(allowed_extras[i]); -+ } -+ efree(allowed_extras); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string http_build_cookie(array cookie) -+ Build a cookie string from an array/object like returned by http_parse_cookie(). */ -+PHP_FUNCTION(http_build_cookie) -+{ -+ char *str = NULL; -+ size_t len = 0; -+ zval *strct; -+ http_cookie_list list; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a", &strct)) { -+ RETURN_FALSE; -+ } -+ -+ http_cookie_list_fromstruct(&list, strct); -+ http_cookie_list_tostring(&list, &str, &len); -+ http_cookie_list_dtor(&list); -+ -+ RETURN_STRINGL(str, len, 0); -+} -+/* }}} */ -+ -+/* {{{ proto object http_parse_params(string param[, int flags = HTTP_PARAMS_DEFAULT]) -+ Parse parameter list. */ -+PHP_FUNCTION(http_parse_params) -+{ -+ char *param; -+ int param_len; -+ zval *params; -+ long flags = HTTP_PARAMS_DEFAULT; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", ¶m, ¶m_len, &flags)) { -+ RETURN_FALSE; -+ } -+ -+ MAKE_STD_ZVAL(params); -+ array_init(params); -+ if (SUCCESS != http_parse_params(param, flags, Z_ARRVAL_P(params))) { -+ zval_ptr_dtor(¶ms); -+ RETURN_FALSE; -+ } -+ -+ object_init(return_value); -+ add_property_zval(return_value, "params", params); -+#ifdef ZEND_ENGINE_2 -+ zval_ptr_dtor(¶ms); -+#endif -+} -+/* }}} */ -+ -+/* {{{ proto array http_get_request_headers(void) -+ Get a list of incoming HTTP headers. */ -+PHP_FUNCTION(http_get_request_headers) -+{ -+ NO_ARGS; -+ -+ array_init(return_value); -+ http_get_request_headers(Z_ARRVAL_P(return_value)); -+} -+/* }}} */ -+ -+/* {{{ proto string http_get_request_body(void) -+ Get the raw request body (e.g. POST or PUT data). */ -+PHP_FUNCTION(http_get_request_body) -+{ -+ char *body; -+ size_t length; -+ -+ NO_ARGS; -+ -+ if (SUCCESS == http_get_request_body(&body, &length)) { -+ RETURN_STRINGL(body, (int) length, 0); -+ } else { -+ RETURN_NULL(); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto resource http_get_request_body_stream(void) -+ Create a stream to read the raw request body (e.g. POST or PUT data). This function can only be used once if the request method was another than POST. */ -+PHP_FUNCTION(http_get_request_body_stream) -+{ -+ php_stream *s; -+ -+ NO_ARGS; -+ -+ if ((s = http_get_request_body_stream())) { -+ php_stream_to_zval(s, return_value); -+ } else { -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Failed to create request body stream"); -+ RETURN_NULL(); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool http_match_request_header(string header, string value[, bool match_case = false]) -+ Match an incoming HTTP header. */ -+PHP_FUNCTION(http_match_request_header) -+{ -+ char *header, *value; -+ int header_len, value_len; -+ zend_bool match_case = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|b", &header, &header_len, &value, &value_len, &match_case)) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_BOOL(http_match_request_header_ex(header, value, match_case)); -+} -+/* }}} */ -+ -+/* {{{ proto object http_persistent_handles_count() */ -+PHP_FUNCTION(http_persistent_handles_count) -+{ -+ NO_ARGS; -+ object_init(return_value); -+ if (!http_persistent_handle_statall_ex(HASH_OF(return_value))) { -+ zval_dtor(return_value); -+ RETURN_NULL(); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void http_persistent_handles_clean([string name]) */ -+PHP_FUNCTION(http_persistent_handles_clean) -+{ -+ char *name_str = NULL; -+ int name_len = 0; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name_str, &name_len)) { -+ http_persistent_handle_cleanup_ex(name_str, name_len, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string http_persistent_handles_ident([string ident]) */ -+PHP_FUNCTION(http_persistent_handles_ident) -+{ -+ char *ident_str = NULL; -+ int ident_len = 0; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &ident_str, &ident_len)) { -+ RETVAL_STRING(zend_ini_string(ZEND_STRS("http.persistent.handles.ident"), 0), 1); -+ if (ident_str && ident_len) { -+ zend_alter_ini_entry(ZEND_STRS("http.persistent.handles.ident"), ident_str, ident_len, ZEND_INI_USER, PHP_INI_STAGE_RUNTIME); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ HAVE_CURL */ -+#ifdef HTTP_HAVE_CURL -+ -+#define RETVAL_RESPONSE_OR_BODY(request) \ -+ { \ -+ zval **bodyonly; \ -+ \ -+ /* check if only the body should be returned */ \ -+ if (options && (SUCCESS == zend_hash_find(Z_ARRVAL_P(options), "bodyonly", sizeof("bodyonly"), (void *) &bodyonly)) && i_zend_is_true(*bodyonly)) { \ -+ http_message *msg = http_message_parse(PHPSTR_VAL(&request.conv.response), PHPSTR_LEN(&request.conv.response)); \ -+ \ -+ if (msg) { \ -+ RETVAL_STRINGL(PHPSTR_VAL(&msg->body), PHPSTR_LEN(&msg->body), 1); \ -+ http_message_free(&msg); \ -+ } \ -+ } else { \ -+ RETVAL_STRINGL(request.conv.response.data, request.conv.response.used, 1); \ -+ } \ -+ } -+ -+/* {{{ proto string http_get(string url[, array options[, array &info]]) -+ Performs an HTTP GET request on the supplied url. */ -+PHP_FUNCTION(http_get) -+{ -+ zval *options = NULL, *info = NULL; -+ char *URL; -+ int URL_len; -+ http_request request; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (info) { -+ zval_dtor(info); -+ array_init(info); -+ } -+ -+ RETVAL_FALSE; -+ -+ http_request_init_ex(&request, NULL, HTTP_GET, URL); -+ if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { -+ http_request_exec(&request); -+ if (info) { -+ http_request_info(&request, Z_ARRVAL_P(info)); -+ } -+ RETVAL_RESPONSE_OR_BODY(request); -+ } -+ http_request_dtor(&request); -+} -+/* }}} */ -+ -+/* {{{ proto string http_head(string url[, array options[, array &info]]) -+ Performs an HTTP HEAD request on the supplied url. */ -+PHP_FUNCTION(http_head) -+{ -+ zval *options = NULL, *info = NULL; -+ char *URL; -+ int URL_len; -+ http_request request; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|a/!z", &URL, &URL_len, &options, &info) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (info) { -+ zval_dtor(info); -+ array_init(info); -+ } -+ -+ RETVAL_FALSE; -+ -+ http_request_init_ex(&request, NULL, HTTP_HEAD, URL); -+ if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { -+ http_request_exec(&request); -+ if (info) { -+ http_request_info(&request, Z_ARRVAL_P(info)); -+ } -+ RETVAL_RESPONSE_OR_BODY(request); -+ } -+ http_request_dtor(&request); -+} -+/* }}} */ -+ -+/* {{{ proto string http_post_data(string url, string data[, array options[, array &info]]) -+ Performs an HTTP POST request on the supplied url. */ -+PHP_FUNCTION(http_post_data) -+{ -+ zval *options = NULL, *info = NULL; -+ char *URL, *postdata; -+ int postdata_len, URL_len; -+ http_request_body body; -+ http_request request; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &postdata, &postdata_len, &options, &info) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (info) { -+ zval_dtor(info); -+ array_init(info); -+ } -+ -+ RETVAL_FALSE; -+ -+ http_request_init_ex(&request, NULL, HTTP_POST, URL); -+ request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, postdata, postdata_len, 0); -+ if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { -+ http_request_exec(&request); -+ if (info) { -+ http_request_info(&request, Z_ARRVAL_P(info)); -+ } -+ RETVAL_RESPONSE_OR_BODY(request); -+ } -+ http_request_dtor(&request); -+} -+/* }}} */ -+ -+/* {{{ proto string http_post_fields(string url, array data[, array files[, array options[, array &info]]]) -+ Performs an HTTP POST request on the supplied url. */ -+PHP_FUNCTION(http_post_fields) -+{ -+ zval *options = NULL, *info = NULL, *fields = NULL, *files = NULL; -+ char *URL; -+ int URL_len; -+ http_request_body body; -+ http_request request; -+ -+ if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sa!|a!a/!z", &URL, &URL_len, &fields, &files, &options, &info) != SUCCESS) { -+ RETURN_FALSE; -+ } -+ -+ if (!http_request_body_fill(&body, fields ? Z_ARRVAL_P(fields) : NULL, files ? Z_ARRVAL_P(files) : NULL)) { -+ RETURN_FALSE; -+ } -+ -+ if (info) { -+ zval_dtor(info); -+ array_init(info); -+ } -+ -+ RETVAL_FALSE; -+ -+ http_request_init_ex(&request, NULL, HTTP_POST, URL); -+ request.body = &body; -+ if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { -+ http_request_exec(&request); -+ if (info) { -+ http_request_info(&request, Z_ARRVAL_P(info)); -+ } -+ RETVAL_RESPONSE_OR_BODY(request); -+ } -+ http_request_dtor(&request); -+} -+/* }}} */ -+ -+/* {{{ proto string http_put_file(string url, string file[, array options[, array &info]]) -+ Performs an HTTP PUT request on the supplied url. */ -+PHP_FUNCTION(http_put_file) -+{ -+ char *URL, *file; -+ int URL_len, f_len; -+ zval *options = NULL, *info = NULL; -+ php_stream *stream; -+ php_stream_statbuf ssb; -+ http_request_body body; -+ http_request request; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &file, &f_len, &options, &info)) { -+ RETURN_FALSE; -+ } -+ -+ if (!(stream = php_stream_open_wrapper_ex(file, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT))) { -+ RETURN_FALSE; -+ } -+ if (php_stream_stat(stream, &ssb)) { -+ php_stream_close(stream); -+ RETURN_FALSE; -+ } -+ -+ if (info) { -+ zval_dtor(info); -+ array_init(info); -+ } -+ -+ RETVAL_FALSE; -+ -+ http_request_init_ex(&request, NULL, HTTP_PUT, URL); -+ request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); -+ if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { -+ http_request_exec(&request); -+ if (info) { -+ http_request_info(&request, Z_ARRVAL_P(info)); -+ } -+ RETVAL_RESPONSE_OR_BODY(request); -+ } -+ http_request_dtor(&request); -+} -+/* }}} */ -+ -+/* {{{ proto string http_put_stream(string url, resource stream[, array options[, array &info]]) -+ Performs an HTTP PUT request on the supplied url. */ -+PHP_FUNCTION(http_put_stream) -+{ -+ zval *resource, *options = NULL, *info = NULL; -+ char *URL; -+ int URL_len; -+ php_stream *stream; -+ php_stream_statbuf ssb; -+ http_request_body body; -+ http_request request; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sr|a/!z", &URL, &URL_len, &resource, &options, &info)) { -+ RETURN_FALSE; -+ } -+ -+ php_stream_from_zval(stream, &resource); -+ if (php_stream_stat(stream, &ssb)) { -+ RETURN_FALSE; -+ } -+ -+ if (info) { -+ zval_dtor(info); -+ array_init(info); -+ } -+ -+ RETVAL_FALSE; -+ -+ http_request_init_ex(&request, NULL, HTTP_PUT, URL); -+ request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 0); -+ if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { -+ http_request_exec(&request); -+ if (info) { -+ http_request_info(&request, Z_ARRVAL_P(info)); -+ } -+ RETVAL_RESPONSE_OR_BODY(request); -+ } -+ http_request_dtor(&request); -+} -+/* }}} */ -+ -+/* {{{ proto string http_put_data(string url, string data[, array options[, array &info]]) -+ Performs an HTTP PUT request on the supplied url. */ -+PHP_FUNCTION(http_put_data) -+{ -+ char *URL, *data; -+ int URL_len, data_len; -+ zval *options = NULL, *info = NULL; -+ http_request_body body; -+ http_request request; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|a/!z", &URL, &URL_len, &data, &data_len, &options, &info)) { -+ RETURN_FALSE; -+ } -+ -+ if (info) { -+ zval_dtor(info); -+ array_init(info); -+ } -+ -+ RETVAL_FALSE; -+ -+ http_request_init_ex(&request, NULL, HTTP_PUT, URL); -+ request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0); -+ if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { -+ http_request_exec(&request); -+ if (info) { -+ http_request_info(&request, Z_ARRVAL_P(info)); -+ } -+ RETVAL_RESPONSE_OR_BODY(request); -+ } -+ http_request_dtor(&request); -+} -+/* }}} */ -+ -+/* {{{ proto string http_request(int method, string url[, string body[, array options[, array &info]]]) -+ Performs a custom HTTP request on the supplied url. */ -+PHP_FUNCTION(http_request) -+{ -+ long meth; -+ char *URL, *data = NULL; -+ int URL_len, data_len = 0; -+ zval *options = NULL, *info = NULL; -+ http_request_body body; -+ http_request request; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ls|sa/!z", &meth, &URL, &URL_len, &data, &data_len, &options, &info)) { -+ RETURN_FALSE; -+ } -+ -+ if (info) { -+ zval_dtor(info); -+ array_init(info); -+ } -+ -+ RETVAL_FALSE; -+ -+ http_request_init_ex(&request, NULL, meth, URL); -+ request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, data, data_len, 0); -+ if (SUCCESS == http_request_prepare(&request, options?Z_ARRVAL_P(options):NULL)) { -+ http_request_exec(&request); -+ if (info) { -+ http_request_info(&request, Z_ARRVAL_P(info)); -+ } -+ RETVAL_RESPONSE_OR_BODY(request); -+ } -+ http_request_dtor(&request); -+} -+/* }}} */ -+ -+/* {{{ proto string http_request_body_encode(array fields, array files) -+ Generate x-www-form-urlencoded resp. form-data encoded request body. */ -+PHP_FUNCTION(http_request_body_encode) -+{ -+ zval *fields = NULL, *files = NULL; -+ HashTable *fields_ht, *files_ht; -+ http_request_body body; -+ char *buf; -+ size_t len; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!a!", &fields, &files)) { -+ RETURN_FALSE; -+ } -+ -+ fields_ht = (fields && Z_TYPE_P(fields) == IS_ARRAY) ? Z_ARRVAL_P(fields) : NULL; -+ files_ht = (files && Z_TYPE_P(files) == IS_ARRAY) ? Z_ARRVAL_P(files) : NULL; -+ if (http_request_body_fill(&body, fields_ht, files_ht) && (SUCCESS == http_request_body_encode(&body, &buf, &len))) { -+ RETVAL_STRINGL(buf, len, 0); -+ } else { -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Could not encode request body"); -+ RETVAL_FALSE; -+ } -+ http_request_body_dtor(&body); -+} -+#endif /* HTTP_HAVE_CURL */ -+/* }}} HAVE_CURL */ -+ -+/* {{{ proto int http_request_method_register(string method) -+ Register a custom request method. */ -+PHP_FUNCTION(http_request_method_register) -+{ -+ char *method; -+ int method_len; -+ ulong existing; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) { -+ RETURN_FALSE; -+ } -+ if ((existing = http_request_method_exists(1, 0, method))) { -+ RETURN_LONG((long) existing); -+ } -+ -+ RETVAL_LONG((long) http_request_method_register(method, method_len)); -+} -+/* }}} */ -+ -+/* {{{ proto bool http_request_method_unregister(mixed method) -+ Unregister a previously registered custom request method. */ -+PHP_FUNCTION(http_request_method_unregister) -+{ -+ zval *method; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) { -+ RETURN_FALSE; -+ } -+ -+ switch (Z_TYPE_P(method)) { -+ case IS_OBJECT: -+ convert_to_string(method); -+ case IS_STRING: -+ if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) { -+ convert_to_long(method); -+ } else { -+ int mn; -+ if (!(mn = http_request_method_exists(1, 0, Z_STRVAL_P(method)))) { -+ RETURN_FALSE; -+ } -+ zval_dtor(method); -+ ZVAL_LONG(method, (long)mn); -+ } -+ case IS_LONG: -+ RETURN_SUCCESS(http_request_method_unregister(Z_LVAL_P(method))); -+ default: -+ RETURN_FALSE; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto int http_request_method_exists(mixed method) -+ Check if a request method is registered (or available by default). */ -+PHP_FUNCTION(http_request_method_exists) -+{ -+ if (return_value_used) { -+ zval *method; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &method)) { -+ RETURN_FALSE; -+ } -+ -+ switch (Z_TYPE_P(method)) { -+ case IS_OBJECT: -+ convert_to_string(method); -+ case IS_STRING: -+ if (is_numeric_string(Z_STRVAL_P(method), Z_STRLEN_P(method), NULL, NULL, 1)) { -+ convert_to_long(method); -+ } else { -+ RETURN_LONG((long) http_request_method_exists(1, 0, Z_STRVAL_P(method))); -+ } -+ case IS_LONG: -+ RETURN_LONG((long) http_request_method_exists(0, (int) Z_LVAL_P(method), NULL)); -+ default: -+ RETURN_FALSE; -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string http_request_method_name(int method) -+ Get the literal string representation of a standard or registered request method. */ -+PHP_FUNCTION(http_request_method_name) -+{ -+ if (return_value_used) { -+ long method; -+ -+ if ((SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &method)) || (method < 0)) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_STRING(estrdup(http_request_method_name((int) method)), 0); -+ } -+} -+/* }}} */ -+ -+/* {{{ */ -+#ifdef HTTP_HAVE_ZLIB -+ -+/* {{{ proto string http_deflate(string data[, int flags = 0]) -+ Compress data with gzip, zlib AKA deflate or raw deflate encoding. */ -+PHP_FUNCTION(http_deflate) -+{ -+ char *data; -+ int data_len; -+ long flags = 0; -+ -+ RETVAL_NULL(); -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &data, &data_len, &flags)) { -+ char *encoded; -+ size_t encoded_len; -+ -+ if (SUCCESS == http_encoding_deflate(flags, data, data_len, &encoded, &encoded_len)) { -+ RETURN_STRINGL(encoded, (int) encoded_len, 0); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string http_inflate(string data) -+ Decompress data compressed with either gzip, deflate AKA zlib or raw deflate encoding. */ -+PHP_FUNCTION(http_inflate) -+{ -+ char *data; -+ int data_len; -+ -+ RETVAL_NULL(); -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len)) { -+ char *decoded; -+ size_t decoded_len; -+ -+ if (SUCCESS == http_encoding_inflate(data, data_len, &decoded, &decoded_len)) { -+ RETURN_STRINGL(decoded, (int) decoded_len, 0); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string ob_deflatehandler(string data, int mode) -+ For use with ob_start(). The deflate output buffer handler can only be used once. */ -+PHP_FUNCTION(ob_deflatehandler) -+{ -+ char *data; -+ int data_len; -+ long mode; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &data, &data_len, &mode)) { -+ RETURN_FALSE; -+ } -+ -+ http_ob_deflatehandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode); -+ Z_TYPE_P(return_value) = Z_STRVAL_P(return_value) ? IS_STRING : IS_NULL; -+} -+/* }}} */ -+ -+/* {{{ proto string ob_inflatehandler(string data, int mode) -+ For use with ob_start(). Same restrictions as with ob_deflatehandler apply. */ -+PHP_FUNCTION(ob_inflatehandler) -+{ -+ char *data; -+ int data_len; -+ long mode; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &data, &data_len, &mode)) { -+ RETURN_FALSE; -+ } -+ -+ http_ob_inflatehandler(data, data_len, &Z_STRVAL_P(return_value), (uint *) &Z_STRLEN_P(return_value), mode); -+ Z_TYPE_P(return_value) = Z_STRVAL_P(return_value) ? IS_STRING : IS_NULL; -+} -+/* }}} */ -+ -+#endif /* HTTP_HAVE_ZLIB */ -+/* }}} */ -+ -+/* {{{ proto int http_support([int feature = 0]) -+ Check for feature that require external libraries. */ -+PHP_FUNCTION(http_support) -+{ -+ long feature = 0; -+ -+ RETVAL_LONG(0L); -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &feature)) { -+ RETVAL_LONG(http_support(feature)); -+ } -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_headers_api.c -@@ -0,0 +1,534 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_headers_api.c 300300 2010-06-09 07:29:35Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#include "php_http.h" -+ -+#include "ext/standard/url.h" -+#include "ext/standard/php_string.h" -+ -+#include "php_http_api.h" -+#include "php_http_headers_api.h" -+ -+#ifndef HTTP_DBG_NEG -+# define HTTP_DBG_NEG 0 -+#endif -+ -+/* {{{ static void http_grab_response_headers(void *, void *) */ -+static void http_grab_response_headers(void *data, void *arg TSRMLS_DC) -+{ -+ phpstr_appendl(PHPSTR(arg), ((sapi_header_struct *)data)->header); -+ phpstr_appends(PHPSTR(arg), HTTP_CRLF); -+} -+/* }}} */ -+ -+/* {{{ static int http_sort_q(const void *, const void *) */ -+static int http_sort_q(const void *a, const void *b TSRMLS_DC) -+{ -+ Bucket *f, *s; -+ zval result, *first, *second; -+ -+ f = *((Bucket **) a); -+ s = *((Bucket **) b); -+ -+ first = *((zval **) f->pData); -+ second= *((zval **) s->pData); -+ -+ if (numeric_compare_function(&result, first, second TSRMLS_CC) != SUCCESS) { -+ return 0; -+ } -+ return (Z_LVAL(result) > 0 ? -1 : (Z_LVAL(result) < 0 ? 1 : 0)); -+} -+/* }}} */ -+ -+/* {{{ char *http_negotiate_language_func */ -+char *_http_negotiate_language_func(const char *test, double *quality, HashTable *supported TSRMLS_DC) -+{ -+ zval **value; -+ HashPosition pos; -+ const char *dash_test; -+ -+ FOREACH_HASH_VAL(pos, supported, value) { -+#if HTTP_DBG_NEG -+ fprintf(stderr, "strcasecmp('%s', '%s')\n", Z_STRVAL_PP(value), test); -+#endif -+ if (!strcasecmp(Z_STRVAL_PP(value), test)) { -+ return Z_STRVAL_PP(value); -+ } -+ } -+ -+ /* no distinct match found, so try primaries */ -+ if ((dash_test = strchr(test, '-'))) { -+ FOREACH_HASH_VAL(pos, supported, value) { -+ int len = dash_test - test; -+#if HTTP_DBG_NEG -+ fprintf(stderr, "strncasecmp('%s', '%s', %d)\n", Z_STRVAL_PP(value), test, len); -+#endif -+ if ( (!strncasecmp(Z_STRVAL_PP(value), test, len)) && -+ ( (Z_STRVAL_PP(value)[len] == '\0') || -+ (Z_STRVAL_PP(value)[len] == '-'))) { -+ *quality *= .9; -+ return Z_STRVAL_PP(value); -+ } -+ } -+ } -+ -+ return NULL; -+} -+/* }}} */ -+ -+/* {{{ char *http_negotiate_default_func */ -+char *_http_negotiate_default_func(const char *test, double *quality, HashTable *supported TSRMLS_DC) -+{ -+ zval **value; -+ HashPosition pos; -+ -+ FOREACH_HASH_VAL(pos, supported, value) { -+#if HTTP_DBG_NEG -+ fprintf(stderr, "strcasecmp('%s', '%s')\n", Z_STRVAL_PP(value), test); -+#endif -+ if (!strcasecmp(Z_STRVAL_PP(value), test)) { -+ return Z_STRVAL_PP(value); -+ } -+ } -+ -+ return NULL; -+} -+/* }}} */ -+ -+/* {{{ HashTable *http_negotiate_z(zval *, HashTable *, negotiate_func_t) */ -+PHP_HTTP_API HashTable *_http_negotiate_z(zval *value, HashTable *supported, negotiate_func_t neg TSRMLS_DC) -+{ -+ zval *accept = http_zsep(IS_STRING, value); -+ HashTable *result = NULL; -+ -+ if (Z_STRLEN_P(accept)) { -+ zval ex_arr, ex_del; -+ -+ INIT_PZVAL(&ex_del); -+ INIT_PZVAL(&ex_arr); -+ ZVAL_STRINGL(&ex_del, ",", 1, 0); -+ array_init(&ex_arr); -+ -+ php_explode(&ex_del, accept, &ex_arr, INT_MAX); -+ -+ if (zend_hash_num_elements(Z_ARRVAL(ex_arr)) > 0) { -+ int i = 0; -+ HashPosition pos; -+ zval **entry, array; -+ -+ INIT_PZVAL(&array); -+ array_init(&array); -+ -+ FOREACH_HASH_VAL(pos, Z_ARRVAL(ex_arr), entry) { -+ int ident_len; -+ double quality; -+ char *selected, *identifier, *freeme; -+ const char *separator; -+ -+#if HTTP_DBG_NEG -+ fprintf(stderr, "Checking %s\n", Z_STRVAL_PP(entry)); -+#endif -+ -+ if ((separator = strchr(Z_STRVAL_PP(entry), ';'))) { -+ const char *ptr = separator; -+ -+ while (*++ptr && !HTTP_IS_CTYPE(digit, *ptr) && '.' != *ptr); -+ -+ quality = zend_strtod(ptr, NULL); -+ identifier = estrndup(Z_STRVAL_PP(entry), ident_len = separator - Z_STRVAL_PP(entry)); -+ } else { -+ quality = 1000.0 - i++; -+ identifier = estrndup(Z_STRVAL_PP(entry), ident_len = Z_STRLEN_PP(entry)); -+ } -+ freeme = identifier; -+ -+ while (HTTP_IS_CTYPE(space, *identifier)) { -+ ++identifier; -+ --ident_len; -+ } -+ while (ident_len && HTTP_IS_CTYPE(space, identifier[ident_len - 1])) { -+ identifier[--ident_len] = '\0'; -+ } -+ -+ if ((selected = neg(identifier, &quality, supported TSRMLS_CC))) { -+ /* don't overwrite previously set with higher quality */ -+ if (!zend_hash_exists(Z_ARRVAL(array), selected, strlen(selected) + 1)) { -+ add_assoc_double(&array, selected, quality); -+ } -+ } -+ -+ efree(freeme); -+ } -+ -+ result = Z_ARRVAL(array); -+ zend_hash_sort(result, zend_qsort, http_sort_q, 0 TSRMLS_CC); -+ } -+ -+ zval_dtor(&ex_arr); -+ } -+ -+ zval_ptr_dtor(&accept); -+ -+ return result; -+} -+/* }}} */ -+ -+/* {{{ HashTable *http_negotiate_q(const char *, HashTable *, negotiate_func_t) */ -+PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *supported, negotiate_func_t neg TSRMLS_DC) -+{ -+ zval *accept; -+ -+#if HTTP_DBG_NEG -+ fprintf(stderr, "Reading header %s: ", header); -+#endif -+ if (!(accept = http_get_server_var(header, 1))) { -+ return NULL; -+ } -+#if HTTP_DBG_NEG -+ fprintf(stderr, "%s\n", Z_STRVAL_P(accept)); -+#endif -+ -+ return http_negotiate_z(accept, supported, neg); -+} -+/* }}} */ -+ -+/* {{{ http_range_status http_get_request_ranges(HashTable *ranges, size_t) */ -+PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_t length TSRMLS_DC) -+{ -+ zval *zrange; -+ char *range, c; -+ long begin = -1, end = -1, *ptr; -+ -+ if ( !(zrange = http_get_server_var("HTTP_RANGE", 1)) || -+ (size_t) Z_STRLEN_P(zrange) < lenof("bytes=") || strncmp(Z_STRVAL_P(zrange), "bytes=", lenof("bytes="))) { -+ return RANGE_NO; -+ } -+ range = Z_STRVAL_P(zrange) + lenof("bytes="); -+ ptr = &begin; -+ -+ do { -+ switch (c = *(range++)) { -+ case '0': -+ /* allow 000... - shall we? */ -+ if (*ptr != -10) { -+ *ptr *= 10; -+ } -+ break; -+ -+ case '1': case '2': case '3': -+ case '4': case '5': case '6': -+ case '7': case '8': case '9': -+ /* -+ * If the value of the pointer is already set (non-negative) -+ * then multiply its value by ten and add the current value, -+ * else initialise the pointers value with the current value -+ * -- -+ * This let us recognize empty fields when validating the -+ * ranges, i.e. a "-10" for begin and "12345" for the end -+ * was the following range request: "Range: bytes=0-12345"; -+ * While a "-1" for begin and "12345" for the end would -+ * have been: "Range: bytes=-12345". -+ */ -+ if (*ptr > 0) { -+ *ptr *= 10; -+ *ptr += c - '0'; -+ } else { -+ *ptr = c - '0'; -+ } -+ break; -+ -+ case '-': -+ ptr = &end; -+ break; -+ -+ case ' ': -+ break; -+ -+ case 0: -+ case ',': -+ -+ if (length) { -+ /* validate ranges */ -+ switch (begin) { -+ /* "0-12345" */ -+ case -10: -+ switch (end) { -+ /* "0-" */ -+ case -1: -+ return RANGE_NO; -+ -+ /* "0-0" */ -+ case -10: -+ end = 0; -+ break; -+ -+ default: -+ if (length <= (size_t) end) { -+ return RANGE_ERR; -+ } -+ break; -+ } -+ begin = 0; -+ break; -+ -+ /* "-12345" */ -+ case -1: -+ /* "-", "-0" or overflow */ -+ if (end == -1 || end == -10 || length <= (size_t) end) { -+ return RANGE_ERR; -+ } -+ begin = length - end; -+ end = length - 1; -+ break; -+ -+ /* "12345-(xxx)" */ -+ default: -+ switch (end) { -+ /* "12345-0" */ -+ case -10: -+ return RANGE_ERR; -+ -+ /* "12345-" */ -+ case -1: -+ if (length <= (size_t) begin) { -+ return RANGE_ERR; -+ } -+ end = length - 1; -+ break; -+ -+ /* "12345-67890" */ -+ default: -+ if ( (length <= (size_t) begin) || -+ (length <= (size_t) end) || -+ (end < begin)) { -+ return RANGE_ERR; -+ } -+ break; -+ } -+ break; -+ } -+ } -+ { -+ zval *zentry; -+ MAKE_STD_ZVAL(zentry); -+ array_init(zentry); -+ add_index_long(zentry, 0, begin); -+ add_index_long(zentry, 1, end); -+ zend_hash_next_index_insert(ranges, &zentry, sizeof(zval *), NULL); -+ -+ begin = -1; -+ end = -1; -+ ptr = &begin; -+ } -+ break; -+ -+ default: -+ return RANGE_NO; -+ } -+ } while (c != 0); -+ -+ return RANGE_OK; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_parse_headers(char *, HashTable *, zend_bool) */ -+PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify, -+ http_info_callback callback_func, void **callback_data TSRMLS_DC) -+{ -+ const char *colon = NULL, *line = NULL; -+ zval array; -+ -+ INIT_ZARR(array, headers); -+ -+ /* skip leading ws */ -+ while (HTTP_IS_CTYPE(space, *header)) ++header; -+ line = header; -+ -+#define MORE_HEADERS (*(line-1) && !(*(line-1) == '\n' && (*line == '\n' || *line == '\r'))) -+ do { -+ int value_len = 0; -+ -+ switch (*line++) { -+ case ':': -+ if (!colon) { -+ colon = line - 1; -+ } -+ break; -+ -+ case 0: -+ --value_len; /* we don't have CR so value length is one char less */ -+ case '\n': -+ if ((!*(line - 1)) || ((*line != ' ') && (*line != '\t'))) { -+ http_info i; -+ -+ if (SUCCESS == http_info_parse(header, &i)) { -+ /* response/request line */ -+ callback_func(callback_data, &headers, &i TSRMLS_CC); -+ http_info_dtor(&i); -+ Z_ARRVAL(array) = headers; -+ } else if (colon) { -+ /* "header: value" pair */ -+ if (header != colon) { -+ int keylen = colon - header; -+ const char *key = header; -+ -+ /* skip leading ws */ -+ while (keylen && HTTP_IS_CTYPE(space, *key)) --keylen, ++key; -+ /* skip trailing ws */ -+ while (keylen && HTTP_IS_CTYPE(space, key[keylen - 1])) --keylen; -+ -+ if (keylen > 0) { -+ zval **previous = NULL; -+ char *value; -+ char *keydup = estrndup(key, keylen); -+ -+ if (prettify) { -+ keydup = pretty_key(keydup, keylen, 1, 1); -+ } -+ -+ value_len += line - colon - 1; -+ -+ /* skip leading ws */ -+ while (HTTP_IS_CTYPE(space, *(++colon))) --value_len; -+ /* skip trailing ws */ -+ while (HTTP_IS_CTYPE(space, colon[value_len - 1])) --value_len; -+ -+ if (value_len > 0) { -+ value = estrndup(colon, value_len); -+ } else { -+ value = estrdup(""); -+ value_len = 0; -+ } -+ -+ /* if we already have got such a header make an array of those */ -+ if (SUCCESS == zend_hash_find(headers, keydup, keylen + 1, (void *) &previous)) { -+ /* convert to array */ -+ if (Z_TYPE_PP(previous) != IS_ARRAY) { -+ convert_to_array(*previous); -+ } -+ add_next_index_stringl(*previous, value, value_len, 0); -+ } else { -+ add_assoc_stringl(&array, keydup, value, value_len, 0); -+ } -+ efree(keydup); -+ } else { -+ /* empty key (" : ...") */ -+ return FAILURE; -+ } -+ } else { -+ /* empty key (": ...") */ -+ return FAILURE; -+ } -+ } else if (MORE_HEADERS) { -+ /* a line without a colon */ -+ return FAILURE; -+ } -+ colon = NULL; -+ value_len = 0; -+ header += line - header; -+ } -+ break; -+ } -+ } while (MORE_HEADERS); -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ void http_get_request_headers(HashTable *) */ -+PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC) -+{ -+ HashKey key = initHashKey(0); -+ zval **hsv, **header; -+ HashPosition pos; -+ -+ if (!HTTP_G->request.headers) { -+ ALLOC_HASHTABLE(HTTP_G->request.headers); -+ zend_hash_init(HTTP_G->request.headers, 0, NULL, ZVAL_PTR_DTOR, 0); -+ -+#ifdef ZEND_ENGINE_2 -+ zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC); -+#endif -+ -+ if (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &hsv) && Z_TYPE_PP(hsv) == IS_ARRAY) { -+ FOREACH_KEY(pos, *hsv, key) { -+ if (key.type == HASH_KEY_IS_STRING && key.len > 6 && !strncmp(key.str, "HTTP_", 5)) { -+ key.len -= 5; -+ key.str = pretty_key(estrndup(key.str + 5, key.len - 1), key.len - 1, 1, 1); -+ -+ zend_hash_get_current_data_ex(Z_ARRVAL_PP(hsv), (void *) &header, &pos); -+ ZVAL_ADDREF(*header); -+ zend_hash_add(HTTP_G->request.headers, key.str, key.len, (void *) header, sizeof(zval *), NULL); -+ -+ efree(key.str); -+ } -+ } -+ } -+ } -+ -+ if (headers) { -+ zend_hash_copy(headers, HTTP_G->request.headers, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ } -+} -+/* }}} */ -+ -+/* {{{ STATUS http_get_response_headers(HashTable *) */ -+PHP_HTTP_API STATUS _http_get_response_headers(HashTable *headers_ht TSRMLS_DC) -+{ -+ STATUS status; -+ phpstr headers; -+ -+ phpstr_init(&headers); -+ zend_llist_apply_with_argument(&SG(sapi_headers).headers, http_grab_response_headers, &headers TSRMLS_CC); -+ phpstr_fix(&headers); -+ -+ status = http_parse_headers_ex(PHPSTR_VAL(&headers), headers_ht, 1); -+ phpstr_dtor(&headers); -+ -+ return status; -+} -+/* }}} */ -+ -+/* {{{ zend_bool http_match_request_header(char *, char *) */ -+PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const char *value, zend_bool match_case TSRMLS_DC) -+{ -+ char *name; -+ uint name_len = strlen(header); -+ zend_bool result = 0; -+ zval **data, *zvalue; -+ -+ http_get_request_headers(NULL); -+ name = pretty_key(estrndup(header, name_len), name_len, 1, 1); -+ if (SUCCESS == zend_hash_find(HTTP_G->request.headers, name, name_len+1, (void *) &data)) { -+ zvalue = http_zsep(IS_STRING, *data); -+ result = (match_case ? strcmp(Z_STRVAL_P(zvalue), value) : strcasecmp(Z_STRVAL_P(zvalue), value)) ? 0 : 1; -+ zval_ptr_dtor(&zvalue); -+ } -+ efree(name); -+ -+ return result; -+} -+/* }}} */ -+ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_inflatestream_object.c -@@ -0,0 +1,292 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_inflatestream_object.c 300299 2010-06-09 06:23:16Z mike $ */ -+ -+#define HTTP_WANT_ZLIB -+#include "php_http.h" -+ -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_ZLIB) -+ -+#include "php_http_api.h" -+#include "php_http_encoding_api.h" -+#include "php_http_exception_object.h" -+#include "php_http_inflatestream_object.h" -+ -+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpInflateStream, method, 0, req_args) -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpInflateStream, method, 0) -+#define HTTP_INFLATE_ME(method, visibility) PHP_ME(HttpInflateStream, method, HTTP_ARGS(HttpInflateStream, method), visibility) -+ -+HTTP_BEGIN_ARGS(__construct, 0) -+ HTTP_ARG_VAL(flags, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(factory, 0) -+ HTTP_ARG_VAL(flags, 0) -+ HTTP_ARG_VAL(class_name, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(update, 1) -+ HTTP_ARG_VAL(data, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(flush, 0) -+ HTTP_ARG_VAL(data, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(finish, 0) -+ HTTP_ARG_VAL(data, 0) -+HTTP_END_ARGS; -+ -+#define THIS_CE http_inflatestream_object_ce -+zend_class_entry *http_inflatestream_object_ce; -+zend_function_entry http_inflatestream_object_fe[] = { -+ HTTP_INFLATE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -+ HTTP_INFLATE_ME(update, ZEND_ACC_PUBLIC) -+ HTTP_INFLATE_ME(flush, ZEND_ACC_PUBLIC) -+ HTTP_INFLATE_ME(finish, ZEND_ACC_PUBLIC) -+ -+ HTTP_INFLATE_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+ -+ EMPTY_FUNCTION_ENTRY -+}; -+static zend_object_handlers http_inflatestream_object_handlers; -+ -+PHP_MINIT_FUNCTION(http_inflatestream_object) -+{ -+ HTTP_REGISTER_CLASS_EX(HttpInflateStream, http_inflatestream_object, NULL, 0); -+ http_inflatestream_object_handlers.clone_obj = _http_inflatestream_object_clone_obj; -+ -+#ifndef WONKY -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("FLUSH_NONE")-1, HTTP_ENCODING_STREAM_FLUSH_NONE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("FLUSH_SYNC")-1, HTTP_ENCODING_STREAM_FLUSH_SYNC TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("FLUSH_FULL")-1, HTTP_ENCODING_STREAM_FLUSH_FULL TSRMLS_CC); -+#endif -+ -+ return SUCCESS; -+} -+ -+zend_object_value _http_inflatestream_object_new(zend_class_entry *ce TSRMLS_DC) -+{ -+ return http_inflatestream_object_new_ex(ce, NULL, NULL); -+} -+ -+zend_object_value _http_inflatestream_object_new_ex(zend_class_entry *ce, http_encoding_stream *s, http_inflatestream_object **ptr TSRMLS_DC) -+{ -+ zend_object_value ov; -+ http_inflatestream_object *o; -+ -+ o = ecalloc(1, sizeof(http_inflatestream_object)); -+ o->zo.ce = ce; -+ -+ if (ptr) { -+ *ptr = o; -+ } -+ -+ if (s) { -+ o->stream = s; -+ } -+ -+ ALLOC_HASHTABLE(OBJ_PROP(o)); -+ zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ -+ ov.handle = putObject(http_inflatestream_object, o); -+ ov.handlers = &http_inflatestream_object_handlers; -+ -+ return ov; -+} -+ -+zend_object_value _http_inflatestream_object_clone_obj(zval *this_ptr TSRMLS_DC) -+{ -+ http_encoding_stream *s; -+ zend_object_value new_ov; -+ http_inflatestream_object *new_obj = NULL; -+ getObject(http_inflatestream_object, old_obj); -+ -+ s = ecalloc(1, sizeof(http_encoding_stream)); -+ s->flags = old_obj->stream->flags; -+ inflateCopy(&s->stream, &old_obj->stream->stream); -+ s->stream.opaque = phpstr_dup(s->stream.opaque); -+ -+ new_ov = http_inflatestream_object_new_ex(old_obj->zo.ce, s, &new_obj); -+ zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); -+ -+ return new_ov; -+} -+ -+void _http_inflatestream_object_free(zend_object *object TSRMLS_DC) -+{ -+ http_inflatestream_object *o = (http_inflatestream_object *) object; -+ -+ if (o->stream) { -+ http_encoding_inflate_stream_free(&o->stream); -+ } -+ freeObject(o); -+} -+ -+/* {{{ proto void HttpInflateStream::__construct([int flags = 0]) -+ Creates a new HttpInflateStream object instance. */ -+PHP_METHOD(HttpInflateStream, __construct) -+{ -+ long flags = 0; -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|l", &flags)) { -+ getObject(http_inflatestream_object, obj); -+ -+ if (!obj->stream) { -+ obj->stream = http_encoding_inflate_stream_init(NULL, flags & 0x0fffffff); -+ } else { -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "HttpInflateStream cannot be initialized twice"); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto HttpInflateStream HttpInflateStream::factory([int flags[, string class = "HttpInflateStream"]]) -+ Creates a new HttpInflateStream object instance. */ -+PHP_METHOD(HttpInflateStream, factory) -+{ -+ long flags = 0; -+ char *cn = NULL; -+ int cl = 0; -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ls", &flags, &cn, &cl)) { -+ zend_object_value ov; -+ http_encoding_stream *s = http_encoding_inflate_stream_init(NULL, flags & 0x0fffffff); -+ -+ if (SUCCESS == http_object_new(&ov, cn, cl, _http_inflatestream_object_new_ex, http_inflatestream_object_ce, s, NULL)) { -+ RETVAL_OBJVAL(ov, 0); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto string HttpInflateStream::update(string data) -+ Passes more data through the inflate stream. */ -+PHP_METHOD(HttpInflateStream, update) -+{ -+ int data_len; -+ size_t decoded_len = 0; -+ char *data, *decoded = NULL; -+ getObject(http_inflatestream_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (!data_len) { -+ RETURN_STRING("", 1); -+ } -+ -+ if (!obj->stream && !(obj->stream = http_encoding_inflate_stream_init(NULL, 0))) { -+ RETURN_FALSE; -+ } -+ -+ if (SUCCESS == http_encoding_inflate_stream_update(obj->stream, data, data_len, &decoded, &decoded_len)) { -+ RETURN_STRINGL(decoded, decoded_len, 0); -+ } else { -+ RETURN_FALSE; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpInflateStream::flush([string data]) -+ Flush the inflate stream. */ -+PHP_METHOD(HttpInflateStream, flush) -+{ -+ int data_len = 0; -+ size_t decoded_len = 0; -+ char *decoded = NULL, *data = NULL; -+ getObject(http_inflatestream_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (!obj->stream && !(obj->stream = http_encoding_inflate_stream_init(NULL, 0))) { -+ RETURN_FALSE; -+ } -+ -+ /* flushing the inflate stream is a no-op */ -+ if (!data_len) { -+ RETURN_STRINGL("", 0, 1); -+ } else if (SUCCESS == http_encoding_inflate_stream_update(obj->stream, data, data_len, &decoded, &decoded_len)) { -+ RETURN_STRINGL(decoded, decoded_len, 0); -+ } else { -+ RETURN_FALSE; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpInflateStream::finish([string data]) -+ Finalizes the inflate stream. The inflate stream can be reused after finalizing. */ -+PHP_METHOD(HttpInflateStream, finish) -+{ -+ int data_len = 0; -+ size_t updated_len = 0, decoded_len = 0; -+ char *updated = NULL, *decoded = NULL, *data = NULL; -+ getObject(http_inflatestream_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (!obj->stream && !(obj->stream = http_encoding_inflate_stream_init(NULL, 0))) { -+ RETURN_FALSE; -+ } -+ -+ if (data_len) { -+ if (SUCCESS != http_encoding_inflate_stream_update(obj->stream, data, data_len, &updated, &updated_len)) { -+ RETURN_FALSE; -+ } -+ } -+ -+ if (SUCCESS == http_encoding_inflate_stream_finish(obj->stream, &decoded, &decoded_len)) { -+ if (updated_len) { -+ updated = erealloc(updated, updated_len + decoded_len + 1); -+ updated[updated_len + decoded_len] = '\0'; -+ memcpy(updated + updated_len, decoded, decoded_len); -+ STR_FREE(decoded); -+ updated_len += decoded_len; -+ RETVAL_STRINGL(updated, updated_len, 0); -+ } else if (decoded) { -+ STR_FREE(updated); -+ RETVAL_STRINGL(decoded, decoded_len, 0); -+ } else { -+ RETVAL_NULL(); -+ } -+ } else { -+ STR_FREE(updated); -+ RETVAL_FALSE; -+ } -+ -+ http_encoding_inflate_stream_dtor(obj->stream); -+ http_encoding_inflate_stream_init(obj->stream, obj->stream->flags); -+} -+/* }}} */ -+ -+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_ZLIB*/ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_info_api.c -@@ -0,0 +1,155 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_info_api.c 304921 2010-10-26 15:27:36Z iliaa $ */ -+ -+#include "php_http.h" -+ -+#include "php_http_api.h" -+#include "php_http_info_api.h" -+ -+PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **headers, http_info *info TSRMLS_DC) -+{ -+ zval array; -+ -+ INIT_ZARR(array, *headers); -+ -+ switch (info->type) { -+ case IS_HTTP_REQUEST: -+ add_assoc_string(&array, "Request Method", HTTP_INFO(info).request.method, 1); -+ add_assoc_string(&array, "Request Url", HTTP_INFO(info).request.url, 1); -+ break; -+ -+ case IS_HTTP_RESPONSE: -+ add_assoc_long(&array, "Response Code", (long) HTTP_INFO(info).response.code); -+ if (HTTP_INFO(info).response.status) { -+ add_assoc_string(&array, "Response Status", HTTP_INFO(info).response.status, 1); -+ } -+ break; -+ } -+} -+ -+PHP_HTTP_API void _http_info_dtor(http_info *i) -+{ -+ switch (i->type) { -+ case IS_HTTP_REQUEST: -+ STR_SET(HTTP_INFO(i).request.method, NULL); -+ STR_SET(HTTP_INFO(i).request.url, NULL); -+ break; -+ -+ case IS_HTTP_RESPONSE: -+ STR_SET(HTTP_INFO(i).response.status, NULL); -+ break; -+ -+ default: -+ break; -+ } -+} -+ -+PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info, zend_bool silent TSRMLS_DC) -+{ -+ const char *end, *http; -+ -+ /* sane parameter */ -+ if ((!pre_header) || (!*pre_header)) { -+ return FAILURE; -+ } -+ -+ /* where's the end of the line */ -+ if (!(end = http_locate_eol(pre_header, NULL))) { -+ end = pre_header + strlen(pre_header); -+ } -+ -+ /* there must be HTTP/1.x in the line */ -+ if (!(http = http_locate_str(pre_header, end - pre_header, "HTTP/1.", lenof("HTTP/1.")))) { -+ return FAILURE; -+ } -+ -+ /* and nothing than SPACE or NUL after HTTP/1.x */ -+ if ( (!HTTP_IS_CTYPE(digit, http[lenof("HTTP/1.")])) || -+ (http[lenof("HTTP/1.1")] && (!HTTP_IS_CTYPE(space, http[lenof("HTTP/1.1")])))) { -+ if (!silent) { -+ http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid HTTP/1.x protocol identification"); -+ } -+ return FAILURE; -+ } -+ -+#if 0 -+ { -+ char *line = estrndup(pre_header, end - pre_header); -+ fprintf(stderr, "http_parse_info('%s')\n", line); -+ efree(line); -+ } -+#endif -+ -+ info->http.version = zend_strtod(http + lenof("HTTP/"), NULL); -+ -+ /* is response */ -+ if (pre_header == http) { -+ char *status = NULL; -+ const char *code = http + sizeof("HTTP/1.1"); -+ -+ info->type = IS_HTTP_RESPONSE; -+ while (' ' == *code) ++code; -+ if (code && end > code) { -+ HTTP_INFO(info).response.code = strtol(code, &status, 10); -+ } else { -+ HTTP_INFO(info).response.code = 0; -+ } -+ if (status && end > status) { -+ while (' ' == *status) ++status; -+ HTTP_INFO(info).response.status = estrndup(status, end - status); -+ } else { -+ HTTP_INFO(info).response.status = NULL; -+ } -+ -+ return SUCCESS; -+ } -+ -+ /* is request */ -+ else if (!http[lenof("HTTP/1.x")] || http[lenof("HTTP/1.x")] == '\r' || http[lenof("HTTP/1.x")] == '\n') { -+ const char *url = strchr(pre_header, ' '); -+ -+ info->type = IS_HTTP_REQUEST; -+ if (url && http > url) { -+ HTTP_INFO(info).request.method = estrndup(pre_header, url - pre_header); -+ while (' ' == *url) ++url; -+ while (' ' == *(http-1)) --http; -+ if (http > url) { -+ HTTP_INFO(info).request.url = estrndup(url, http - url); -+ } else { -+ efree(HTTP_INFO(info).request.method); -+ return FAILURE; -+ } -+ } else { -+ HTTP_INFO(info).request.method = NULL; -+ HTTP_INFO(info).request.url = NULL; -+ } -+ -+ return SUCCESS; -+ } -+ -+ /* some darn header containing HTTP/1.x */ -+ else { -+ return FAILURE; -+ } -+} -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_message_api.c -@@ -0,0 +1,735 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_message_api.c 298689 2010-04-28 06:50:06Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#define HTTP_WANT_CURL -+#define HTTP_WANT_ZLIB -+#include "php_http.h" -+ -+#include "php_http_api.h" -+#include "php_http_encoding_api.h" -+#include "php_http_headers_api.h" -+#include "php_http_message_api.h" -+#include "php_http_request_api.h" -+#include "php_http_send_api.h" -+#include "php_http_url_api.h" -+ -+#define http_message_info_callback _http_message_info_callback -+static void _http_message_info_callback(http_message **message, HashTable **headers, http_info *info TSRMLS_DC) -+{ -+ http_message *old = *message; -+ -+ /* advance message */ -+ if (old->type || zend_hash_num_elements(&old->hdrs) || PHPSTR_LEN(old)) { -+ (*message) = http_message_new(); -+ (*message)->parent = old; -+ (*headers) = &((*message)->hdrs); -+ } -+ -+ http_message_set_info(*message, info); -+} -+ -+#define http_message_init_type _http_message_init_type -+static inline void _http_message_init_type(http_message *message, http_message_type type) -+{ -+ message->http.version = .0; -+ -+ switch (message->type = type) { -+ case HTTP_MSG_RESPONSE: -+ message->http.info.response.code = 0; -+ message->http.info.response.status = NULL; -+ break; -+ -+ case HTTP_MSG_REQUEST: -+ message->http.info.request.method = NULL; -+ message->http.info.request.url = NULL; -+ break; -+ -+ case HTTP_MSG_NONE: -+ default: -+ break; -+ } -+} -+ -+PHP_HTTP_API http_message *_http_message_init_ex(http_message *message, http_message_type type ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) -+{ -+ if (!message) { -+ message = ecalloc_rel(1, sizeof(http_message)); -+ } -+ -+ http_message_init_type(message, type); -+ message->parent = NULL; -+ phpstr_init(&message->body); -+ zend_hash_init(&message->hdrs, 0, NULL, ZVAL_PTR_DTOR, 0); -+ -+ return message; -+} -+ -+PHP_HTTP_API http_message *_http_message_init_env(http_message *message, http_message_type type TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC) -+{ -+ int free_msg; -+ http_info inf; -+ zval *sval, tval; -+ char *body_str; -+ size_t body_len; -+ -+ if ((free_msg = !message)) { -+ message = http_message_init_rel(NULL, HTTP_MSG_NONE); -+ } -+ -+ memset(&inf, 0, sizeof(http_info)); -+ switch (inf.type = type) { -+ case HTTP_MSG_REQUEST: -+ if ((sval = http_get_server_var("SERVER_PROTOCOL", 1)) && !strncmp(Z_STRVAL_P(sval), "HTTP/", lenof("HTTP/"))) { -+ inf.http.version = zend_strtod(Z_STRVAL_P(sval) + lenof("HTTP/"), NULL); -+ } else { -+ inf.http.version = 1.1; -+ } -+ if ((sval = http_get_server_var("REQUEST_METHOD", 1))) { -+ inf.http.info.request.method = estrdup(Z_STRVAL_P(sval)); -+ } -+ if ((sval = http_get_server_var("REQUEST_URI", 1))) { -+ inf.http.info.request.url = estrdup(Z_STRVAL_P(sval)); -+ } -+ -+ http_message_set_info(message, &inf); -+ http_get_request_headers(&message->hdrs); -+ if (SUCCESS == http_get_request_body_ex(&body_str, &body_len, 0)) { -+ phpstr_from_string_ex(&message->body, body_str, body_len); -+ } -+ break; -+ -+ case HTTP_MSG_RESPONSE: -+ if (!SG(sapi_headers).http_status_line || SUCCESS != http_info_parse_ex(SG(sapi_headers).http_status_line, &inf, 0)) { -+ inf.http.version = 1.1; -+ inf.http.info.response.code = 200; -+ inf.http.info.response.status = estrdup("Ok"); -+ } -+ -+ http_message_set_info(message, &inf); -+ http_get_response_headers(&message->hdrs); -+ if (SUCCESS == php_ob_get_buffer(&tval TSRMLS_CC)) { -+ message->body.data = Z_STRVAL(tval); -+ message->body.used = Z_STRLEN(tval); -+ message->body.free = 1; /* "\0" */ -+ } -+ break; -+ -+ default: -+ if (free_msg) { -+ http_message_free(&message); -+ } else { -+ message = NULL; -+ } -+ break; -+ } -+ http_info_dtor(&inf); -+ -+ return message; -+} -+ -+PHP_HTTP_API void _http_message_set_type(http_message *message, http_message_type type) -+{ -+ /* just act if different */ -+ if (type != message->type) { -+ -+ /* free request info */ -+ switch (message->type) { -+ case HTTP_MSG_REQUEST: -+ STR_FREE(message->http.info.request.method); -+ STR_FREE(message->http.info.request.url); -+ break; -+ -+ case HTTP_MSG_RESPONSE: -+ STR_FREE(message->http.info.response.status); -+ break; -+ -+ default: -+ break; -+ } -+ -+ /* init */ -+ http_message_init_type(message, type); -+ } -+} -+ -+PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info) -+{ -+ http_message_set_type(message, info->type); -+ message->http.version = info->http.version; -+ switch (message->type) { -+ case IS_HTTP_REQUEST: -+ STR_SET(HTTP_INFO(message).request.url, HTTP_INFO(info).request.url ? estrdup(HTTP_INFO(info).request.url) : NULL); -+ STR_SET(HTTP_INFO(message).request.method, HTTP_INFO(info).request.method ? estrdup(HTTP_INFO(info).request.method) : NULL); -+ break; -+ -+ case IS_HTTP_RESPONSE: -+ HTTP_INFO(message).response.code = HTTP_INFO(info).response.code; -+ STR_SET(HTTP_INFO(message).response.status, HTTP_INFO(info).response.status ? estrdup(HTTP_INFO(info).response.status) : NULL); -+ break; -+ -+ default: -+ break; -+ } -+} -+ -+#define http_message_body_parse(m, ms, ml, c) _http_message_body_parse((m), (ms), (ml), (c) TSRMLS_CC) -+static inline void _http_message_body_parse(http_message *msg, const char *message, size_t message_length, const char **continue_at TSRMLS_DC) -+{ -+ zval *c; -+ size_t remaining; -+ const char *body; -+ -+ *continue_at = NULL; -+ if ((body = http_locate_body(message))) { -+ remaining = message + message_length - body; -+ -+ if ((c = http_message_header(msg, "Transfer-Encoding"))) { -+ if (strstr(Z_STRVAL_P(c), "chunked")) { -+ /* message has chunked transfer encoding */ -+ char *decoded; -+ size_t decoded_len; -+ -+ /* decode and replace Transfer-Encoding with Content-Length header */ -+ if ((*continue_at = http_encoding_dechunk(body, message + message_length - body, &decoded, &decoded_len))) { -+ zval *len; -+ char *tmp; -+ int tmp_len; -+ -+ tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len); -+ MAKE_STD_ZVAL(len); -+ ZVAL_STRINGL(len, tmp, tmp_len, 0); -+ -+ ZVAL_ADDREF(c); -+ zend_hash_update(&msg->hdrs, "X-Original-Transfer-Encoding", sizeof("X-Original-Transfer-Encoding"), (void *) &c, sizeof(zval *), NULL); -+ zend_hash_del(&msg->hdrs, "Transfer-Encoding", sizeof("Transfer-Encoding")); -+ zend_hash_del(&msg->hdrs, "Content-Length", sizeof("Content-Length")); -+ zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); -+ -+ phpstr_from_string_ex(PHPSTR(msg), decoded, decoded_len); -+ efree(decoded); -+ } -+ } -+ zval_ptr_dtor(&c); -+ } -+ -+ if (!*continue_at && (c = http_message_header(msg, "Content-Length"))) { -+ /* message has content-length header */ -+ ulong len = strtoul(Z_STRVAL_P(c), NULL, 10); -+ if (len > remaining) { -+ http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Length header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining); -+ len = remaining; -+ } -+ phpstr_from_string_ex(PHPSTR(msg), body, len); -+ *continue_at = body + len; -+ zval_ptr_dtor(&c); -+ } -+ -+ if (!*continue_at && (c = http_message_header(msg, "Content-Range"))) { -+ /* message has content-range header */ -+ ulong total = 0, start = 0, end = 0, len = 0; -+ -+ if (!strncasecmp(Z_STRVAL_P(c), "bytes", lenof("bytes")) && -+ ( Z_STRVAL_P(c)[lenof("bytes")] == ':' || -+ Z_STRVAL_P(c)[lenof("bytes")] == ' ' || -+ Z_STRVAL_P(c)[lenof("bytes")] == '=')) { -+ char *total_at = NULL, *end_at = NULL; -+ char *start_at = Z_STRVAL_P(c) + sizeof("bytes"); -+ -+ start = strtoul(start_at, &end_at, 10); -+ if (end_at) { -+ end = strtoul(end_at + 1, &total_at, 10); -+ if (total_at && strncmp(total_at + 1, "*", 1)) { -+ total = strtoul(total_at + 1, NULL, 10); -+ } -+ if ((len = (end + 1 - start)) > remaining) { -+ http_error_ex(HE_NOTICE, HTTP_E_MALFORMED_HEADERS, "The Content-Range header pretends a larger body than actually received (expected %lu bytes; got %lu bytes)", len, remaining); -+ len = remaining; -+ } -+ if (end >= start && (!total || end < total)) { -+ phpstr_from_string_ex(PHPSTR(msg), body, len); -+ *continue_at = body + len; -+ } -+ } -+ } -+ -+ if (!*continue_at) { -+ http_error_ex(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Invalid Content-Range header: %s", Z_STRVAL_P(c)); -+ } -+ zval_ptr_dtor(&c); -+ } -+ -+ if (!*continue_at) { -+ /* no headers that indicate content length */ -+ if (HTTP_MSG_TYPE(RESPONSE, msg)) { -+ phpstr_from_string_ex(PHPSTR(msg), body, remaining); -+ } else { -+ *continue_at = body; -+ } -+ } -+ -+#ifdef HTTP_HAVE_ZLIB -+ /* check for compressed data */ -+ if ((c = http_message_header(msg, "Content-Encoding"))) { -+ char *decoded = NULL; -+ size_t decoded_len = 0; -+ -+ if ( !strcasecmp(Z_STRVAL_P(c), "gzip") || -+ !strcasecmp(Z_STRVAL_P(c), "x-gzip") || -+ !strcasecmp(Z_STRVAL_P(c), "deflate")) { -+ http_encoding_inflate(PHPSTR_VAL(msg), PHPSTR_LEN(msg), &decoded, &decoded_len); -+ } -+ -+ if (decoded) { -+ zval *len, **original_len; -+ char *tmp; -+ int tmp_len; -+ -+ tmp_len = (int) spprintf(&tmp, 0, "%zu", decoded_len); -+ MAKE_STD_ZVAL(len); -+ ZVAL_STRINGL(len, tmp, tmp_len, 0); -+ -+ ZVAL_ADDREF(c); -+ zend_hash_update(&msg->hdrs, "X-Original-Content-Encoding", sizeof("X-Original-Content-Encoding"), (void *) &c, sizeof(zval *), NULL); -+ zend_hash_del(&msg->hdrs, "Content-Encoding", sizeof("Content-Encoding")); -+ if (SUCCESS == zend_hash_find(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &original_len)) { -+ ZVAL_ADDREF(*original_len); -+ zend_hash_update(&msg->hdrs, "X-Original-Content-Length", sizeof("X-Original-Content-Length"), (void *) original_len, sizeof(zval *), NULL); -+ zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); -+ } else { -+ zend_hash_update(&msg->hdrs, "Content-Length", sizeof("Content-Length"), (void *) &len, sizeof(zval *), NULL); -+ } -+ -+ phpstr_dtor(PHPSTR(msg)); -+ PHPSTR(msg)->data = decoded; -+ PHPSTR(msg)->used = decoded_len; -+ PHPSTR(msg)->free = 1; -+ } -+ -+ zval_ptr_dtor(&c); -+ } -+#endif /* HTTP_HAVE_ZLIB */ -+ } -+} -+ -+PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t message_length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ const char *continue_at; -+ zend_bool free_msg = msg ? 0 : 1; -+ -+ if ((!message) || (message_length < HTTP_MSG_MIN_SIZE)) { -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Empty or too short HTTP message: '%s'", message); -+ return NULL; -+ } -+ -+ msg = http_message_init_rel(msg, 0); -+ -+ if (SUCCESS != http_parse_headers_cb(message, &msg->hdrs, 1, (http_info_callback) http_message_info_callback, (void *) &msg)) { -+ if (free_msg) { -+ http_message_free(&msg); -+ } -+ http_error(HE_WARNING, HTTP_E_MALFORMED_HEADERS, "Failed to parse message headers"); -+ return NULL; -+ } -+ -+ http_message_body_parse(msg, message, message_length, &continue_at); -+ -+ /* check for following messages */ -+ if (continue_at && (continue_at < (message + message_length))) { -+ while (HTTP_IS_CTYPE(space, *continue_at)) ++continue_at; -+ if (continue_at < (message + message_length)) { -+ http_message *next = NULL, *most = NULL; -+ -+ /* set current message to parent of most parent following messages and return deepest */ -+ if ((most = next = http_message_parse_rel(NULL, continue_at, message + message_length - continue_at))) { -+ while (most->parent) most = most->parent; -+ most->parent = msg; -+ msg = next; -+ } -+ } -+ } -+ -+ return msg; -+} -+ -+PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_t *length) -+{ -+ phpstr str; -+ HashKey key = initHashKey(0); -+ zval **header; -+ char *data; -+ HashPosition pos1; -+ -+ phpstr_init_ex(&str, 4096, 0); -+ -+ switch (msg->type) { -+ case HTTP_MSG_REQUEST: -+ phpstr_appendf(&str, HTTP_INFO_REQUEST_FMT_ARGS(&msg->http, HTTP_CRLF)); -+ break; -+ -+ case HTTP_MSG_RESPONSE: -+ phpstr_appendf(&str, HTTP_INFO_RESPONSE_FMT_ARGS(&msg->http, HTTP_CRLF)); -+ break; -+ -+ case HTTP_MSG_NONE: -+ default: -+ break; -+ } -+ -+ FOREACH_HASH_KEYVAL(pos1, &msg->hdrs, key, header) { -+ if (key.type == HASH_KEY_IS_STRING) { -+ HashPosition pos2; -+ zval **single_header; -+ -+ switch (Z_TYPE_PP(header)) { -+ case IS_BOOL: -+ phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key.str, Z_BVAL_PP(header)?"true":"false"); -+ break; -+ -+ case IS_LONG: -+ phpstr_appendf(&str, "%s: %ld" HTTP_CRLF, key.str, Z_LVAL_PP(header)); -+ break; -+ -+ case IS_DOUBLE: -+ phpstr_appendf(&str, "%s: %f" HTTP_CRLF, key.str, Z_DVAL_PP(header)); -+ break; -+ -+ case IS_STRING: -+ phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key.str, Z_STRVAL_PP(header)); -+ break; -+ -+ case IS_ARRAY: -+ FOREACH_VAL(pos2, *header, single_header) { -+ switch (Z_TYPE_PP(single_header)) { -+ case IS_BOOL: -+ phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key.str, Z_BVAL_PP(single_header)?"true":"false"); -+ break; -+ -+ case IS_LONG: -+ phpstr_appendf(&str, "%s: %ld" HTTP_CRLF, key.str, Z_LVAL_PP(single_header)); -+ break; -+ -+ case IS_DOUBLE: -+ phpstr_appendf(&str, "%s: %f" HTTP_CRLF, key.str, Z_DVAL_PP(single_header)); -+ break; -+ -+ case IS_STRING: -+ phpstr_appendf(&str, "%s: %s" HTTP_CRLF, key.str, Z_STRVAL_PP(single_header)); -+ break; -+ } -+ } -+ break; -+ } -+ } -+ } -+ -+ if (PHPSTR_LEN(msg)) { -+ phpstr_appends(&str, HTTP_CRLF); -+ phpstr_append(&str, PHPSTR_VAL(msg), PHPSTR_LEN(msg)); -+ phpstr_appends(&str, HTTP_CRLF); -+ } -+ -+ data = phpstr_data(&str, string, length); -+ if (!string) { -+ efree(data); -+ } -+ -+ phpstr_dtor(&str); -+} -+ -+PHP_HTTP_API void _http_message_serialize(http_message *message, char **string, size_t *length) -+{ -+ char *buf; -+ size_t len; -+ phpstr str; -+ -+ phpstr_init(&str); -+ -+ do { -+ http_message_tostring(message, &buf, &len); -+ phpstr_prepend(&str, buf, len); -+ efree(buf); -+ } while ((message = message->parent)); -+ -+ buf = phpstr_data(&str, string, length); -+ if (!string) { -+ efree(buf); -+ } -+ -+ phpstr_dtor(&str); -+} -+ -+PHP_HTTP_API http_message *_http_message_reverse(http_message *msg) -+{ -+ int i, c; -+ -+ http_message_count(c, msg); -+ -+ if (c > 1) { -+ http_message *tmp = msg, **arr = ecalloc(c, sizeof(http_message *)); -+ -+ for (i = 0; i < c; ++i) { -+ arr[i] = tmp; -+ tmp = tmp->parent; -+ } -+ arr[0]->parent = NULL; -+ for (i = 0; i < c-1; ++i) { -+ arr[i+1]->parent = arr[i]; -+ } -+ -+ msg = arr[c-1]; -+ efree(arr); -+ } -+ -+ return msg; -+} -+ -+PHP_HTTP_API http_message *_http_message_interconnect(http_message *m1, http_message *m2) -+{ -+ if (m1 && m2) { -+ int i = 0, c1, c2; -+ http_message *t1 = m1, *t2 = m2, *p1, *p2; -+ -+ http_message_count(c1, m1); -+ http_message_count(c2, m2); -+ -+ while (i++ < (c1 - c2)) { -+ t1 = t1->parent; -+ } -+ while (i++ <= c1) { -+ p1 = t1->parent; -+ p2 = t2->parent; -+ t1->parent = t2; -+ t2->parent = p1; -+ t1 = p1; -+ t2 = p2; -+ } -+ } else if (!m1 && m2) { -+ m1 = m2; -+ } -+ return m1; -+} -+ -+PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *obj TSRMLS_DC) -+{ -+ zval strct; -+ zval *headers; -+ -+ INIT_ZARR(strct, HASH_OF(obj)); -+ -+ add_assoc_long(&strct, "type", msg->type); -+ add_assoc_double(&strct, "httpVersion", msg->http.version); -+ switch (msg->type) -+ { -+ case HTTP_MSG_RESPONSE: -+ add_assoc_long(&strct, "responseCode", msg->http.info.response.code); -+ add_assoc_string(&strct, "responseStatus", STR_PTR(msg->http.info.response.status), 1); -+ break; -+ -+ case HTTP_MSG_REQUEST: -+ add_assoc_string(&strct, "requestMethod", STR_PTR(msg->http.info.request.method), 1); -+ add_assoc_string(&strct, "requestUrl", STR_PTR(msg->http.info.request.url), 1); -+ break; -+ -+ case HTTP_MSG_NONE: -+ /* avoid compiler warning */ -+ break; -+ } -+ -+ MAKE_STD_ZVAL(headers); -+ array_init(headers); -+ zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ add_assoc_zval(&strct, "headers", headers); -+ -+ add_assoc_stringl(&strct, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg), 1); -+ -+ if (msg->parent) { -+ zval *parent; -+ -+ MAKE_STD_ZVAL(parent); -+ if (Z_TYPE_P(obj) == IS_ARRAY) { -+ array_init(parent); -+ } else { -+ object_init(parent); -+ } -+ add_assoc_zval(&strct, "parentMessage", parent); -+ http_message_tostruct_recursive(msg->parent, parent); -+ } else { -+ add_assoc_null(&strct, "parentMessage"); -+ } -+} -+ -+PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC) -+{ -+ STATUS rs = FAILURE; -+ -+ switch (message->type) { -+ case HTTP_MSG_RESPONSE: -+ { -+ HashKey key = initHashKey(0); -+ zval **val; -+ HashPosition pos; -+ -+ FOREACH_HASH_KEYVAL(pos, &message->hdrs, key, val) { -+ if (key.type == HASH_KEY_IS_STRING) { -+ http_send_header_zval_ex(key.str, key.len-1, val, 1); -+ } -+ } -+ rs = SUCCESS == http_send_status(message->http.info.response.code) && -+ SUCCESS == http_send_data(PHPSTR_VAL(message), PHPSTR_LEN(message)) ? -+ SUCCESS : FAILURE; -+ break; -+ } -+ -+ case HTTP_MSG_REQUEST: -+ { -+#ifdef HTTP_HAVE_CURL -+ char *uri = NULL; -+ http_request request; -+ zval **zhost, *options, *headers; -+ -+ MAKE_STD_ZVAL(options); -+ MAKE_STD_ZVAL(headers); -+ array_init(options); -+ array_init(headers); -+ zend_hash_copy(Z_ARRVAL_P(headers), &message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ add_assoc_zval(options, "headers", headers); -+ -+ /* check host header */ -+ if (SUCCESS == zend_hash_find(&message->hdrs, "Host", sizeof("Host"), (void *) &zhost) && Z_TYPE_PP(zhost) == IS_STRING) { -+ char *colon = NULL; -+ php_url parts, *url = php_url_parse(message->http.info.request.url); -+ -+ memset(&parts, 0, sizeof(php_url)); -+ -+ /* check for port */ -+ if ((colon = strchr(Z_STRVAL_PP(zhost), ':'))) { -+ parts.port = atoi(colon + 1); -+ parts.host = estrndup(Z_STRVAL_PP(zhost), (Z_STRVAL_PP(zhost) - colon - 1)); -+ } else { -+ parts.host = estrndup(Z_STRVAL_PP(zhost), Z_STRLEN_PP(zhost)); -+ } -+ -+ http_build_url(HTTP_URL_REPLACE, url, &parts, NULL, &uri, NULL); -+ php_url_free(url); -+ efree(parts.host); -+ } else { -+ uri = http_absolute_url(message->http.info.request.url); -+ } -+ -+ if ((request.meth = http_request_method_exists(1, 0, message->http.info.request.method))) { -+ http_request_body body; -+ -+ http_request_init_ex(&request, NULL, request.meth, uri); -+ request.body = http_request_body_init_ex(&body, HTTP_REQUEST_BODY_CSTRING, PHPSTR_VAL(message), PHPSTR_LEN(message), 0); -+ if (SUCCESS == (rs = http_request_prepare(&request, Z_ARRVAL_P(options)))) { -+ http_request_exec(&request); -+ } -+ http_request_dtor(&request); -+ } else { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, -+ "Cannot send HttpMessage. Request method %s not supported", -+ message->http.info.request.method); -+ } -+ efree(uri); -+ zval_ptr_dtor(&options); -+#else -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "HTTP requests not supported - ext/http was not linked against libcurl."); -+#endif -+ break; -+ } -+ -+ case HTTP_MSG_NONE: -+ default: -+ http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type HTTP_MSG_REQUEST nor HTTP_MSG_RESPONSE"); -+ break; -+ } -+ -+ return rs; -+} -+ -+PHP_HTTP_API http_message *_http_message_dup(http_message *orig TSRMLS_DC) -+{ -+ http_message *temp, *copy = NULL; -+ http_info info; -+ -+ if (orig) { -+ info.type = orig->type; -+ info.http = orig->http; -+ -+ copy = temp = http_message_new(); -+ http_message_set_info(temp, &info); -+ zend_hash_copy(&temp->hdrs, &orig->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ phpstr_append(&temp->body, orig->body.data, orig->body.used); -+ -+ while (orig->parent) { -+ info.type = orig->parent->type; -+ info.http = orig->parent->http; -+ -+ temp->parent = http_message_new(); -+ http_message_set_info(temp->parent, &info); -+ zend_hash_copy(&temp->parent->hdrs, &orig->parent->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ phpstr_append(&temp->parent->body, orig->parent->body.data, orig->parent->body.used); -+ -+ temp = temp->parent; -+ orig = orig->parent; -+ } -+ } -+ -+ return copy; -+} -+ -+PHP_HTTP_API void _http_message_dtor(http_message *message) -+{ -+ if (message) { -+ zend_hash_destroy(&message->hdrs); -+ phpstr_dtor(PHPSTR(message)); -+ -+ switch (message->type) { -+ case HTTP_MSG_REQUEST: -+ STR_SET(message->http.info.request.method, NULL); -+ STR_SET(message->http.info.request.url, NULL); -+ break; -+ -+ case HTTP_MSG_RESPONSE: -+ STR_SET(message->http.info.response.status, NULL); -+ break; -+ -+ default: -+ break; -+ } -+ } -+} -+ -+PHP_HTTP_API void _http_message_free(http_message **message) -+{ -+ if (*message) { -+ if ((*message)->parent) { -+ http_message_free(&(*message)->parent); -+ } -+ http_message_dtor(*message); -+ efree(*message); -+ *message = NULL; -+ } -+} -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_message_object.c -@@ -0,0 +1,1546 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_message_object.c 309640 2011-03-24 09:26:11Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#define HTTP_WANT_CURL -+#define HTTP_WANT_MAGIC -+#include "php_http.h" -+ -+#ifdef ZEND_ENGINE_2 -+ -+#include "zend_interfaces.h" -+#include "ext/standard/url.h" -+#include "php_variables.h" -+ -+#include "php_http_api.h" -+#include "php_http_send_api.h" -+#include "php_http_url_api.h" -+#include "php_http_message_api.h" -+#include "php_http_message_object.h" -+#include "php_http_exception_object.h" -+#include "php_http_response_object.h" -+#include "php_http_request_method_api.h" -+#include "php_http_request_api.h" -+#include "php_http_request_object.h" -+#include "php_http_headers_api.h" -+ -+#if defined(HTTP_HAVE_SPL) && !defined(WONKY) -+/* SPL doesn't install its headers */ -+extern PHPAPI zend_class_entry *spl_ce_Countable; -+#endif -+ -+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpMessage, method, 0, req_args) -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpMessage, method, 0) -+#define HTTP_MESSAGE_ME(method, visibility) PHP_ME(HttpMessage, method, HTTP_ARGS(HttpMessage, method), visibility) -+ -+HTTP_BEGIN_ARGS(__construct, 0) -+ HTTP_ARG_VAL(message, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(factory, 0) -+ HTTP_ARG_VAL(message, 0) -+ HTTP_ARG_VAL(class_name, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(fromEnv, 1) -+ HTTP_ARG_VAL(type, 0) -+ HTTP_ARG_VAL(class_name, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getBody); -+HTTP_BEGIN_ARGS(setBody, 1) -+ HTTP_ARG_VAL(body, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(getHeader, 1) -+ HTTP_ARG_VAL(header, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getHeaders); -+HTTP_BEGIN_ARGS(setHeaders, 1) -+ HTTP_ARG_VAL(headers, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(addHeaders, 1) -+ HTTP_ARG_VAL(headers, 0) -+ HTTP_ARG_VAL(append, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getType); -+HTTP_BEGIN_ARGS(setType, 1) -+ HTTP_ARG_VAL(type, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getInfo); -+HTTP_BEGIN_ARGS(setInfo, 1) -+ HTTP_ARG_VAL(http_info, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getResponseCode); -+HTTP_BEGIN_ARGS(setResponseCode, 1) -+ HTTP_ARG_VAL(response_code, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getResponseStatus); -+HTTP_BEGIN_ARGS(setResponseStatus, 1) -+ HTTP_ARG_VAL(response_status, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getRequestMethod); -+HTTP_BEGIN_ARGS(setRequestMethod, 1) -+ HTTP_ARG_VAL(request_method, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getRequestUrl); -+HTTP_BEGIN_ARGS(setRequestUrl, 1) -+ HTTP_ARG_VAL(url, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getHttpVersion); -+HTTP_BEGIN_ARGS(setHttpVersion, 1) -+ HTTP_ARG_VAL(http_version, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(guessContentType, 1) -+ HTTP_ARG_VAL(magic_file, 0) -+ HTTP_ARG_VAL(magic_mode, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getParentMessage); -+HTTP_EMPTY_ARGS(send); -+HTTP_EMPTY_ARGS(__toString); -+HTTP_BEGIN_ARGS(toString, 0) -+ HTTP_ARG_VAL(include_parent, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(toMessageTypeObject); -+ -+HTTP_EMPTY_ARGS(count); -+ -+HTTP_EMPTY_ARGS(serialize); -+HTTP_BEGIN_ARGS(unserialize, 1) -+ HTTP_ARG_VAL(serialized, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(rewind); -+HTTP_EMPTY_ARGS(valid); -+HTTP_EMPTY_ARGS(key); -+HTTP_EMPTY_ARGS(current); -+HTTP_EMPTY_ARGS(next); -+ -+HTTP_EMPTY_ARGS(detach); -+HTTP_BEGIN_ARGS(prepend, 1) -+ HTTP_ARG_OBJ(HttpMessage, message, 0) -+HTTP_END_ARGS; -+HTTP_EMPTY_ARGS(reverse); -+ -+#define http_message_object_read_prop _http_message_object_read_prop -+static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC); -+#define http_message_object_write_prop _http_message_object_write_prop -+static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC); -+#define http_message_object_get_prop_ptr _http_message_object_get_prop_ptr -+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC); -+#define http_message_object_get_props _http_message_object_get_props -+static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC); -+ -+#define THIS_CE http_message_object_ce -+zend_class_entry *http_message_object_ce; -+zend_function_entry http_message_object_fe[] = { -+ HTTP_MESSAGE_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -+ HTTP_MESSAGE_ME(getBody, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(setBody, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getHeader, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getHeaders, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(setHeaders, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(addHeaders, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getType, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(setType, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getInfo, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(setInfo, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getResponseCode, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(setResponseCode, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getResponseStatus, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(setResponseStatus, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getRequestMethod, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(setRequestMethod, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getRequestUrl, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(setRequestUrl, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getHttpVersion, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(setHttpVersion, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(guessContentType, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(getParentMessage, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(send, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(toString, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(toMessageTypeObject, ZEND_ACC_PUBLIC) -+ -+ /* implements Countable */ -+ HTTP_MESSAGE_ME(count, ZEND_ACC_PUBLIC) -+ -+ /* implements Serializable */ -+ HTTP_MESSAGE_ME(serialize, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(unserialize, ZEND_ACC_PUBLIC) -+ -+ /* implements Iterator */ -+ HTTP_MESSAGE_ME(rewind, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(valid, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(current, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(key, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(next, ZEND_ACC_PUBLIC) -+ -+ ZEND_MALIAS(HttpMessage, __toString, toString, HTTP_ARGS(HttpMessage, __toString), ZEND_ACC_PUBLIC) -+ -+ HTTP_MESSAGE_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+ ZEND_MALIAS(HttpMessage, fromString, factory, HTTP_ARGS(HttpMessage, factory), ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+ HTTP_MESSAGE_ME(fromEnv, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+ -+ HTTP_MESSAGE_ME(detach, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(prepend, ZEND_ACC_PUBLIC) -+ HTTP_MESSAGE_ME(reverse, ZEND_ACC_PUBLIC) -+ -+ EMPTY_FUNCTION_ENTRY -+}; -+static zend_object_handlers http_message_object_handlers; -+ -+static HashTable http_message_object_prophandlers; -+ -+typedef void (*http_message_object_prophandler_func)(http_message_object *o, zval *v TSRMLS_DC); -+ -+typedef struct _http_message_object_prophandler { -+ http_message_object_prophandler_func read; -+ http_message_object_prophandler_func write; -+} http_message_object_prophandler; -+ -+static STATUS http_message_object_add_prophandler(const char *prop_str, size_t prop_len, http_message_object_prophandler_func read, http_message_object_prophandler_func write) { -+ http_message_object_prophandler h = { read, write }; -+ return zend_hash_add(&http_message_object_prophandlers, prop_str, prop_len, (void *) &h, sizeof(h), NULL); -+} -+static STATUS http_message_object_get_prophandler(const char *prop_str, size_t prop_len, http_message_object_prophandler **handler) { -+ return zend_hash_find(&http_message_object_prophandlers, prop_str, prop_len, (void *) handler); -+} -+static void http_message_object_prophandler_get_type(http_message_object *obj, zval *return_value TSRMLS_DC) { -+ RETVAL_LONG(obj->message->type); -+} -+static void http_message_object_prophandler_set_type(http_message_object *obj, zval *value TSRMLS_DC) { -+ zval *cpy = http_zsep(IS_LONG, value); -+ http_message_set_type(obj->message, Z_LVAL_P(cpy)); -+ zval_ptr_dtor(&cpy); -+} -+static void http_message_object_prophandler_get_body(http_message_object *obj, zval *return_value TSRMLS_DC) { -+ phpstr_fix(PHPSTR(obj->message)); -+ RETVAL_PHPSTR(PHPSTR(obj->message), 0, 1); -+} -+static void http_message_object_prophandler_set_body(http_message_object *obj, zval *value TSRMLS_DC) { -+ zval *cpy = http_zsep(IS_STRING, value); -+ phpstr_dtor(PHPSTR(obj->message)); -+ phpstr_from_string_ex(PHPSTR(obj->message), Z_STRVAL_P(cpy), Z_STRLEN_P(cpy)); -+ zval_ptr_dtor(&cpy); -+} -+static void http_message_object_prophandler_get_request_method(http_message_object *obj, zval *return_value TSRMLS_DC) { -+ if (HTTP_MSG_TYPE(REQUEST, obj->message) && obj->message->http.info.request.method) { -+ RETVAL_STRING(obj->message->http.info.request.method, 1); -+ } else { -+ RETVAL_NULL(); -+ } -+} -+static void http_message_object_prophandler_set_request_method(http_message_object *obj, zval *value TSRMLS_DC) { -+ if (HTTP_MSG_TYPE(REQUEST, obj->message)) { -+ zval *cpy = http_zsep(IS_STRING, value); -+ STR_SET(obj->message->http.info.request.method, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); -+ zval_ptr_dtor(&cpy); -+ } -+} -+static void http_message_object_prophandler_get_request_url(http_message_object *obj, zval *return_value TSRMLS_DC) { -+ if (HTTP_MSG_TYPE(REQUEST, obj->message) && obj->message->http.info.request.url) { -+ RETVAL_STRING(obj->message->http.info.request.url, 1); -+ } else { -+ RETVAL_NULL(); -+ } -+} -+static void http_message_object_prophandler_set_request_url(http_message_object *obj, zval *value TSRMLS_DC) { -+ if (HTTP_MSG_TYPE(REQUEST, obj->message)) { -+ zval *cpy = http_zsep(IS_STRING, value); -+ STR_SET(obj->message->http.info.request.url, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); -+ zval_ptr_dtor(&cpy); -+ } -+} -+static void http_message_object_prophandler_get_response_status(http_message_object *obj, zval *return_value TSRMLS_DC) { -+ if (HTTP_MSG_TYPE(RESPONSE, obj->message) && obj->message->http.info.response.status) { -+ RETVAL_STRING(obj->message->http.info.response.status, 1); -+ } else { -+ RETVAL_NULL(); -+ } -+} -+static void http_message_object_prophandler_set_response_status(http_message_object *obj, zval *value TSRMLS_DC) { -+ if (HTTP_MSG_TYPE(RESPONSE, obj->message)) { -+ zval *cpy = http_zsep(IS_STRING, value); -+ STR_SET(obj->message->http.info.response.status, estrndup(Z_STRVAL_P(cpy), Z_STRLEN_P(cpy))); -+ zval_ptr_dtor(&cpy); -+ } -+} -+static void http_message_object_prophandler_get_response_code(http_message_object *obj, zval *return_value TSRMLS_DC) { -+ if (HTTP_MSG_TYPE(RESPONSE, obj->message)) { -+ RETVAL_LONG(obj->message->http.info.response.code); -+ } else { -+ RETVAL_NULL(); -+ } -+} -+static void http_message_object_prophandler_set_response_code(http_message_object *obj, zval *value TSRMLS_DC) { -+ if (HTTP_MSG_TYPE(RESPONSE, obj->message)) { -+ zval *cpy = http_zsep(IS_LONG, value); -+ obj->message->http.info.response.code = Z_LVAL_P(cpy); -+ zval_ptr_dtor(&cpy); -+ } -+} -+static void http_message_object_prophandler_get_http_version(http_message_object *obj, zval *return_value TSRMLS_DC) { -+ RETVAL_DOUBLE(obj->message->http.version); -+} -+static void http_message_object_prophandler_set_http_version(http_message_object *obj, zval *value TSRMLS_DC) { -+ zval *cpy = http_zsep(IS_DOUBLE, value); -+ obj->message->http.version = Z_DVAL_P(cpy); -+ zval_ptr_dtor(&cpy); -+} -+static void http_message_object_prophandler_get_headers(http_message_object *obj, zval *return_value TSRMLS_DC) { -+ array_init(return_value); -+ zend_hash_copy(Z_ARRVAL_P(return_value), &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+} -+static void http_message_object_prophandler_set_headers(http_message_object *obj, zval *value TSRMLS_DC) { -+ zval *cpy = http_zsep(IS_ARRAY, value); -+ zend_hash_clean(&obj->message->hdrs); -+ zend_hash_copy(&obj->message->hdrs, Z_ARRVAL_P(cpy), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ zval_ptr_dtor(&cpy); -+} -+static void http_message_object_prophandler_get_parent_message(http_message_object *obj, zval *return_value TSRMLS_DC) { -+ if (obj->message->parent) { -+ RETVAL_OBJVAL(obj->parent, 1); -+ } else { -+ RETVAL_NULL(); -+ } -+} -+static void http_message_object_prophandler_set_parent_message(http_message_object *obj, zval *value TSRMLS_DC) { -+ if (Z_TYPE_P(value) == IS_OBJECT && instanceof_function(Z_OBJCE_P(value), http_message_object_ce TSRMLS_CC)) { -+ if (obj->message->parent) { -+ zval tmp; -+ tmp.value.obj = obj->parent; -+ Z_OBJ_DELREF(tmp); -+ } -+ Z_OBJ_ADDREF_P(value); -+ obj->parent = value->value.obj; -+ } -+} -+ -+PHP_MINIT_FUNCTION(http_message_object) -+{ -+ HTTP_REGISTER_CLASS_EX(HttpMessage, http_message_object, NULL, 0); -+ -+#ifndef WONKY -+# ifdef HTTP_HAVE_SPL -+ zend_class_implements(http_message_object_ce TSRMLS_CC, 3, spl_ce_Countable, zend_ce_serializable, zend_ce_iterator); -+# else -+ zend_class_implements(http_message_object_ce TSRMLS_CC, 2, zend_ce_serializable, zend_ce_iterator); -+# endif -+#else -+ zend_class_implements(http_message_object_ce TSRMLS_CC, 1, zend_ce_iterator); -+#endif -+ -+ http_message_object_handlers.clone_obj = _http_message_object_clone_obj; -+ http_message_object_handlers.read_property = http_message_object_read_prop; -+ http_message_object_handlers.write_property = http_message_object_write_prop; -+ http_message_object_handlers.get_properties = http_message_object_get_props; -+ http_message_object_handlers.get_property_ptr_ptr = http_message_object_get_prop_ptr; -+ -+ zend_hash_init(&http_message_object_prophandlers, 9, NULL, NULL, 1); -+ zend_declare_property_long(THIS_CE, ZEND_STRS("type")-1, HTTP_MSG_NONE, ZEND_ACC_PROTECTED TSRMLS_CC); -+ http_message_object_add_prophandler(ZEND_STRS("type")-1, http_message_object_prophandler_get_type, http_message_object_prophandler_set_type); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("body")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC); -+ http_message_object_add_prophandler(ZEND_STRS("body")-1, http_message_object_prophandler_get_body, http_message_object_prophandler_set_body); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("requestMethod")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC); -+ http_message_object_add_prophandler(ZEND_STRS("requestMethod")-1, http_message_object_prophandler_get_request_method, http_message_object_prophandler_set_request_method); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("requestUrl")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC); -+ http_message_object_add_prophandler(ZEND_STRS("requestUrl")-1, http_message_object_prophandler_get_request_url, http_message_object_prophandler_set_request_url); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("responseStatus")-1, "", ZEND_ACC_PROTECTED TSRMLS_CC); -+ http_message_object_add_prophandler(ZEND_STRS("responseStatus")-1, http_message_object_prophandler_get_response_status, http_message_object_prophandler_set_response_status); -+ zend_declare_property_long(THIS_CE, ZEND_STRS("responseCode")-1, 0, ZEND_ACC_PROTECTED TSRMLS_CC); -+ http_message_object_add_prophandler(ZEND_STRS("responseCode")-1, http_message_object_prophandler_get_response_code, http_message_object_prophandler_set_response_code); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("httpVersion")-1, ZEND_ACC_PROTECTED TSRMLS_CC); -+ http_message_object_add_prophandler(ZEND_STRS("httpVersion")-1, http_message_object_prophandler_get_http_version, http_message_object_prophandler_set_http_version); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("headers")-1, ZEND_ACC_PROTECTED TSRMLS_CC); -+ http_message_object_add_prophandler(ZEND_STRS("headers")-1, http_message_object_prophandler_get_headers, http_message_object_prophandler_set_headers); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("parentMessage")-1, ZEND_ACC_PROTECTED TSRMLS_CC); -+ http_message_object_add_prophandler(ZEND_STRS("parentMessage")-1, http_message_object_prophandler_get_parent_message, http_message_object_prophandler_set_parent_message); -+ -+#ifndef WONKY -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_NONE")-1, HTTP_MSG_NONE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_REQUEST")-1, HTTP_MSG_REQUEST TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_RESPONSE")-1, HTTP_MSG_RESPONSE TSRMLS_CC); -+#endif -+ -+ HTTP_LONG_CONSTANT("HTTP_MSG_NONE", HTTP_MSG_NONE); -+ HTTP_LONG_CONSTANT("HTTP_MSG_REQUEST", HTTP_MSG_REQUEST); -+ HTTP_LONG_CONSTANT("HTTP_MSG_RESPONSE", HTTP_MSG_RESPONSE); -+ -+ return SUCCESS; -+} -+ -+PHP_MSHUTDOWN_FUNCTION(http_message_object) -+{ -+ zend_hash_destroy(&http_message_object_prophandlers); -+ -+ return SUCCESS; -+} -+ -+void _http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC) -+{ -+ int i; -+ getObject(http_message_object, obj); -+ -+ /* count */ -+ http_message_count(i, obj->message); -+ -+ if (i > 1) { -+ zval o; -+ zend_object_value *ovalues = NULL; -+ http_message_object **objects = NULL; -+ int last = i - 1; -+ -+ objects = ecalloc(i, sizeof(http_message_object *)); -+ ovalues = ecalloc(i, sizeof(zend_object_value)); -+ -+ /* we are the first message */ -+ objects[0] = obj; -+ ovalues[0] = getThis()->value.obj; -+ -+ /* fetch parents */ -+ INIT_PZVAL(&o); -+ o.type = IS_OBJECT; -+ for (i = 1; obj->parent.handle; ++i) { -+ o.value.obj = obj->parent; -+ ovalues[i] = o.value.obj; -+ objects[i] = obj = zend_object_store_get_object(&o TSRMLS_CC); -+ } -+ -+ /* reorder parents */ -+ for (last = --i; i; --i) { -+ objects[i]->message->parent = objects[i-1]->message; -+ objects[i]->parent = ovalues[i-1]; -+ } -+ objects[0]->message->parent = NULL; -+ objects[0]->parent.handle = 0; -+ objects[0]->parent.handlers = NULL; -+ -+ /* add ref (why?) */ -+ Z_OBJ_ADDREF_P(getThis()); -+ RETVAL_OBJVAL(ovalues[last], 1); -+ -+ efree(objects); -+ efree(ovalues); -+ } else { -+ RETURN_ZVAL(getThis(), 1, 0); -+ } -+} -+ -+void _http_message_object_prepend_ex(zval *this_ptr, zval *prepend, zend_bool top TSRMLS_DC) -+{ -+ zval m; -+ http_message *save_parent_msg = NULL; -+ zend_object_value save_parent_obj = {0, NULL}; -+ getObject(http_message_object, obj); -+ getObjectEx(http_message_object, prepend_obj, prepend); -+ -+ INIT_PZVAL(&m); -+ m.type = IS_OBJECT; -+ -+ if (!top) { -+ save_parent_obj = obj->parent; -+ save_parent_msg = obj->message->parent; -+ } else { -+ /* iterate to the most parent object */ -+ while (obj->parent.handle) { -+ m.value.obj = obj->parent; -+ obj = zend_object_store_get_object(&m TSRMLS_CC); -+ } -+ } -+ -+ /* prepend */ -+ obj->parent = prepend->value.obj; -+ obj->message->parent = prepend_obj->message; -+ -+ /* add ref */ -+ zend_objects_store_add_ref(prepend TSRMLS_CC); -+ while (prepend_obj->parent.handle) { -+ m.value.obj = prepend_obj->parent; -+ zend_objects_store_add_ref(&m TSRMLS_CC); -+ prepend_obj = zend_object_store_get_object(&m TSRMLS_CC); -+ } -+ -+ if (!top) { -+ prepend_obj->parent = save_parent_obj; -+ prepend_obj->message->parent = save_parent_msg; -+ } -+} -+ -+zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC) -+{ -+ return http_message_object_new_ex(ce, NULL, NULL); -+} -+ -+zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg, http_message_object **ptr TSRMLS_DC) -+{ -+ zend_object_value ov; -+ http_message_object *o; -+ -+ o = ecalloc(1, sizeof(http_message_object)); -+ o->zo.ce = ce; -+ -+ if (ptr) { -+ *ptr = o; -+ } -+ -+ if (msg) { -+ o->message = msg; -+ if (msg->parent) { -+ o->parent = http_message_object_new_ex(ce, msg->parent, NULL); -+ } -+ } -+ -+ ALLOC_HASHTABLE(OBJ_PROP(o)); -+ zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ -+ ov.handle = putObject(http_message_object, o); -+ ov.handlers = &http_message_object_handlers; -+ -+ return ov; -+} -+ -+zend_object_value _http_message_object_clone_obj(zval *this_ptr TSRMLS_DC) -+{ -+ zend_object_value new_ov; -+ http_message_object *new_obj = NULL; -+ getObject(http_message_object, old_obj); -+ -+ new_ov = http_message_object_new_ex(old_obj->zo.ce, http_message_dup(old_obj->message), &new_obj); -+ zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); -+ -+ return new_ov; -+} -+ -+void _http_message_object_free(zend_object *object TSRMLS_DC) -+{ -+ http_message_object *o = (http_message_object *) object; -+ -+ if (o->iterator) { -+ zval_ptr_dtor(&o->iterator); -+ o->iterator = NULL; -+ } -+ if (o->message) { -+ http_message_dtor(o->message); -+ efree(o->message); -+ } -+ if (o->parent.handle) { -+ zval p; -+ -+ INIT_PZVAL(&p); -+ p.type = IS_OBJECT; -+ p.value.obj = o->parent; -+ zend_objects_store_del_ref(&p TSRMLS_CC); -+ } -+ freeObject(o); -+} -+ -+static zval **_http_message_object_get_prop_ptr(zval *object, zval *member ZEND_LITERAL_KEY_DC TSRMLS_DC) { -+ getObjectEx(http_message_object, obj, object); -+ http_message_object_prophandler *handler; -+ -+ if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) { -+ zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index"); -+ return NULL; -+ } -+ -+ return zend_get_std_object_handlers()->get_property_ptr_ptr(object, member ZEND_LITERAL_KEY_CC TSRMLS_CC); -+} -+ -+static zval *_http_message_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC) -+{ -+ getObjectEx(http_message_object, obj, object); -+ http_message_object_prophandler *handler; -+ zval *return_value; -+ -+ if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) { -+ if (type == BP_VAR_W) { -+ zend_error(E_ERROR, "Cannot access HttpMessage properties by reference or array key/index"); -+ return NULL; -+ } -+ -+ ALLOC_ZVAL(return_value); -+#ifdef Z_SET_REFCOUNT -+ Z_SET_REFCOUNT_P(return_value, 0); -+ Z_UNSET_ISREF_P(return_value); -+#else -+ return_value->refcount = 0; -+ return_value->is_ref = 0; -+#endif -+ -+ handler->read(obj, return_value TSRMLS_CC); -+ -+ } else { -+ return_value = zend_get_std_object_handlers()->read_property(object, member, type ZEND_LITERAL_KEY_CC TSRMLS_CC); -+ } -+ -+ return return_value; -+} -+ -+static void _http_message_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC) -+{ -+ getObjectEx(http_message_object, obj, object); -+ http_message_object_prophandler *handler; -+ -+ if (SUCCESS == http_message_object_get_prophandler(Z_STRVAL_P(member), Z_STRLEN_P(member), &handler)) { -+ handler->write(obj, value TSRMLS_CC); -+ } else { -+ zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC); -+ } -+} -+ -+static HashTable *_http_message_object_get_props(zval *object TSRMLS_DC) -+{ -+ zval *headers; -+ getObjectEx(http_message_object, obj, object); -+ http_message *msg = obj->message; -+ HashTable *props = OBJ_PROP(obj); -+ zval array, *parent; -+ -+ INIT_ZARR(array, props); -+ -+#define ASSOC_PROP(array, ptype, name, val) \ -+ { \ -+ char *m_prop_name; \ -+ int m_prop_len; \ -+ zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \ -+ add_assoc_ ##ptype## _ex(&array, m_prop_name, sizeof(name)+3, val); \ -+ efree(m_prop_name); \ -+ } -+#define ASSOC_STRING(array, name, val) ASSOC_STRINGL(array, name, val, strlen(val)) -+#define ASSOC_STRINGL(array, name, val, len) \ -+ { \ -+ char *m_prop_name; \ -+ int m_prop_len; \ -+ zend_mangle_property_name(&m_prop_name, &m_prop_len, "*", 1, name, lenof(name), 0); \ -+ add_assoc_stringl_ex(&array, m_prop_name, sizeof(name)+3, val, len, 1); \ -+ efree(m_prop_name); \ -+ } -+ -+ ASSOC_PROP(array, long, "type", msg->type); -+ ASSOC_PROP(array, double, "httpVersion", msg->http.version); -+ -+ switch (msg->type) { -+ case HTTP_MSG_REQUEST: -+ ASSOC_PROP(array, long, "responseCode", 0); -+ ASSOC_STRINGL(array, "responseStatus", "", 0); -+ ASSOC_STRING(array, "requestMethod", STR_PTR(msg->http.info.request.method)); -+ ASSOC_STRING(array, "requestUrl", STR_PTR(msg->http.info.request.url)); -+ break; -+ -+ case HTTP_MSG_RESPONSE: -+ ASSOC_PROP(array, long, "responseCode", msg->http.info.response.code); -+ ASSOC_STRING(array, "responseStatus", STR_PTR(msg->http.info.response.status)); -+ ASSOC_STRINGL(array, "requestMethod", "", 0); -+ ASSOC_STRINGL(array, "requestUrl", "", 0); -+ break; -+ -+ case HTTP_MSG_NONE: -+ default: -+ ASSOC_PROP(array, long, "responseCode", 0); -+ ASSOC_STRINGL(array, "responseStatus", "", 0); -+ ASSOC_STRINGL(array, "requestMethod", "", 0); -+ ASSOC_STRINGL(array, "requestUrl", "", 0); -+ break; -+ } -+ -+ MAKE_STD_ZVAL(headers); -+ array_init(headers); -+ zend_hash_copy(Z_ARRVAL_P(headers), &msg->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ ASSOC_PROP(array, zval, "headers", headers); -+ ASSOC_STRINGL(array, "body", PHPSTR_VAL(msg), PHPSTR_LEN(msg)); -+ -+ MAKE_STD_ZVAL(parent); -+ if (msg->parent) { -+ ZVAL_OBJVAL(parent, obj->parent, 1); -+ } else { -+ ZVAL_NULL(parent); -+ } -+ ASSOC_PROP(array, zval, "parentMessage", parent); -+ -+ return OBJ_PROP(obj); -+} -+ -+/* ### USERLAND ### */ -+ -+/* {{{ proto void HttpMessage::__construct([string message]) -+ Create a new HttpMessage object instance. */ -+PHP_METHOD(HttpMessage, __construct) -+{ -+ int length = 0; -+ char *message = NULL; -+ -+ getObject(http_message_object, obj); -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &message, &length) && message && length) { -+ http_message *msg = obj->message; -+ -+ http_message_dtor(msg); -+ if ((obj->message = http_message_parse_ex(msg, message, length))) { -+ if (obj->message->parent) { -+ obj->parent = http_message_object_new_ex(Z_OBJCE_P(getThis()), obj->message->parent, NULL); -+ } -+ } else { -+ obj->message = http_message_init(msg); -+ } -+ } -+ if (!obj->message) { -+ obj->message = http_message_new(); -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto static HttpMessage HttpMessage::factory([string raw_message[, string class_name = "HttpMessage"]]) -+ Create a new HttpMessage object instance. */ -+PHP_METHOD(HttpMessage, factory) -+{ -+ char *string = NULL, *cn = NULL; -+ int length = 0, cl = 0; -+ http_message *msg = NULL; -+ zend_object_value ov; -+ http_message_object *obj = NULL; -+ -+ RETVAL_NULL(); -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|ss", &string, &length, &cn, &cl)) { -+ if (length) { -+ msg = http_message_parse(string, length); -+ } -+ if ((msg || !length) && SUCCESS == http_object_new(&ov, cn, cl, _http_message_object_new_ex, http_message_object_ce, msg, &obj)) { -+ RETVAL_OBJVAL(ov, 0); -+ } -+ if (obj && !obj->message) { -+ obj->message = http_message_new(); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto static HttpMessage HttpMessage::fromEnv(int type[, string class_name = "HttpMessage"]) -+ Create a new HttpMessage object from environment representing either current request or response */ -+PHP_METHOD(HttpMessage, fromEnv) -+{ -+ char *cn = NULL; -+ int cl = 0; -+ long type; -+ http_message_object *obj = NULL; -+ zend_object_value ov; -+ -+ RETVAL_NULL(); -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l|s", &type, &cn, &cl)) { -+ if (SUCCESS == http_object_new(&ov, cn, cl, _http_message_object_new_ex, http_message_object_ce, http_message_init_env(NULL, type), &obj)) { -+ RETVAL_OBJVAL(ov, 0); -+ } -+ if (obj && !obj->message) { -+ obj->message = http_message_new(); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::getBody() -+ Get the body of the parsed HttpMessage. */ -+PHP_METHOD(HttpMessage, getBody) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_message_object, obj); -+ RETURN_PHPSTR(&obj->message->body, PHPSTR_FREE_NOT, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpMessage::setBody(string body) -+ Set the body of the HttpMessage. NOTE: Don't forget to update any headers accordingly. */ -+PHP_METHOD(HttpMessage, setBody) -+{ -+ char *body; -+ int len; -+ getObject(http_message_object, obj); -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &body, &len)) { -+ phpstr_dtor(PHPSTR(obj->message)); -+ phpstr_from_string_ex(PHPSTR(obj->message), body, len); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::getHeader(string header) -+ Get message header. */ -+PHP_METHOD(HttpMessage, getHeader) -+{ -+ zval *header; -+ char *orig_header, *nice_header; -+ int header_len; -+ getObject(http_message_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &orig_header, &header_len)) { -+ RETURN_FALSE; -+ } -+ -+ nice_header = pretty_key(estrndup(orig_header, header_len), header_len, 1, 1); -+ if ((header = http_message_header_ex(obj->message, nice_header, header_len + 1, 0))) { -+ RETVAL_ZVAL(header, 1, 1); -+ } -+ efree(nice_header); -+} -+/* }}} */ -+ -+/* {{{ proto array HttpMessage::getHeaders() -+ Get Message Headers. */ -+PHP_METHOD(HttpMessage, getHeaders) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_message_object, obj); -+ -+ array_init(return_value); -+ array_copy(&obj->message->hdrs, Z_ARRVAL_P(return_value)); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpMessage::setHeaders(array headers) -+ Sets new headers. */ -+PHP_METHOD(HttpMessage, setHeaders) -+{ -+ zval *new_headers = NULL; -+ getObject(http_message_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &new_headers)) { -+ return; -+ } -+ -+ zend_hash_clean(&obj->message->hdrs); -+ if (new_headers) { -+ array_copy(Z_ARRVAL_P(new_headers), &obj->message->hdrs); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpMessage::addHeaders(array headers[, bool append = false]) -+ Add headers. If append is true, headers with the same name will be separated, else overwritten. */ -+PHP_METHOD(HttpMessage, addHeaders) -+{ -+ zval *new_headers; -+ zend_bool append = 0; -+ getObject(http_message_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a|b", &new_headers, &append)) { -+ return; -+ } -+ -+ array_join(Z_ARRVAL_P(new_headers), &obj->message->hdrs, append, ARRAY_JOIN_STRONLY|ARRAY_JOIN_PRETTIFY); -+} -+/* }}} */ -+ -+/* {{{ proto int HttpMessage::getType() -+ Get Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE) */ -+PHP_METHOD(HttpMessage, getType) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_message_object, obj); -+ RETURN_LONG(obj->message->type); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpMessage::setType(int type) -+ Set Message Type. (HTTP_MSG_NONE|HTTP_MSG_REQUEST|HTTP_MSG_RESPONSE) */ -+PHP_METHOD(HttpMessage, setType) -+{ -+ long type; -+ getObject(http_message_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &type)) { -+ return; -+ } -+ http_message_set_type(obj->message, type); -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::getInfo(void) -+ Get the HTTP request/response line */ -+PHP_METHOD(HttpMessage, getInfo) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_message_object, obj); -+ -+ switch (obj->message->type) { -+ case HTTP_MSG_REQUEST: -+ Z_STRLEN_P(return_value) = spprintf(&Z_STRVAL_P(return_value), 0, HTTP_INFO_REQUEST_FMT_ARGS(&obj->message->http, "")); -+ break; -+ case HTTP_MSG_RESPONSE: -+ Z_STRLEN_P(return_value) = spprintf(&Z_STRVAL_P(return_value), 0, HTTP_INFO_RESPONSE_FMT_ARGS(&obj->message->http, "")); -+ break; -+ default: -+ RETURN_NULL(); -+ break; -+ } -+ Z_TYPE_P(return_value) = IS_STRING; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpMessage::setInfo(string http_info) -+ Set type and request or response info with a standard HTTP request or response line */ -+PHP_METHOD(HttpMessage, setInfo) -+{ -+ char *str; -+ int len; -+ http_info inf; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &str, &len) && SUCCESS == http_info_parse_ex(str, &inf, 0)) { -+ getObject(http_message_object, obj); -+ -+ http_message_set_info(obj->message, &inf); -+ http_info_dtor(&inf); -+ RETURN_TRUE; -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto int HttpMessage::getResponseCode() -+ Get the Response Code of the Message. */ -+PHP_METHOD(HttpMessage, getResponseCode) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_message_object, obj); -+ HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); -+ RETURN_LONG(obj->message->http.info.response.code); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpMessage::setResponseCode(int code) -+ Set the response code of an HTTP Response Message. */ -+PHP_METHOD(HttpMessage, setResponseCode) -+{ -+ long code; -+ getObject(http_message_object, obj); -+ -+ HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &code)) { -+ RETURN_FALSE; -+ } -+ if (code < 100 || code > 599) { -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid response code (100-599): %ld", code); -+ RETURN_FALSE; -+ } -+ -+ obj->message->http.info.response.code = code; -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::getResponseStatus() -+ Get the Response Status of the message (i.e. the string following the response code). */ -+PHP_METHOD(HttpMessage, getResponseStatus) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_message_object, obj); -+ HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); -+ if (obj->message->http.info.response.status) { -+ RETURN_STRING(obj->message->http.info.response.status, 1); -+ } else { -+ RETURN_EMPTY_STRING(); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpMessage::setResponseStatus(string status) -+ Set the Response Status of the HTTP message (i.e. the string following the response code). */ -+PHP_METHOD(HttpMessage, setResponseStatus) -+{ -+ char *status; -+ int status_len; -+ getObject(http_message_object, obj); -+ -+ HTTP_CHECK_MESSAGE_TYPE_RESPONSE(obj->message, RETURN_FALSE); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &status, &status_len)) { -+ RETURN_FALSE; -+ } -+ STR_SET(obj->message->http.info.response.status, estrndup(status, status_len)); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::getRequestMethod() -+ Get the Request Method of the Message. */ -+PHP_METHOD(HttpMessage, getRequestMethod) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_message_object, obj); -+ HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); -+ if (obj->message->http.info.request.method) { -+ RETURN_STRING(obj->message->http.info.request.method, 1); -+ } else { -+ RETURN_EMPTY_STRING(); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpMessage::setRequestMethod(string method) -+ Set the Request Method of the HTTP Message. */ -+PHP_METHOD(HttpMessage, setRequestMethod) -+{ -+ char *method; -+ int method_len; -+ getObject(http_message_object, obj); -+ -+ HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &method, &method_len)) { -+ RETURN_FALSE; -+ } -+ if (method_len < 1) { -+ http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Cannot set HttpMessage::requestMethod to an empty string"); -+ RETURN_FALSE; -+ } -+ if (!http_request_method_exists(1, 0, method)) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unknown request method: %s", method); -+ RETURN_FALSE; -+ } -+ -+ STR_SET(obj->message->http.info.request.method, estrndup(method, method_len)); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::getRequestUrl() -+ Get the Request URL of the Message. */ -+PHP_METHOD(HttpMessage, getRequestUrl) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_message_object, obj); -+ HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); -+ if (obj->message->http.info.request.url) { -+ RETURN_STRING(obj->message->http.info.request.url, 1); -+ } else { -+ RETURN_EMPTY_STRING(); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpMessage::setRequestUrl(string url) -+ Set the Request URL of the HTTP Message. */ -+PHP_METHOD(HttpMessage, setRequestUrl) -+{ -+ char *URI; -+ int URIlen; -+ getObject(http_message_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URI, &URIlen)) { -+ RETURN_FALSE; -+ } -+ HTTP_CHECK_MESSAGE_TYPE_REQUEST(obj->message, RETURN_FALSE); -+ if (URIlen < 1) { -+ http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Cannot set HttpMessage::requestUrl to an empty string"); -+ RETURN_FALSE; -+ } -+ -+ STR_SET(obj->message->http.info.request.url, estrndup(URI, URIlen)); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::getHttpVersion() -+ Get the HTTP Protocol Version of the Message. */ -+PHP_METHOD(HttpMessage, getHttpVersion) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ char *version; -+ getObject(http_message_object, obj); -+ -+ spprintf(&version, 0, "%1.1F", obj->message->http.version); -+ RETURN_STRING(version, 0); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpMessage::setHttpVersion(string version) -+ Set the HTTP Protocol version of the Message. */ -+PHP_METHOD(HttpMessage, setHttpVersion) -+{ -+ zval *zv; -+ char *version; -+ getObject(http_message_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &zv)) { -+ return; -+ } -+ -+ convert_to_double(zv); -+ spprintf(&version, 0, "%1.1F", Z_DVAL_P(zv)); -+ if (strcmp(version, "1.0") && strcmp(version, "1.1")) { -+ efree(version); -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid HTTP protocol version (1.0 or 1.1): %g", Z_DVAL_P(zv)); -+ RETURN_FALSE; -+ } -+ efree(version); -+ obj->message->http.version = Z_DVAL_P(zv); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::guessContentType(string magic_file[, int magic_mode = MAGIC_MIME]) -+ Attempts to guess the content type of supplied payload through libmagic. */ -+PHP_METHOD(HttpMessage, guessContentType) -+{ -+#ifdef HTTP_HAVE_MAGIC -+ char *magic_file, *ct = NULL; -+ int magic_file_len; -+ long magic_mode = MAGIC_MIME; -+ -+ RETVAL_FALSE; -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) { -+ getObject(http_message_object, obj); -+ if ((ct = http_guess_content_type(magic_file, magic_mode, PHPSTR_VAL(&obj->message->body), PHPSTR_LEN(&obj->message->body), SEND_DATA))) { -+ RETVAL_STRING(ct, 0); -+ } -+ } -+ SET_EH_NORMAL(); -+#else -+ http_error(HE_THROW, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available"); -+ RETURN_FALSE; -+#endif -+} -+/* }}} */ -+ -+/* {{{ proto HttpMessage HttpMessage::getParentMessage() -+ Get parent Message. */ -+PHP_METHOD(HttpMessage, getParentMessage) -+{ -+ SET_EH_THROW_HTTP(); -+ NO_ARGS { -+ getObject(http_message_object, obj); -+ -+ if (obj->message->parent) { -+ RETVAL_OBJVAL(obj->parent, 1); -+ } else { -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "HttpMessage does not have a parent message"); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpMessage::send() -+ Send the Message according to its type as Response or Request. */ -+PHP_METHOD(HttpMessage, send) -+{ -+ getObject(http_message_object, obj); -+ -+ NO_ARGS; -+ -+ RETURN_SUCCESS(http_message_send(obj->message)); -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::toString([bool include_parent = false]) -+ Get the string representation of the Message. */ -+PHP_METHOD(HttpMessage, toString) -+{ -+ if (return_value_used) { -+ char *string; -+ size_t length; -+ zend_bool include_parent = 0; -+ getObject(http_message_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &include_parent)) { -+ RETURN_FALSE; -+ } -+ -+ if (include_parent) { -+ http_message_serialize(obj->message, &string, &length); -+ } else { -+ http_message_tostring(obj->message, &string, &length); -+ } -+ RETURN_STRINGL(string, length, 0); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto HttpRequest|HttpResponse HttpMessage::toMessageTypeObject(void) -+ Creates an object regarding to the type of the message. Returns either an HttpRequest or HttpResponse object on success, or NULL on failure. */ -+PHP_METHOD(HttpMessage, toMessageTypeObject) -+{ -+ SET_EH_THROW_HTTP(); -+ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_message_object, obj); -+ -+ switch (obj->message->type) { -+ case HTTP_MSG_REQUEST: -+ { -+#ifdef HTTP_HAVE_CURL -+ int method; -+ char *url; -+ zval post, body, *array, *headers, *host = http_message_header(obj->message, "Host"); -+ php_url hurl, *purl = php_url_parse(STR_PTR(obj->message->http.info.request.url)); -+ -+ MAKE_STD_ZVAL(array); -+ array_init(array); -+ -+ memset(&hurl, 0, sizeof(php_url)); -+ if (host) { -+ hurl.host = Z_STRVAL_P(host); -+ zval_ptr_dtor(&host); -+ } -+ http_build_url(HTTP_URL_REPLACE, purl, &hurl, NULL, &url, NULL); -+ php_url_free(purl); -+ add_assoc_string(array, "url", url, 0); -+ -+ if ( obj->message->http.info.request.method && -+ ((method = http_request_method_exists(1, 0, obj->message->http.info.request.method)) || -+ (method = http_request_method_register(obj->message->http.info.request.method, strlen(obj->message->http.info.request.method))))) { -+ add_assoc_long(array, "method", method); -+ } -+ -+ if (10 == (int) (obj->message->http.version * 10)) { -+ add_assoc_long(array, "protocol", CURL_HTTP_VERSION_1_0); -+ } -+ -+ MAKE_STD_ZVAL(headers); -+ array_init(headers); -+ array_copy(&obj->message->hdrs, Z_ARRVAL_P(headers)); -+ add_assoc_zval(array, "headers", headers); -+ -+ object_init_ex(return_value, http_request_object_ce); -+ zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setoptions", NULL, array); -+ zval_ptr_dtor(&array); -+ -+ if (PHPSTR_VAL(obj->message) && PHPSTR_LEN(obj->message)) { -+ phpstr_fix(PHPSTR(obj->message)); -+ INIT_PZVAL(&body); -+ ZVAL_STRINGL(&body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 0); -+ if (method != HTTP_POST) { -+ zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setbody", NULL, &body); -+ } else { -+ INIT_PZVAL(&post); -+ array_init(&post); -+ -+ zval_copy_ctor(&body); -+ sapi_module.treat_data(PARSE_STRING, Z_STRVAL(body), &post TSRMLS_CC); -+ zend_call_method_with_1_params(&return_value, http_request_object_ce, NULL, "setpostfields", NULL, &post); -+ zval_dtor(&post); -+ } -+ } -+#else -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpRequest (missing curl support)"); -+#endif -+ break; -+ } -+ -+ case HTTP_MSG_RESPONSE: -+ { -+#ifndef WONKY -+ HashPosition pos1, pos2; -+ HashKey key = initHashKey(0); -+ zval **header, **h, *body; -+ -+ if (obj->message->http.info.response.code) { -+ http_send_status(obj->message->http.info.response.code); -+ } -+ -+ object_init_ex(return_value, http_response_object_ce); -+ -+ FOREACH_HASH_KEYVAL(pos1, &obj->message->hdrs, key, header) { -+ if (key.type == HASH_KEY_IS_STRING) { -+ zval *zkey; -+ -+ MAKE_STD_ZVAL(zkey); -+ ZVAL_STRINGL(zkey, key.str, key.len - 1, 1); -+ -+ switch (Z_TYPE_PP(header)) { -+ case IS_ARRAY: -+ case IS_OBJECT: -+ FOREACH_HASH_VAL(pos2, HASH_OF(*header), h) { -+ ZVAL_ADDREF(*h); -+ zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, zkey, *h); -+ zval_ptr_dtor(h); -+ } -+ break; -+ -+ default: -+ ZVAL_ADDREF(*header); -+ zend_call_method_with_2_params(&return_value, http_response_object_ce, NULL, "setheader", NULL, zkey, *header); -+ zval_ptr_dtor(header); -+ break; -+ } -+ zval_ptr_dtor(&zkey); -+ } -+ } -+ -+ MAKE_STD_ZVAL(body); -+ ZVAL_STRINGL(body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message), 1); -+ zend_call_method_with_1_params(&return_value, http_response_object_ce, NULL, "setdata", NULL, body); -+ zval_ptr_dtor(&body); -+#else -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot transform HttpMessage to HttpResponse (need PHP 5.1+)"); -+#endif -+ break; -+ } -+ -+ default: -+ http_error(HE_WARNING, HTTP_E_MESSAGE_TYPE, "HttpMessage is neither of type HttpMessage::TYPE_REQUEST nor HttpMessage::TYPE_RESPONSE"); -+ break; -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto int HttpMessage::count() -+ Implements Countable::count(). Returns the number of parent messages + 1. */ -+PHP_METHOD(HttpMessage, count) -+{ -+ NO_ARGS { -+ long i; -+ getObject(http_message_object, obj); -+ -+ http_message_count(i, obj->message); -+ RETURN_LONG(i); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpMessage::serialize() -+ Implements Serializable::serialize(). Returns the serialized representation of the HttpMessage. */ -+PHP_METHOD(HttpMessage, serialize) -+{ -+ NO_ARGS { -+ char *string; -+ size_t length; -+ getObject(http_message_object, obj); -+ -+ http_message_serialize(obj->message, &string, &length); -+ RETURN_STRINGL(string, length, 0); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpMessage::unserialize(string serialized) -+ Implements Serializable::unserialize(). Re-constructs the HttpMessage based upon the serialized string. */ -+PHP_METHOD(HttpMessage, unserialize) -+{ -+ int length; -+ char *serialized; -+ getObject(http_message_object, obj); -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &serialized, &length)) { -+ http_message *msg; -+ -+ http_message_dtor(obj->message); -+ if ((msg = http_message_parse_ex(obj->message, serialized, (size_t) length))) { -+ obj->message = msg; -+ } else { -+ http_message_init(obj->message); -+ http_error(HE_ERROR, HTTP_E_RUNTIME, "Could not unserialize HttpMessage"); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto HttpMessage HttpMessage::detach(void) -+ Returns a clone of an HttpMessage object detached from any parent messages. */ -+PHP_METHOD(HttpMessage, detach) -+{ -+ http_info info; -+ http_message *msg; -+ getObject(http_message_object, obj); -+ -+ NO_ARGS; -+ -+ info.type = obj->message->type; -+ memcpy(&HTTP_INFO(&info), &HTTP_INFO(obj->message), sizeof(struct http_info)); -+ -+ msg = http_message_new(); -+ http_message_set_info(msg, &info); -+ -+ zend_hash_copy(&msg->hdrs, &obj->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ phpstr_append(&msg->body, PHPSTR_VAL(obj->message), PHPSTR_LEN(obj->message)); -+ -+ RETVAL_OBJVAL(http_message_object_new_ex(Z_OBJCE_P(getThis()), msg, NULL), 0); -+} -+/* }}} */ -+ -+/* {{{ proto void HttpMessage::prepend(HttpMessage message[, bool top = true]) -+ Prepends message(s) to the HTTP message. Throws HttpInvalidParamException if the message is located within the same message chain. */ -+PHP_METHOD(HttpMessage, prepend) -+{ -+ zval *prepend; -+ zend_bool top = 1; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O|b", &prepend, http_message_object_ce, &top)) { -+ http_message *msg[2]; -+ getObject(http_message_object, obj); -+ getObjectEx(http_message_object, prepend_obj, prepend); -+ -+ /* safety check */ -+ for (msg[0] = obj->message; msg[0]; msg[0] = msg[0]->parent) { -+ for (msg[1] = prepend_obj->message; msg[1]; msg[1] = msg[1]->parent) { -+ if (msg[0] == msg[1]) { -+ http_error(HE_THROW, HTTP_E_INVALID_PARAM, "Cannot prepend a message located within the same message chain"); -+ return; -+ } -+ } -+ } -+ -+ http_message_object_prepend_ex(getThis(), prepend, top); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto HttpMessage HttpMessage::reverse() -+ Reorders the message chain in reverse order. Returns the most parent HttpMessage object. */ -+PHP_METHOD(HttpMessage, reverse) -+{ -+ NO_ARGS { -+ http_message_object_reverse(getThis(), return_value); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpMessage::rewind(void) -+ Implements Iterator::rewind(). */ -+PHP_METHOD(HttpMessage, rewind) -+{ -+ NO_ARGS { -+ getObject(http_message_object, obj); -+ -+ if (obj->iterator) { -+ zval_ptr_dtor(&obj->iterator); -+ } -+ ZVAL_ADDREF(getThis()); -+ obj->iterator = getThis(); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpMessage::valid(void) -+ Implements Iterator::valid(). */ -+PHP_METHOD(HttpMessage, valid) -+{ -+ NO_ARGS { -+ getObject(http_message_object, obj); -+ -+ RETURN_BOOL(obj->iterator != NULL); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpMessage::next(void) -+ Implements Iterator::next(). */ -+PHP_METHOD(HttpMessage, next) -+{ -+ NO_ARGS { -+ getObject(http_message_object, obj); -+ if (obj->iterator) { -+ getObjectEx(http_message_object, itr, obj->iterator); -+ -+ if (itr && itr->parent.handle) { -+ zval *old = obj->iterator; -+ MAKE_STD_ZVAL(obj->iterator); -+ ZVAL_OBJVAL(obj->iterator, itr->parent, 1); -+ zval_ptr_dtor(&old); -+ } else { -+ zval_ptr_dtor(&obj->iterator); -+ obj->iterator = NULL; -+ } -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto int HttpMessage::key(void) -+ Implements Iterator::key(). */ -+PHP_METHOD(HttpMessage, key) -+{ -+ NO_ARGS { -+ getObject(http_message_object, obj); -+ -+ RETURN_LONG(obj->iterator ? obj->iterator->value.obj.handle:0); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto HttpMessage HttpMessage::current(void) -+ Implements Iterator::current(). */ -+PHP_METHOD(HttpMessage, current) -+{ -+ NO_ARGS { -+ getObject(http_message_object, obj); -+ -+ if (obj->iterator) { -+ RETURN_ZVAL(obj->iterator, 1, 0); -+ } -+ } -+} -+/* }}} */ -+ -+#endif /* ZEND_ENGINE_2 */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_persistent_handle_api.c -@@ -0,0 +1,388 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_persistent_handle_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#include "php_http.h" -+#include "php_http_api.h" -+ -+#include "php_http_persistent_handle_api.h" -+ -+#ifndef HTTP_DEBUG_PHANDLES -+# define HTTP_DEBUG_PHANDLES 0 -+#endif -+#if HTTP_DEBUG_PHANDLES -+# undef inline -+# define inline -+#endif -+ -+static HashTable http_persistent_handles_hash; -+#ifdef ZTS -+# define LOCK() tsrm_mutex_lock(http_persistent_handles_lock) -+# define UNLOCK() tsrm_mutex_unlock(http_persistent_handles_lock) -+static MUTEX_T http_persistent_handles_lock; -+#else -+# define LOCK() -+# define UNLOCK() -+#endif -+ -+typedef struct _http_persistent_handle_list_t { -+ HashTable free; -+ ulong used; -+} http_persistent_handle_list; -+ -+typedef struct _http_persistent_handle_provider_t { -+ http_persistent_handle_list list; /* "ident" => array(handles) entries */ -+ http_persistent_handle_ctor ctor; -+ http_persistent_handle_dtor dtor; -+ http_persistent_handle_copy copy; -+} http_persistent_handle_provider; -+ -+static inline http_persistent_handle_list *http_persistent_handle_list_init(http_persistent_handle_list *list) -+{ -+ int free_list; -+ -+ if ((free_list = !list)) { -+ list = pemalloc(sizeof(http_persistent_handle_list), 1); -+ } -+ -+ list->used = 0; -+ -+ if (SUCCESS != zend_hash_init(&list->free, 0, NULL, NULL, 1)) { -+ if (free_list) { -+ pefree(list, 1); -+ } -+ list = NULL; -+ } -+ -+ return list; -+} -+ -+static inline void http_persistent_handle_list_dtor(http_persistent_handle_list *list, http_persistent_handle_dtor dtor) -+{ -+ HashPosition pos; -+ void **handle; -+ -+#if HTTP_DEBUG_PHANDLES -+ fprintf(stderr, "LSTDTOR: %p\n", list); -+#endif -+ FOREACH_HASH_VAL(pos, &list->free, handle) { -+#if HTTP_DEBUG_PHANDLES -+ fprintf(stderr, "DESTROY: %p\n", *handle); -+#endif -+ -+ dtor(*handle); -+ } -+ zend_hash_destroy(&list->free); -+} -+ -+static inline void http_persistent_handle_list_free(http_persistent_handle_list **list, http_persistent_handle_dtor dtor) -+{ -+ http_persistent_handle_list_dtor(*list, dtor); -+#if HTTP_DEBUG_PHANDLES -+ fprintf(stderr, "LSTFREE: %p\n", *list); -+#endif -+ pefree(*list, 1); -+ *list = NULL; -+} -+ -+static inline http_persistent_handle_list *http_persistent_handle_list_find(http_persistent_handle_provider *provider TSRMLS_DC) -+{ -+ http_persistent_handle_list **list, *new_list; -+ -+ if (SUCCESS == zend_hash_quick_find(&provider->list.free, HTTP_G->persistent.handles.ident.s, HTTP_G->persistent.handles.ident.l, HTTP_G->persistent.handles.ident.h, (void *) &list)) { -+#if HTTP_DEBUG_PHANDLES -+ fprintf(stderr, "LSTFIND: %p\n", *list); -+#endif -+ return *list; -+ } -+ -+ if ((new_list = http_persistent_handle_list_init(NULL))) { -+ if (SUCCESS == zend_hash_quick_add(&provider->list.free, HTTP_G->persistent.handles.ident.s, HTTP_G->persistent.handles.ident.l, HTTP_G->persistent.handles.ident.h, (void *) &new_list, sizeof(http_persistent_handle_list *), (void *) &list)) { -+#if HTTP_DEBUG_PHANDLES -+ fprintf(stderr, "LSTFIND: %p (new)\n", *list); -+#endif -+ return *list; -+ } -+ http_persistent_handle_list_free(&new_list, provider->dtor); -+ } -+ -+ return NULL; -+} -+ -+static inline STATUS http_persistent_handle_do_acquire(http_persistent_handle_provider *provider, void **handle TSRMLS_DC) -+{ -+ ulong index; -+ void **handle_ptr; -+ http_persistent_handle_list *list; -+ -+ if ((list = http_persistent_handle_list_find(provider TSRMLS_CC))) { -+ zend_hash_internal_pointer_end(&list->free); -+ if (HASH_KEY_NON_EXISTANT != zend_hash_get_current_key(&list->free, NULL, &index, 0) && SUCCESS == zend_hash_get_current_data(&list->free, (void *) &handle_ptr)) { -+ *handle = *handle_ptr; -+ zend_hash_index_del(&list->free, index); -+ } else { -+ *handle = provider->ctor(); -+ } -+ -+ if (*handle) { -+ ++provider->list.used; -+ ++list->used; -+ return SUCCESS; -+ } -+ } else { -+ *handle = NULL; -+ } -+ -+ return FAILURE; -+} -+ -+static inline STATUS http_persistent_handle_do_release(http_persistent_handle_provider *provider, void **handle TSRMLS_DC) -+{ -+ http_persistent_handle_list *list; -+ -+ if ((list = http_persistent_handle_list_find(provider TSRMLS_CC))) { -+ if (provider->list.used >= HTTP_G->persistent.handles.limit) { -+ provider->dtor(*handle); -+ } else { -+ if (SUCCESS != zend_hash_next_index_insert(&list->free, (void *) handle, sizeof(void *), NULL)) { -+ return FAILURE; -+ } -+ } -+ -+ *handle = NULL; -+ --provider->list.used; -+ --list->used; -+ return SUCCESS; -+ } -+ -+ return FAILURE; -+} -+ -+static inline STATUS http_persistent_handle_do_accrete(http_persistent_handle_provider *provider, void *old_handle, void **new_handle TSRMLS_DC) -+{ -+ http_persistent_handle_list *list; -+ -+ if (provider->copy && (*new_handle = provider->copy(old_handle))) { -+ if ((list = http_persistent_handle_list_find(provider TSRMLS_CC))) { -+ ++list->used; -+ } -+ ++provider->list.used; -+ return SUCCESS; -+ } -+ return FAILURE; -+} -+ -+static void http_persistent_handles_hash_dtor(void *p) -+{ -+ http_persistent_handle_provider *provider = (http_persistent_handle_provider *) p; -+ http_persistent_handle_list **list, *list_tmp; -+ HashPosition pos; -+ -+ FOREACH_HASH_VAL(pos, &provider->list.free, list) { -+ /* fix shutdown crash in PHP4 */ -+ list_tmp = *list; -+ http_persistent_handle_list_free(&list_tmp, provider->dtor); -+ } -+ -+ zend_hash_destroy(&provider->list.free); -+} -+ -+PHP_MINIT_FUNCTION(http_persistent_handle) -+{ -+ zend_hash_init(&http_persistent_handles_hash, 0, NULL, http_persistent_handles_hash_dtor, 1); -+#ifdef ZTS -+ http_persistent_handles_lock = tsrm_mutex_alloc(); -+#endif -+ return SUCCESS; -+} -+ -+PHP_MSHUTDOWN_FUNCTION(http_persistent_handle) -+{ -+ zend_hash_destroy(&http_persistent_handles_hash); -+#ifdef ZTS -+ tsrm_mutex_free(http_persistent_handles_lock); -+#endif -+ return SUCCESS; -+} -+ -+PHP_HTTP_API STATUS _http_persistent_handle_provide_ex(const char *name_str, size_t name_len, http_persistent_handle_ctor ctor, http_persistent_handle_dtor dtor, http_persistent_handle_copy copy) -+{ -+ STATUS status = FAILURE; -+ http_persistent_handle_provider provider; -+ -+ LOCK(); -+ if (http_persistent_handle_list_init(&provider.list)) { -+ provider.ctor = ctor; -+ provider.dtor = dtor; -+ provider.copy = copy; -+ -+#if HTTP_DEBUG_PHANDLES -+ fprintf(stderr, "PROVIDE: %s\n", name_str); -+#endif -+ -+ if (SUCCESS == zend_hash_add(&http_persistent_handles_hash, HTTP_ZAPI_CONST_CAST(char *) name_str, name_len+1, (void *) &provider, sizeof(http_persistent_handle_provider), NULL)) { -+ status = SUCCESS; -+ } -+ } -+ UNLOCK(); -+ -+ return status; -+} -+ -+PHP_HTTP_API STATUS _http_persistent_handle_acquire_ex(const char *name_str, size_t name_len, void **handle TSRMLS_DC) -+{ -+ STATUS status = FAILURE; -+ http_persistent_handle_provider *provider; -+ -+ *handle = NULL; -+ LOCK(); -+ if (SUCCESS == zend_hash_find(&http_persistent_handles_hash, HTTP_ZAPI_CONST_CAST(char *) name_str, name_len+1, (void *) &provider)) { -+ status = http_persistent_handle_do_acquire(provider, handle TSRMLS_CC); -+ } -+ UNLOCK(); -+ -+#if HTTP_DEBUG_PHANDLES -+ fprintf(stderr, "ACQUIRE: %p (%s)\n", *handle, name_str); -+#endif -+ -+ return status; -+} -+ -+PHP_HTTP_API STATUS _http_persistent_handle_release_ex(const char *name_str, size_t name_len, void **handle TSRMLS_DC) -+{ -+ STATUS status = FAILURE; -+ http_persistent_handle_provider *provider; -+#if HTTP_DEBUG_PHANDLES -+ void *handle_tmp = *handle; -+#endif -+ -+ LOCK(); -+ if (SUCCESS == zend_hash_find(&http_persistent_handles_hash, HTTP_ZAPI_CONST_CAST(char *) name_str, name_len+1, (void *) &provider)) { -+ status = http_persistent_handle_do_release(provider, handle TSRMLS_CC); -+ } -+ UNLOCK(); -+ -+#if HTTP_DEBUG_PHANDLES -+ fprintf(stderr, "RELEASE: %p (%s)\n", handle_tmp, name_str); -+#endif -+ -+ return status; -+} -+ -+PHP_HTTP_API STATUS _http_persistent_handle_accrete_ex(const char *name_str, size_t name_len, void *old_handle, void **new_handle TSRMLS_DC) -+{ -+ STATUS status = FAILURE; -+ http_persistent_handle_provider *provider; -+ -+ *new_handle = NULL; -+ LOCK(); -+ if (SUCCESS == zend_hash_find(&http_persistent_handles_hash, HTTP_ZAPI_CONST_CAST(char *) name_str, name_len+1, (void *) &provider)) { -+ status = http_persistent_handle_do_accrete(provider, old_handle, new_handle TSRMLS_CC); -+ } -+ UNLOCK(); -+ -+#if HTTP_DEBUG_PHANDLES -+ fprintf(stderr, "ACCRETE: %p > %p (%s)\n", old_handle, *new_handle, name_str); -+#endif -+ -+ return status; -+} -+ -+PHP_HTTP_API void _http_persistent_handle_cleanup_ex(const char *name_str, size_t name_len, int current_ident_only TSRMLS_DC) -+{ -+ http_persistent_handle_provider *provider; -+ http_persistent_handle_list *list, **listp; -+ HashPosition pos1, pos2; -+ -+ LOCK(); -+ if (name_str && name_len) { -+ if (SUCCESS == zend_hash_find(&http_persistent_handles_hash, HTTP_ZAPI_CONST_CAST(char *) name_str, name_len+1, (void *) &provider)) { -+ if (current_ident_only) { -+ if ((list = http_persistent_handle_list_find(provider TSRMLS_CC))) { -+ http_persistent_handle_list_dtor(list, provider->dtor); -+ http_persistent_handle_list_init(list); -+ } -+ } else { -+ FOREACH_HASH_VAL(pos1, &provider->list.free, listp) { -+ http_persistent_handle_list_dtor(*listp, provider->dtor); -+ http_persistent_handle_list_init(*listp); -+ } -+ } -+ } -+ } else { -+ FOREACH_HASH_VAL(pos1, &http_persistent_handles_hash, provider) { -+ if (current_ident_only) { -+ if ((list = http_persistent_handle_list_find(provider TSRMLS_CC))) { -+ http_persistent_handle_list_dtor(list, provider->dtor); -+ http_persistent_handle_list_init(list); -+ } -+ } else { -+ FOREACH_HASH_VAL(pos2, &provider->list.free, listp) { -+ http_persistent_handle_list_dtor(*listp, provider->dtor); -+ http_persistent_handle_list_init(*listp); -+ } -+ } -+ } -+ } -+ UNLOCK(); -+} -+ -+PHP_HTTP_API HashTable *_http_persistent_handle_statall_ex(HashTable *ht TSRMLS_DC) -+{ -+ zval *zentry[2]; -+ HashPosition pos1, pos2; -+ HashKey key1 = initHashKey(0), key2 = initHashKey(0); -+ http_persistent_handle_provider *provider; -+ http_persistent_handle_list **list; -+ -+ LOCK(); -+ if (zend_hash_num_elements(&http_persistent_handles_hash)) { -+ if (!ht) { -+ ALLOC_HASHTABLE(ht); -+ zend_hash_init(ht, 0, NULL, ZVAL_PTR_DTOR, 0); -+ } -+ -+ FOREACH_HASH_KEYVAL(pos1, &http_persistent_handles_hash, key1, provider) { -+ MAKE_STD_ZVAL(zentry[0]); -+ array_init(zentry[0]); -+ -+ FOREACH_HASH_KEYVAL(pos2, &provider->list.free, key2, list) { -+ MAKE_STD_ZVAL(zentry[1]); -+ array_init(zentry[1]); -+ add_assoc_long_ex(zentry[1], ZEND_STRS("used"), (*list)->used); -+ add_assoc_long_ex(zentry[1], ZEND_STRS("free"), zend_hash_num_elements(&(*list)->free)); -+ -+ /* use zend_hash_* not add_assoc_* (which is zend_symtable_*) as we want a string even for numbers */ -+ zend_hash_add(Z_ARRVAL_P(zentry[0]), key2.str, key2.len, &zentry[1], sizeof(zval *), NULL); -+ } -+ -+ zend_hash_add(ht, key1.str, key1.len, &zentry[0], sizeof(zval *), NULL); -+ } -+ } else if (ht) { -+ ht = NULL; -+ } -+ UNLOCK(); -+ -+ return ht; -+} -+ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_querystring_api.c -@@ -0,0 +1,220 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_querystring_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#include "php_http.h" -+ -+#include "php_variables.h" -+#ifdef HTTP_HAVE_ICONV -+# undef PHP_ATOM_INC -+# include "ext/iconv/php_iconv.h" -+# include "ext/standard/url.h" -+#endif -+ -+#include "php_http_api.h" -+#include "php_http_url_api.h" -+#include "php_http_querystring_api.h" -+ -+#ifdef ZEND_ENGINE_2 -+#define THIS_CE http_querystring_object_ce -+extern zend_class_entry *http_querystring_object_ce; -+#endif -+ -+ -+#define http_querystring_modify_array_ex(q, t, k, kl, i, pe) _http_querystring_modify_array_ex((q), (t), (k), (kl), (i), (pe) TSRMLS_CC) -+static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC); -+#define http_querystring_modify_array(q, p) _http_querystring_modify_array((q), (p) TSRMLS_CC) -+static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC); -+ -+ -+#ifdef HTTP_HAVE_ICONV -+PHP_HTTP_API int _http_querystring_xlate(zval *array, zval *param, const char *ie, const char *oe TSRMLS_DC) -+{ -+ HashPosition pos; -+ zval **entry = NULL; -+ char *xlate_str = NULL, *xkey; -+ size_t xlate_len = 0, xlen; -+ HashKey key = initHashKey(0); -+ -+ FOREACH_KEYVAL(pos, param, key, entry) { -+ if (key.type == HASH_KEY_IS_STRING) { -+ if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(key.str, key.len-1, &xkey, &xlen, oe, ie)) { -+ http_error_ex(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", key.len-1, key.str, ie, oe); -+ return FAILURE; -+ } -+ } -+ -+ if (Z_TYPE_PP(entry) == IS_STRING) { -+ if (PHP_ICONV_ERR_SUCCESS != php_iconv_string(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry), &xlate_str, &xlate_len, oe, ie)) { -+ if (key.type == HASH_KEY_IS_STRING) { -+ efree(xkey); -+ } -+ http_error_ex(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to convert '%.*s' from '%s' to '%s'", Z_STRLEN_PP(entry), Z_STRVAL_PP(entry), ie, oe); -+ return FAILURE; -+ } -+ if (key.type == HASH_KEY_IS_STRING) { -+ add_assoc_stringl_ex(array, xkey, xlen+1, xlate_str, xlate_len, 0); -+ } else { -+ add_index_stringl(array, key.num, xlate_str, xlate_len, 0); -+ } -+ } else if (Z_TYPE_PP(entry) == IS_ARRAY) { -+ zval *subarray; -+ -+ MAKE_STD_ZVAL(subarray); -+ array_init(subarray); -+ if (key.type == HASH_KEY_IS_STRING) { -+ add_assoc_zval_ex(array, xkey, xlen+1, subarray); -+ } else { -+ add_index_zval(array, key.num, subarray); -+ } -+ if (SUCCESS != http_querystring_xlate(subarray, *entry, ie, oe)) { -+ if (key.type == HASH_KEY_IS_STRING) { -+ efree(xkey); -+ } -+ return FAILURE; -+ } -+ } -+ -+ if (key.type == HASH_KEY_IS_STRING) { -+ efree(xkey); -+ } -+ } -+ return SUCCESS; -+} -+#endif /* HAVE_ICONV */ -+ -+PHP_HTTP_API void _http_querystring_update(zval *qarray, zval *qstring TSRMLS_DC) -+{ -+ char *s = NULL; -+ size_t l = 0; -+ -+ if (Z_TYPE_P(qarray) != IS_ARRAY) { -+ convert_to_array(qarray); -+ } -+ if (SUCCESS == http_urlencode_hash_ex(Z_ARRVAL_P(qarray), 0, NULL, 0, &s, &l)) { -+ zval_dtor(qstring); -+ ZVAL_STRINGL(qstring, s, l, 0); -+ } else { -+ http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Failed to update query string"); -+ } -+} -+ -+PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC) -+{ -+ if (Z_TYPE_P(params) == IS_ARRAY) { -+ return http_querystring_modify_array(qarray, params); -+ } else if (Z_TYPE_P(params) == IS_OBJECT) { -+#ifdef ZEND_ENGINE_2 -+ if (instanceof_function(Z_OBJCE_P(params), http_querystring_object_ce TSRMLS_CC)) { -+ return http_querystring_modify_array(qarray, zend_read_property(THIS_CE, params, ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)); -+ } else { -+#endif -+ return http_querystring_modify_array(qarray, params); -+#ifdef ZEND_ENGINE_2 -+ } -+#endif -+ } else { -+ int rv; -+ zval array; -+ zval *qstring = http_zsep(IS_STRING, params); -+ -+ INIT_PZVAL(&array); -+ array_init(&array); -+ -+ sapi_module.treat_data(PARSE_STRING, estrdup(Z_STRVAL_P(qstring)), &array TSRMLS_CC); -+ zval_ptr_dtor(&qstring); -+ -+ rv = http_querystring_modify_array(qarray, &array); -+ zval_dtor(&array); -+ return rv; -+ } -+} -+ -+static inline int _http_querystring_modify_array(zval *qarray, zval *params TSRMLS_DC) -+{ -+ int rv = 0; -+ HashKey key = initHashKey(0); -+ HashPosition pos; -+ zval **params_entry = NULL; -+ -+ FOREACH_HASH_KEYVAL(pos, HASH_OF(params), key, params_entry) { -+ /* only public properties */ -+ if ((key.type != HASH_KEY_IS_STRING || *key.str) && http_querystring_modify_array_ex(qarray, key.type, key.str, key.len, key.num, *params_entry)) { -+ rv = 1; -+ } -+ } -+ -+ return rv; -+} -+ -+static inline int _http_querystring_modify_array_ex(zval *qarray, int key_type, char *key, int keylen, ulong idx, zval *params_entry TSRMLS_DC) -+{ -+ zval **qarray_entry; -+ -+ /* ensure array type */ -+ if (Z_TYPE_P(qarray) != IS_ARRAY) { -+ convert_to_array(qarray); -+ } -+ -+ /* delete */ -+ if (Z_TYPE_P(params_entry) == IS_NULL) { -+ if (key_type == HASH_KEY_IS_STRING) { -+ return (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarray), key, keylen)); -+ } else { -+ return (SUCCESS == zend_hash_index_del(Z_ARRVAL_P(qarray), idx)); -+ } -+ } -+ -+ /* update */ -+ if ( ((key_type == HASH_KEY_IS_STRING) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), key, keylen, (void *) &qarray_entry))) || -+ ((key_type == HASH_KEY_IS_LONG) && (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(qarray), idx, (void *) &qarray_entry)))) { -+ zval equal; -+ -+ /* recursive */ -+ if (Z_TYPE_P(params_entry) == IS_ARRAY || Z_TYPE_P(params_entry) == IS_OBJECT) { -+ return http_querystring_modify(*qarray_entry, params_entry); -+ } -+ /* equal */ -+ if ((SUCCESS == is_equal_function(&equal, *qarray_entry, params_entry TSRMLS_CC)) && Z_BVAL(equal)) { -+ return 0; -+ } -+ } -+ -+ /* add */ -+ if (Z_TYPE_P(params_entry) == IS_OBJECT) { -+ zval *new_array; -+ -+ MAKE_STD_ZVAL(new_array); -+ array_init(new_array); -+ http_querystring_modify_array(new_array, params_entry); -+ params_entry = new_array; -+ } else { -+ ZVAL_ADDREF(params_entry); -+ } -+ if (key_type == HASH_KEY_IS_STRING) { -+ add_assoc_zval_ex(qarray, key, keylen, params_entry); -+ } else { -+ add_index_zval(qarray, idx, params_entry); -+ } -+ return 1; -+} -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/http_querystring_object.c -@@ -0,0 +1,628 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_querystring_object.c 300299 2010-06-09 06:23:16Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#include "php_http.h" -+ -+#ifdef ZEND_ENGINE_2 -+ -+#include "php_variables.h" -+#include "zend_interfaces.h" -+ -+#include "php_http_api.h" -+#include "php_http_querystring_api.h" -+#include "php_http_querystring_object.h" -+#include "php_http_exception_object.h" -+ -+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpQueryString, method, 0, req_args) -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpQueryString, method, 0) -+#define HTTP_QUERYSTRING_ME(method, visibility) PHP_ME(HttpQueryString, method, HTTP_ARGS(HttpQueryString, method), visibility) -+#define HTTP_QUERYSTRING_GME(method, visibility) PHP_ME(HttpQueryString, method, HTTP_ARGS(HttpQueryString, __getter), visibility) -+ -+HTTP_BEGIN_ARGS(__construct, 0) -+ HTTP_ARG_VAL(global, 0) -+ HTTP_ARG_VAL(params, 0) -+HTTP_END_ARGS; -+ -+#ifndef WONKY -+HTTP_BEGIN_ARGS(singleton, 0) -+ HTTP_ARG_VAL(global, 0) -+HTTP_END_ARGS; -+#endif -+ -+HTTP_BEGIN_ARGS(factory, 0) -+ HTTP_ARG_VAL(global, 0) -+ HTTP_ARG_VAL(params, 0) -+ HTTP_ARG_VAL(class_name, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(toArray); -+HTTP_EMPTY_ARGS(toString); -+ -+HTTP_BEGIN_ARGS(get, 0) -+ HTTP_ARG_VAL(name, 0) -+ HTTP_ARG_VAL(type, 0) -+ HTTP_ARG_VAL(defval, 0) -+ HTTP_ARG_VAL(delete, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(set, 1) -+ HTTP_ARG_VAL(params, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(mod, 0) -+ HTTP_ARG_VAL(params, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(__getter, 1) -+ HTTP_ARG_VAL(name, 0) -+ HTTP_ARG_VAL(defval, 0) -+ HTTP_ARG_VAL(delete, 0) -+HTTP_END_ARGS; -+ -+#ifdef HTTP_HAVE_ICONV -+HTTP_BEGIN_ARGS(xlate, 2) -+ HTTP_ARG_VAL(from_encoding, 0) -+ HTTP_ARG_VAL(to_encoding, 0) -+HTTP_END_ARGS; -+#endif -+ -+HTTP_EMPTY_ARGS(serialize); -+HTTP_BEGIN_ARGS(unserialize, 1) -+ HTTP_ARG_VAL(serialized, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(offsetGet, 1) -+ HTTP_ARG_VAL(offset, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(offsetSet, 2) -+ HTTP_ARG_VAL(offset, 0) -+ HTTP_ARG_VAL(value, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(offsetExists, 1) -+ HTTP_ARG_VAL(offset, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(offsetUnset, 1) -+ HTTP_ARG_VAL(offset, 0) -+HTTP_END_ARGS; -+ -+ -+#define THIS_CE http_querystring_object_ce -+zend_class_entry *http_querystring_object_ce; -+zend_function_entry http_querystring_object_fe[] = { -+ HTTP_QUERYSTRING_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR|ZEND_ACC_FINAL) -+ -+ HTTP_QUERYSTRING_ME(toArray, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_ME(toString, ZEND_ACC_PUBLIC) -+ ZEND_MALIAS(HttpQueryString, __toString, toString, HTTP_ARGS(HttpQueryString, toString), ZEND_ACC_PUBLIC) -+ -+ HTTP_QUERYSTRING_ME(get, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_ME(set, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_ME(mod, ZEND_ACC_PUBLIC) -+ -+ HTTP_QUERYSTRING_GME(getBool, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_GME(getInt, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_GME(getFloat, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_GME(getString, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_GME(getArray, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_GME(getObject, ZEND_ACC_PUBLIC) -+ -+ HTTP_QUERYSTRING_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+#ifndef WONKY -+ HTTP_QUERYSTRING_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+#endif -+#ifdef HTTP_HAVE_ICONV -+ HTTP_QUERYSTRING_ME(xlate, ZEND_ACC_PUBLIC) -+#endif -+ -+ /* Implements Serializable */ -+ HTTP_QUERYSTRING_ME(serialize, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_ME(unserialize, ZEND_ACC_PUBLIC) -+ -+ /* Implements ArrayAccess */ -+ HTTP_QUERYSTRING_ME(offsetGet, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_ME(offsetSet, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_ME(offsetExists, ZEND_ACC_PUBLIC) -+ HTTP_QUERYSTRING_ME(offsetUnset, ZEND_ACC_PUBLIC) -+ -+ EMPTY_FUNCTION_ENTRY -+}; -+static zend_object_handlers http_querystring_object_handlers; -+ -+PHP_MINIT_FUNCTION(http_querystring_object) -+{ -+ HTTP_REGISTER_CLASS_EX(HttpQueryString, http_querystring_object, NULL, 0); -+ -+#ifndef WONKY -+ zend_class_implements(http_querystring_object_ce TSRMLS_CC, 2, zend_ce_serializable, zend_ce_arrayaccess); -+#endif -+ -+ zend_declare_property_null(THIS_CE, ZEND_STRS("instance")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("queryArray")-1, ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("queryString")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); -+ -+#ifndef WONKY -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_BOOL")-1, HTTP_QUERYSTRING_TYPE_BOOL TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_INT")-1, HTTP_QUERYSTRING_TYPE_INT TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_FLOAT")-1, HTTP_QUERYSTRING_TYPE_FLOAT TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_STRING")-1, HTTP_QUERYSTRING_TYPE_STRING TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_ARRAY")-1, HTTP_QUERYSTRING_TYPE_ARRAY TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("TYPE_OBJECT")-1, HTTP_QUERYSTRING_TYPE_OBJECT TSRMLS_CC); -+#endif -+ -+ HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_BOOL", HTTP_QUERYSTRING_TYPE_BOOL); -+ HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_INT", HTTP_QUERYSTRING_TYPE_INT); -+ HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_FLOAT", HTTP_QUERYSTRING_TYPE_FLOAT); -+ HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_STRING", HTTP_QUERYSTRING_TYPE_STRING); -+ HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_ARRAY", HTTP_QUERYSTRING_TYPE_ARRAY); -+ HTTP_LONG_CONSTANT("HTTP_QUERYSTRING_TYPE_OBJECT", HTTP_QUERYSTRING_TYPE_OBJECT); -+ -+ return SUCCESS; -+} -+ -+zend_object_value _http_querystring_object_new(zend_class_entry *ce TSRMLS_DC) -+{ -+ return http_querystring_object_new_ex(ce, NULL, NULL); -+} -+ -+zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, void *nothing, http_querystring_object **ptr TSRMLS_DC) -+{ -+ zend_object_value ov; -+ http_querystring_object *o; -+ -+ o = ecalloc(1, sizeof(http_querystring_object)); -+ o->zo.ce = ce; -+ -+ if (ptr) { -+ *ptr = o; -+ } -+ -+ ALLOC_HASHTABLE(OBJ_PROP(o)); -+ zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ -+ ov.handle = putObject(http_querystring_object, o); -+ ov.handlers = &http_querystring_object_handlers; -+ -+ return ov; -+} -+ -+void _http_querystring_object_free(zend_object *object TSRMLS_DC) -+{ -+ http_querystring_object *o = (http_querystring_object *) object; -+ -+ freeObject(o); -+} -+ -+/* {{{ querystring helpers */ -+#define http_querystring_instantiate(t, g, p, u) _http_querystring_instantiate((t), (g), (p), (u) TSRMLS_CC) -+static inline zval *_http_querystring_instantiate(zval *this_ptr, zend_bool global, zval *params, zend_bool defer_update TSRMLS_DC) -+{ -+ zval *qarray = NULL, *qstring = NULL, **_SERVER = NULL, **_GET = NULL, **QUERY_STRING = NULL;; -+ -+ if (!this_ptr) { -+ MAKE_STD_ZVAL(this_ptr); -+ Z_TYPE_P(this_ptr) = IS_OBJECT; -+ this_ptr->value.obj = http_querystring_object_new(http_querystring_object_ce); -+ } -+ if (global) { -+#ifdef ZEND_ENGINE_2 -+ zend_is_auto_global("_SERVER", lenof("_SERVER") TSRMLS_CC); -+#endif -+ if ( (SUCCESS == zend_hash_find(&EG(symbol_table), "_SERVER", sizeof("_SERVER"), (void *) &_SERVER)) && -+ (Z_TYPE_PP(_SERVER) == IS_ARRAY) && -+ (SUCCESS == zend_hash_find(Z_ARRVAL_PP(_SERVER), "QUERY_STRING", sizeof("QUERY_STRING"), (void *) &QUERY_STRING))) { -+ -+ qstring = *QUERY_STRING; -+#ifdef ZEND_ENGINE_2 -+ zend_is_auto_global("_GET", lenof("_GET") TSRMLS_CC); -+#endif -+ if ((SUCCESS == zend_hash_find(&EG(symbol_table), "_GET", sizeof("_GET"), (void *) &_GET)) && (Z_TYPE_PP(_GET) == IS_ARRAY)) { -+ qarray = *_GET; -+ } else { -+ http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Could not acquire reference to superglobal GET array"); -+ } -+ } else { -+ http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Could not acquire reference to QUERY_STRING"); -+ } -+ -+ if (qarray && qstring) { -+ if (Z_TYPE_P(qstring) != IS_STRING) { -+ convert_to_string(qstring); -+ } -+ -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, qarray TSRMLS_CC); -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, qstring TSRMLS_CC); -+#ifdef Z_SET_ISREF -+ Z_SET_ISREF_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)); -+ Z_SET_ISREF_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); -+#else -+ zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)->is_ref = 1; -+ zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)->is_ref = 1; -+#endif -+ -+ if (params) { -+ http_querystring_modify(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), params); -+ } -+ if (!defer_update) { -+ http_querystring_update(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); -+ } -+ } -+ } else { -+ MAKE_STD_ZVAL(qarray); -+ array_init(qarray); -+ -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, qarray TSRMLS_CC); -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryString")-1, "", 0 TSRMLS_CC); -+ -+ if (params && http_querystring_modify(qarray, params) && !defer_update) { -+ http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); -+ } -+ -+ zval_ptr_dtor(&qarray); -+ } -+ -+ return this_ptr; -+} -+ -+#define http_querystring_get(o, t, n, l, def, del, r) _http_querystring_get((o), (t), (n), (l), (def), (del), (r) TSRMLS_CC) -+static inline void _http_querystring_get(zval *this_ptr, int type, char *name, uint name_len, zval *defval, zend_bool del, zval *return_value TSRMLS_DC) -+{ -+ zval **arrval, *qarray = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); -+ -+ if ((Z_TYPE_P(qarray) == IS_ARRAY) && (SUCCESS == zend_hash_find(Z_ARRVAL_P(qarray), name, name_len + 1, (void *) &arrval))) { -+ if (type) { -+ zval *value = http_zsep(type, *arrval); -+ RETVAL_ZVAL(value, 1, 1); -+ } else { -+ RETVAL_ZVAL(*arrval, 1, 0); -+ } -+ -+ if (del && (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarray), name, name_len + 1))) { -+ http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); -+ } -+ } else if(defval) { -+ RETURN_ZVAL(defval, 1, 0); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto final void HttpQueryString::__construct([bool global = true[, mixed add]) -+ Creates a new HttpQueryString object instance. Operates on and modifies $_GET and $_SERVER['QUERY_STRING'] if global is TRUE. */ -+PHP_METHOD(HttpQueryString, __construct) -+{ -+ zend_bool global = 1; -+ zval *params = NULL; -+ -+ SET_EH_THROW_HTTP(); -+ if (!sapi_module.treat_data) { -+ http_error(HE_ERROR, HTTP_E_QUERYSTRING, "The SAPI does not have a treat_data function registered"); -+ } else if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bz", &global, ¶ms)) { -+ http_querystring_instantiate(getThis(), global, params, 0); -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto HttpQueryString HttpQueryString::factory([bool global = TRUE[, mixed params[, string class_name = "HttpQueryString"]) -+ Creates a new HttpQueryString object instance. */ -+PHP_METHOD(HttpQueryString, factory) -+{ -+ zend_bool global = 1; -+ zval *params = NULL; -+ char *cn = NULL; -+ int cl = 0; -+ zend_object_value ov; -+ -+ SET_EH_THROW_HTTP(); -+ if (!sapi_module.treat_data) { -+ http_error(HE_ERROR, HTTP_E_QUERYSTRING, "The SAPI does not have a treat_data function registered"); -+ } else if ( SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bzs", &global, ¶ms, &cn, &cl) && -+ SUCCESS == http_object_new(&ov, cn, cl, _http_querystring_object_new_ex, http_querystring_object_ce, NULL, NULL)) { -+ RETVAL_OBJVAL(ov, 0); -+ http_querystring_instantiate(return_value, global, params, 0); -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto string HttpQueryString::toString() -+ Returns the string representation. */ -+PHP_METHOD(HttpQueryString, toString) -+{ -+ NO_ARGS; -+ RETURN_PROP(queryString); -+} -+/* }}} */ -+ -+/* {{{ proto array HttpQueryString::toArray() -+ Returns the array representation. */ -+PHP_METHOD(HttpQueryString, toArray) -+{ -+ NO_ARGS; -+ RETURN_PROP(queryArray); -+} -+/* }}} */ -+ -+/* {{{ proto mixed HttpQueryString::get([string key[, mixed type = 0[, mixed defval = NULL[, bool delete = false]]]]) -+ Get (part of) the query string. The type parameter is either one of the HttpQueryString::TYPE_* constants or a type abbreviation like "b" for bool, "i" for int, "f" for float, "s" for string, "a" for array and "o" for a stdClass object. */ -+PHP_METHOD(HttpQueryString, get) -+{ -+ char *name = NULL; -+ int name_len = 0; -+ long type = 0; -+ zend_bool del = 0; -+ zval *ztype = NULL, *defval = NULL; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|szzb", &name, &name_len, &ztype, &defval, &del)) { -+ if (name && name_len) { -+ if (ztype) { -+ if (Z_TYPE_P(ztype) == IS_LONG) { -+ type = Z_LVAL_P(ztype); -+ } else if(Z_TYPE_P(ztype) == IS_STRING) { -+ switch (Z_STRVAL_P(ztype)[0]) { -+ case 'B': -+ case 'b': type = HTTP_QUERYSTRING_TYPE_BOOL; break; -+ case 'I': -+ case 'i': type = HTTP_QUERYSTRING_TYPE_INT; break; -+ case 'F': -+ case 'f': type = HTTP_QUERYSTRING_TYPE_FLOAT; break; -+ case 'S': -+ case 's': type = HTTP_QUERYSTRING_TYPE_STRING; break; -+ case 'A': -+ case 'a': type = HTTP_QUERYSTRING_TYPE_ARRAY; break; -+ case 'O': -+ case 'o': type = HTTP_QUERYSTRING_TYPE_OBJECT; break; -+ } -+ } -+ } -+ http_querystring_get(getThis(), type, name, name_len, defval, del, return_value); -+ } else { -+ RETURN_PROP(queryString); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpQueryString::set(mixed params) -+ Set query string entry/entries. NULL values will unset the variable. */ -+PHP_METHOD(HttpQueryString, set) -+{ -+ zval *params; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) { -+ zval *qarray = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); -+ if (http_querystring_modify(qarray, params)) { -+ http_querystring_update(qarray, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); -+ } -+ } -+ -+ if (return_value_used) { -+ RETURN_PROP(queryString); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto HttpQueryString HttpQueryString::mod(mixed params) -+ Copies the query string object and sets provided params at the clone. */ -+PHP_METHOD(HttpQueryString, mod) -+{ -+ zval *zobj, *qarr, *qstr, *params; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", ¶ms)) { -+ zobj = http_querystring_instantiate(NULL, 0, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), 1); -+ qarr = zend_read_property(THIS_CE, zobj, ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); -+ qstr = zend_read_property(THIS_CE, zobj, ZEND_STRS("queryString")-1, 0 TSRMLS_CC); -+ -+ http_querystring_modify(qarr, params); -+ http_querystring_update(qarr, qstr); -+ -+ RETURN_ZVAL(zobj, 1, 1); -+ } -+} -+/* }}} */ -+ -+#ifndef WONKY -+/* {{{ proto static HttpQueryString HttpQueryString::singleton([bool global = true]) -+ Get a single instance (differentiates between the global setting). */ -+PHP_METHOD(HttpQueryString, singleton) -+{ -+ zend_bool global = 1; -+ zval *instance = *zend_std_get_static_property(THIS_CE, ZEND_STRS("instance")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &global)) { -+ zval **zobj_ptr = NULL, *zobj = NULL; -+ -+ if (Z_TYPE_P(instance) == IS_ARRAY) { -+ if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(instance), global, (void *) &zobj_ptr)) { -+ RETVAL_ZVAL(*zobj_ptr, 1, 0); -+ } else { -+ zobj = http_querystring_instantiate(NULL, global, NULL, (zend_bool) !global); -+ add_index_zval(instance, global, zobj); -+ RETVAL_OBJECT(zobj, 1); -+ } -+ } else { -+ MAKE_STD_ZVAL(instance); -+ array_init(instance); -+ -+ zobj = http_querystring_instantiate(NULL, global, NULL, (zend_bool) !global); -+ add_index_zval(instance, global, zobj); -+ RETVAL_OBJECT(zobj, 1); -+ -+ zend_update_static_property(THIS_CE, ZEND_STRS("instance")-1, instance TSRMLS_CC); -+ zval_ptr_dtor(&instance); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+#endif -+ -+/* {{{ Getters by type */ -+#define HTTP_QUERYSTRING_GETTER(method, TYPE) \ -+PHP_METHOD(HttpQueryString, method) \ -+{ \ -+ char *name; \ -+ int name_len; \ -+ zval *defval = NULL; \ -+ zend_bool del = 0; \ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|zb", &name, &name_len, &defval, &del)) { \ -+ http_querystring_get(getThis(), TYPE, name, name_len, defval, del, return_value); \ -+ } \ -+} -+HTTP_QUERYSTRING_GETTER(getBool, IS_BOOL); -+HTTP_QUERYSTRING_GETTER(getInt, IS_LONG); -+HTTP_QUERYSTRING_GETTER(getFloat, IS_DOUBLE); -+HTTP_QUERYSTRING_GETTER(getString, IS_STRING); -+HTTP_QUERYSTRING_GETTER(getArray, IS_ARRAY); -+HTTP_QUERYSTRING_GETTER(getObject, IS_OBJECT); -+/* }}} */ -+ -+#ifdef HTTP_HAVE_ICONV -+/* {{{ proto bool HttpQueryString::xlate(string ie, string oe) -+ Converts the query string from the source encoding ie to the target encoding oe. WARNING: Don't use any character set that can contain NUL bytes like UTF-16. */ -+PHP_METHOD(HttpQueryString, xlate) -+{ -+ char *ie, *oe; -+ int ie_len, oe_len; -+ zval xa, *qa, *qs; -+ STATUS rs; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss", &ie, &ie_len, &oe, &oe_len)) { -+ RETURN_FALSE; -+ } -+ -+ qa = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); -+ qs = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC); -+ INIT_PZVAL(&xa); -+ array_init(&xa); -+ -+ if (SUCCESS == (rs = http_querystring_xlate(&xa, qa, ie, oe))) { -+ zend_hash_clean(Z_ARRVAL_P(qa)); -+ zend_hash_copy(Z_ARRVAL_P(qa), Z_ARRVAL(xa), (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ http_querystring_update(qa, qs); -+ } -+ zval_dtor(&xa); -+ -+ RETURN_SUCCESS(rs); -+} -+/* }}} */ -+#endif /* HAVE_ICONV */ -+ -+/* {{{ proto string HttpQueryString::serialize() -+ Implements Serializable::serialize(). */ -+PHP_METHOD(HttpQueryString, serialize) -+{ -+ NO_ARGS; -+ RETURN_PROP(queryString); -+} -+/* }}} */ -+ -+/* {{{ proto void HttpQueryString::unserialize(string serialized) -+ Implements Serializable::unserialize(). */ -+PHP_METHOD(HttpQueryString, unserialize) -+{ -+ zval *serialized; -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z", &serialized)) { -+ if (Z_TYPE_P(serialized) == IS_STRING) { -+ http_querystring_instantiate(getThis(), 0, serialized, 0); -+ } else { -+ http_error(HE_WARNING, HTTP_E_QUERYSTRING, "Expected a string as parameter"); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto mixed HttpQueryString::offsetGet(string offset) -+ Implements ArrayAccess::offsetGet(). */ -+PHP_METHOD(HttpQueryString, offsetGet) -+{ -+ char *offset_str; -+ int offset_len; -+ zval **value; -+ -+ if ( (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) && -+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)), offset_str, offset_len + 1, (void *) &value))) { -+ RETVAL_ZVAL(*value, 1, 0); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpQueryString::offsetSet(string offset, mixed value) -+ Implements ArrayAccess::offsetGet(). */ -+PHP_METHOD(HttpQueryString, offsetSet) -+{ -+ char *offset_str; -+ int offset_len; -+ zval *value; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz", &offset_str, &offset_len, &value)) { -+ zval *qarr = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC), *qstr = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC); -+ -+ ZVAL_ADDREF(value); -+ add_assoc_zval_ex(qarr, offset_str, offset_len + 1, value); -+ http_querystring_update(qarr, qstr); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpQueryString::offsetExists(string offset) -+ Implements ArrayAccess::offsetExists(). */ -+PHP_METHOD(HttpQueryString, offsetExists) -+{ -+ char *offset_str; -+ int offset_len; -+ zval **value; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) { -+ RETURN_BOOL((SUCCESS == zend_hash_find(Z_ARRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC)), offset_str, offset_len + 1, (void *) &value)) && (Z_TYPE_PP(value) != IS_NULL)); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpQueryString::offsetUnset(string offset) -+ Implements ArrayAccess::offsetUnset(). */ -+PHP_METHOD(HttpQueryString, offsetUnset) -+{ -+ char *offset_str; -+ int offset_len; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &offset_str, &offset_len)) { -+ zval *qarr = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryArray")-1, 0 TSRMLS_CC); -+ -+ if (SUCCESS == zend_hash_del(Z_ARRVAL_P(qarr), offset_str, offset_len + 1)) { -+ http_querystring_update(qarr, zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryString")-1, 0 TSRMLS_CC)); -+ } -+ } -+} -+/* }}} */ -+ -+#endif /* ZEND_ENGINE_2 */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_request_api.c -@@ -0,0 +1,1326 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_request_api.c 310775 2011-05-05 06:02:50Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#define HTTP_WANT_CURL -+#include "php_http.h" -+ -+#ifdef HTTP_HAVE_CURL -+ -+#include "php_http_api.h" -+#include "php_http_persistent_handle_api.h" -+#include "php_http_request_api.h" -+#include "php_http_url_api.h" -+ -+#ifdef ZEND_ENGINE_2 -+# include "php_http_request_object.h" -+#endif -+ -+#include "php_http_request_int.h" -+ -+/* {{{ cruft for thread safe SSL crypto locks */ -+#ifdef HTTP_NEED_OPENSSL_TSL -+static MUTEX_T *http_openssl_tsl = NULL; -+ -+static void http_openssl_thread_lock(int mode, int n, const char * file, int line) -+{ -+ if (mode & CRYPTO_LOCK) { -+ tsrm_mutex_lock(http_openssl_tsl[n]); -+ } else { -+ tsrm_mutex_unlock(http_openssl_tsl[n]); -+ } -+} -+ -+static ulong http_openssl_thread_id(void) -+{ -+ return (ulong) tsrm_thread_id(); -+} -+#endif -+#ifdef HTTP_NEED_GNUTLS_TSL -+static int http_gnutls_mutex_create(void **m) -+{ -+ if (*((MUTEX_T *) m) = tsrm_mutex_alloc()) { -+ return SUCCESS; -+ } else { -+ return FAILURE; -+ } -+} -+ -+static int http_gnutls_mutex_destroy(void **m) -+{ -+ tsrm_mutex_free(*((MUTEX_T *) m)); -+ return SUCCESS; -+} -+ -+static int http_gnutls_mutex_lock(void **m) -+{ -+ return tsrm_mutex_lock(*((MUTEX_T *) m)); -+} -+ -+static int http_gnutls_mutex_unlock(void **m) -+{ -+ return tsrm_mutex_unlock(*((MUTEX_T *) m)); -+} -+ -+static struct gcry_thread_cbs http_gnutls_tsl = { -+ GCRY_THREAD_OPTION_USER, -+ NULL, -+ http_gnutls_mutex_create, -+ http_gnutls_mutex_destroy, -+ http_gnutls_mutex_lock, -+ http_gnutls_mutex_unlock -+}; -+#endif -+/* }}} */ -+ -+/* safe curl wrappers */ -+#define init_curl_storage(ch) \ -+ {\ -+ http_request_storage *st = pecalloc(1, sizeof(http_request_storage), 1); \ -+ curl_easy_setopt(ch, CURLOPT_PRIVATE, st); \ -+ curl_easy_setopt(ch, CURLOPT_ERRORBUFFER, st->errorbuffer); \ -+ } -+ -+static void *safe_curl_init(void) -+{ -+ CURL *ch; -+ -+ if ((ch = curl_easy_init())) { -+ init_curl_storage(ch); -+ return ch; -+ } -+ return NULL; -+} -+static void *safe_curl_copy(void *p) -+{ -+ CURL *ch; -+ -+ if ((ch = curl_easy_duphandle(p))) { -+ init_curl_storage(ch); -+ return ch; -+ } -+ return NULL; -+} -+static void safe_curl_dtor(void *p) { -+ http_request_storage *st = http_request_storage_get(p); -+ -+ curl_easy_cleanup(p); -+ -+ if (st) { -+ if (st->url) { -+ pefree(st->url, 1); -+ } -+ if (st->cookiestore) { -+ pefree(st->cookiestore, 1); -+ } -+ pefree(st, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ MINIT */ -+PHP_MINIT_FUNCTION(http_request) -+{ -+#ifdef HTTP_NEED_OPENSSL_TSL -+ /* mod_ssl, libpq or ext/curl might already have set thread lock callbacks */ -+ if (!CRYPTO_get_id_callback()) { -+ int i, c = CRYPTO_num_locks(); -+ -+ http_openssl_tsl = malloc(c * sizeof(MUTEX_T)); -+ -+ for (i = 0; i < c; ++i) { -+ http_openssl_tsl[i] = tsrm_mutex_alloc(); -+ } -+ -+ CRYPTO_set_id_callback(http_openssl_thread_id); -+ CRYPTO_set_locking_callback(http_openssl_thread_lock); -+ } -+#endif -+#ifdef HTTP_NEED_GNUTLS_TSL -+ gcry_control(GCRYCTL_SET_THREAD_CBS, &http_gnutls_tsl); -+#endif -+ -+ if (CURLE_OK != curl_global_init(CURL_GLOBAL_ALL)) { -+ return FAILURE; -+ } -+ -+ if (SUCCESS != http_persistent_handle_provide("http_request", safe_curl_init, safe_curl_dtor, safe_curl_copy)) { -+ return FAILURE; -+ } -+ -+ HTTP_LONG_CONSTANT("HTTP_AUTH_BASIC", CURLAUTH_BASIC); -+ HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST", CURLAUTH_DIGEST); -+#if HTTP_CURL_VERSION(7,19,3) -+ HTTP_LONG_CONSTANT("HTTP_AUTH_DIGEST_IE", CURLAUTH_DIGEST_IE); -+#endif -+ HTTP_LONG_CONSTANT("HTTP_AUTH_NTLM", CURLAUTH_NTLM); -+ HTTP_LONG_CONSTANT("HTTP_AUTH_GSSNEG", CURLAUTH_GSSNEGOTIATE); -+ HTTP_LONG_CONSTANT("HTTP_AUTH_ANY", CURLAUTH_ANY); -+ -+ HTTP_LONG_CONSTANT("HTTP_VERSION_NONE", CURL_HTTP_VERSION_NONE); /* to be removed */ -+ HTTP_LONG_CONSTANT("HTTP_VERSION_1_0", CURL_HTTP_VERSION_1_0); -+ HTTP_LONG_CONSTANT("HTTP_VERSION_1_1", CURL_HTTP_VERSION_1_1); -+ HTTP_LONG_CONSTANT("HTTP_VERSION_ANY", CURL_HTTP_VERSION_NONE); -+ -+ HTTP_LONG_CONSTANT("HTTP_SSL_VERSION_TLSv1", CURL_SSLVERSION_TLSv1); -+ HTTP_LONG_CONSTANT("HTTP_SSL_VERSION_SSLv2", CURL_SSLVERSION_SSLv2); -+ HTTP_LONG_CONSTANT("HTTP_SSL_VERSION_SSLv3", CURL_SSLVERSION_SSLv3); -+ HTTP_LONG_CONSTANT("HTTP_SSL_VERSION_ANY", CURL_SSLVERSION_DEFAULT); -+ -+ HTTP_LONG_CONSTANT("HTTP_IPRESOLVE_V4", CURL_IPRESOLVE_V4); -+ HTTP_LONG_CONSTANT("HTTP_IPRESOLVE_V6", CURL_IPRESOLVE_V6); -+ HTTP_LONG_CONSTANT("HTTP_IPRESOLVE_ANY", CURL_IPRESOLVE_WHATEVER); -+ -+#if HTTP_CURL_VERSION(7,15,2) -+ HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS4", CURLPROXY_SOCKS4); -+#endif -+#if HTTP_CURL_VERSION(7,18,0) -+ HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS4A", CURLPROXY_SOCKS4A); -+ HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS5_HOSTNAME", CURLPROXY_SOCKS5_HOSTNAME); -+#endif -+ HTTP_LONG_CONSTANT("HTTP_PROXY_SOCKS5", CURLPROXY_SOCKS5); -+ HTTP_LONG_CONSTANT("HTTP_PROXY_HTTP", CURLPROXY_HTTP); -+#if HTTP_CURL_VERSION(7,19,4) -+ HTTP_LONG_CONSTANT("HTTP_PROXY_HTTP_1_0", CURLPROXY_HTTP_1_0); -+#endif -+ -+#if HTTP_CURL_VERSION(7,19,1) -+ HTTP_LONG_CONSTANT("HTTP_POSTREDIR_301", CURL_REDIR_POST_301); -+ HTTP_LONG_CONSTANT("HTTP_POSTREDIR_302", CURL_REDIR_POST_302); -+ HTTP_LONG_CONSTANT("HTTP_POSTREDIR_ALL", CURL_REDIR_POST_ALL); -+#endif -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ MSHUTDOWN */ -+PHP_MSHUTDOWN_FUNCTION(http_request) -+{ -+ curl_global_cleanup(); -+#ifdef HTTP_NEED_OPENSSL_TSL -+ if (http_openssl_tsl) { -+ int i, c = CRYPTO_num_locks(); -+ -+ CRYPTO_set_id_callback(NULL); -+ CRYPTO_set_locking_callback(NULL); -+ -+ for (i = 0; i < c; ++i) { -+ tsrm_mutex_free(http_openssl_tsl[i]); -+ } -+ -+ free(http_openssl_tsl); -+ http_openssl_tsl = NULL; -+ } -+#endif -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ forward declarations */ -+#define http_request_option(r, o, k, t) _http_request_option_ex((r), (o), (k), sizeof(k), (t) TSRMLS_CC) -+#define http_request_option_ex(r, o, k, l, t) _http_request_option_ex((r), (o), (k), (l), (t) TSRMLS_CC) -+static inline zval *_http_request_option_ex(http_request *request, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC); -+#define http_request_option_cache(r, k, z) _http_request_option_cache_ex((r), (k), sizeof(k), 0, (z) TSRMLS_CC) -+#define http_request_option_cache_ex(r, k, kl, h, z) _http_request_option_cache_ex((r), (k), (kl), (h), (z) TSRMLS_CC) -+static inline zval *_http_request_option_cache_ex(http_request *r, char *key, size_t keylen, ulong h, zval *opt TSRMLS_DC); -+ -+#define http_request_cookies_enabled(r) _http_request_cookies_enabled((r)) -+static inline int _http_request_cookies_enabled(http_request *r); -+ -+static size_t http_curl_read_callback(void *, size_t, size_t, void *); -+static int http_curl_progress_callback(void *, double, double, double, double); -+static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *); -+static int http_curl_dummy_callback(char *data, size_t n, size_t l, void *s) { return n*l; } -+static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *); -+/* }}} */ -+ -+/* {{{ CURL *http_curl_init(http_request *) */ -+PHP_HTTP_API CURL * _http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC) -+{ -+ if (ch || (SUCCESS == http_persistent_handle_acquire("http_request", &ch))) { -+#if defined(ZTS) -+ curl_easy_setopt(ch, CURLOPT_NOSIGNAL, 1L); -+#endif -+ curl_easy_setopt(ch, CURLOPT_HEADER, 0L); -+ curl_easy_setopt(ch, CURLOPT_FILETIME, 1L); -+ curl_easy_setopt(ch, CURLOPT_AUTOREFERER, 1L); -+ curl_easy_setopt(ch, CURLOPT_VERBOSE, 1L); -+ curl_easy_setopt(ch, CURLOPT_HEADERFUNCTION, NULL); -+ curl_easy_setopt(ch, CURLOPT_DEBUGFUNCTION, http_curl_raw_callback); -+ curl_easy_setopt(ch, CURLOPT_READFUNCTION, http_curl_read_callback); -+ curl_easy_setopt(ch, CURLOPT_IOCTLFUNCTION, http_curl_ioctl_callback); -+ curl_easy_setopt(ch, CURLOPT_WRITEFUNCTION, http_curl_dummy_callback); -+ -+ /* set context */ -+ if (request) { -+ curl_easy_setopt(ch, CURLOPT_DEBUGDATA, request); -+ -+ /* attach curl handle */ -+ request->ch = ch; -+ /* set defaults (also in http_request_reset()) */ -+ http_request_defaults(request); -+ } -+ } -+ -+ return ch; -+} -+/* }}} */ -+ -+/* {{{ CURL *http_curl_copy(CURL *) */ -+PHP_HTTP_API CURL *_http_curl_copy(CURL *ch TSRMLS_DC) -+{ -+ CURL *copy; -+ -+ if (SUCCESS == http_persistent_handle_accrete("http_request", ch, ©)) { -+ return copy; -+ } -+ return NULL; -+} -+/* }}} */ -+ -+/* {{{ void http_curl_free(CURL **) */ -+PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC) -+{ -+ if (*ch) { -+ curl_easy_setopt(*ch, CURLOPT_NOPROGRESS, 1L); -+ curl_easy_setopt(*ch, CURLOPT_PROGRESSFUNCTION, NULL); -+ curl_easy_setopt(*ch, CURLOPT_VERBOSE, 0L); -+ curl_easy_setopt(*ch, CURLOPT_DEBUGFUNCTION, NULL); -+ -+ http_persistent_handle_release("http_request", ch); -+ } -+} -+/* }}} */ -+ -+/* {{{ http_request *http_request_init(http_request *) */ -+PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch, http_request_method meth, const char *url ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ http_request *r; -+ -+ if (request) { -+ r = request; -+ } else { -+ r = emalloc_rel(sizeof(http_request)); -+ } -+ memset(r, 0, sizeof(http_request)); -+ -+ r->ch = ch; -+ r->url = (url) ? http_absolute_url(url) : NULL; -+ r->meth = (meth > 0) ? meth : HTTP_GET; -+ -+ phpstr_init(&r->conv.request); -+ phpstr_init_ex(&r->conv.response, HTTP_CURLBUF_SIZE, 0); -+ phpstr_init(&r->_cache.cookies); -+ zend_hash_init(&r->_cache.options, 0, NULL, ZVAL_PTR_DTOR, 0); -+ -+ TSRMLS_SET_CTX(r->tsrm_ls); -+ -+ return r; -+} -+/* }}} */ -+ -+/* {{{ void http_request_dtor(http_request *) */ -+PHP_HTTP_API void _http_request_dtor(http_request *request) -+{ -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ -+ http_request_reset(request); -+ http_curl_free(&request->ch); -+ -+ phpstr_dtor(&request->_cache.cookies); -+ zend_hash_destroy(&request->_cache.options); -+ if (request->_cache.headers) { -+ curl_slist_free_all(request->_cache.headers); -+ request->_cache.headers = NULL; -+ } -+ if (request->_progress_callback) { -+ zval_ptr_dtor(&request->_progress_callback); -+ request->_progress_callback = NULL; -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_request_free(http_request **) */ -+PHP_HTTP_API void _http_request_free(http_request **request) -+{ -+ if (*request) { -+ TSRMLS_FETCH_FROM_CTX((*request)->tsrm_ls); -+ http_request_body_free(&(*request)->body); -+ http_request_dtor(*request); -+ efree(*request); -+ *request = NULL; -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_request_reset(http_request *) */ -+PHP_HTTP_API void _http_request_reset(http_request *request) -+{ -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ STR_SET(request->url, NULL); -+ request->conv.last_type = 0; -+ phpstr_dtor(&request->conv.request); -+ phpstr_dtor(&request->conv.response); -+ http_request_body_dtor(request->body); -+ http_request_defaults(request); -+ -+ if (request->ch) { -+ http_request_storage *st = http_request_storage_get(request->ch); -+ -+ if (st) { -+ if (st->url) { -+ pefree(st->url, 1); -+ st->url = NULL; -+ } -+ if (st->cookiestore) { -+ pefree(st->cookiestore, 1); -+ st->cookiestore = NULL; -+ } -+ st->errorbuffer[0] = '\0'; -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ STATUS http_request_enable_cookies(http_request *) */ -+PHP_HTTP_API STATUS _http_request_enable_cookies(http_request *request) -+{ -+ int initialized = 1; -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ -+ HTTP_CHECK_CURL_INIT(request->ch, http_curl_init_ex(request->ch, request), initialized = 0); -+ if (initialized && (http_request_cookies_enabled(request) || (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIEFILE, "")))) { -+ return SUCCESS; -+ } -+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not enable cookies for this session"); -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_request_reset_cookies(http_request *, int) */ -+PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request, int session_only) -+{ -+ int initialized = 1; -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ -+ HTTP_CHECK_CURL_INIT(request->ch, http_curl_init_ex(request->ch, request), initialized = 0); -+ if (initialized) { -+ if (!http_request_cookies_enabled(request)) { -+ if (SUCCESS != http_request_enable_cookies(request)) { -+ return FAILURE; -+ } -+ } -+ if (session_only) { -+#if HTTP_CURL_VERSION(7,15,4) -+ if (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "SESS")) { -+ return SUCCESS; -+ } -+#else -+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset session cookies (need libcurl >= v7.15.4)"); -+#endif -+ } else { -+#if HTTP_CURL_VERSION(7,14,1) -+ if (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "ALL")) { -+ return SUCCESS; -+ } -+#else -+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not reset cookies (need libcurl >= v7.14.1)"); -+#endif -+ } -+ } -+ return FAILURE; -+} -+/* }}} */ -+ -+PHP_HTTP_API STATUS _http_request_flush_cookies(http_request *request) -+{ -+ int initialized = 1; -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ -+ HTTP_CHECK_CURL_INIT(request->ch, http_curl_init_ex(request->ch, request), initialized = 0); -+ if (initialized) { -+ if (!http_request_cookies_enabled(request)) { -+ return FAILURE; -+ } -+#if HTTP_CURL_VERSION(7,17,1) -+ if (CURLE_OK == curl_easy_setopt(request->ch, CURLOPT_COOKIELIST, "FLUSH")) { -+ return SUCCESS; -+ } -+#else -+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not flush cookies (need libcurl >= v7.17.1)"); -+#endif -+ } -+ return FAILURE; -+} -+ -+/* {{{ void http_request_defaults(http_request *) */ -+PHP_HTTP_API void _http_request_defaults(http_request *request) -+{ -+ if (request->ch) { -+ HTTP_CURL_OPT(CURLOPT_PROGRESSFUNCTION, NULL); -+ HTTP_CURL_OPT(CURLOPT_URL, NULL); -+ HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 1L); -+#if HTTP_CURL_VERSION(7,19,4) -+ HTTP_CURL_OPT(CURLOPT_NOPROXY, NULL); -+#endif -+ HTTP_CURL_OPT(CURLOPT_PROXY, NULL); -+ HTTP_CURL_OPT(CURLOPT_PROXYPORT, 0L); -+ HTTP_CURL_OPT(CURLOPT_PROXYTYPE, 0L); -+ /* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */ -+#if HTTP_CURL_VERSION(7,19,1) -+ HTTP_CURL_OPT(CURLOPT_PROXYUSERNAME, NULL); -+ HTTP_CURL_OPT(CURLOPT_PROXYPASSWORD, NULL); -+#endif -+ HTTP_CURL_OPT(CURLOPT_PROXYAUTH, 0L); -+ HTTP_CURL_OPT(CURLOPT_HTTPPROXYTUNNEL, 0L); -+ HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, 60L); -+ HTTP_CURL_OPT(CURLOPT_IPRESOLVE, 0); -+ HTTP_CURL_OPT(CURLOPT_LOW_SPEED_LIMIT, 0L); -+ HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, 0L); -+#if HTTP_CURL_VERSION(7,15,5) -+ /* LFS weirdance -+ HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) 0); -+ HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) 0); -+ */ -+#endif -+ /* crashes -+ HTTP_CURL_OPT(CURLOPT_MAXCONNECTS, 5L); */ -+ HTTP_CURL_OPT(CURLOPT_FRESH_CONNECT, 0L); -+ HTTP_CURL_OPT(CURLOPT_FORBID_REUSE, 0L); -+ HTTP_CURL_OPT(CURLOPT_INTERFACE, NULL); -+ HTTP_CURL_OPT(CURLOPT_PORT, 0L); -+#if HTTP_CURL_VERSION(7,19,0) -+ HTTP_CURL_OPT(CURLOPT_ADDRESS_SCOPE, 0L); -+#endif -+#if HTTP_CURL_VERSION(7,15,2) -+ HTTP_CURL_OPT(CURLOPT_LOCALPORT, 0L); -+ HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, 0L); -+#endif -+ /* libcurl < 7.19.6 does not clear auth info with USERPWD set to NULL */ -+#if HTTP_CURL_VERSION(7,19,1) -+ HTTP_CURL_OPT(CURLOPT_USERNAME, NULL); -+ HTTP_CURL_OPT(CURLOPT_PASSWORD, NULL); -+#endif -+ HTTP_CURL_OPT(CURLOPT_HTTPAUTH, 0L); -+ HTTP_CURL_OPT(CURLOPT_ENCODING, NULL); -+#if HTTP_CURL_VERSION(7,16,2) -+ /* we do this ourself anyway */ -+ HTTP_CURL_OPT(CURLOPT_HTTP_CONTENT_DECODING, 0L); -+ HTTP_CURL_OPT(CURLOPT_HTTP_TRANSFER_DECODING, 0L); -+#endif -+ HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, 0L); -+#if HTTP_CURL_VERSION(7,19,1) -+ HTTP_CURL_OPT(CURLOPT_POSTREDIR, 0L); -+#elif HTTP_CURL_VERSION(7,17,1) -+ HTTP_CURL_OPT(CURLOPT_POST301, 0L); -+#endif -+ HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, 0L); -+ HTTP_CURL_OPT(CURLOPT_REFERER, NULL); -+ HTTP_CURL_OPT(CURLOPT_USERAGENT, "PECL::HTTP/" PHP_HTTP_VERSION " (PHP/" PHP_VERSION ")"); -+ HTTP_CURL_OPT(CURLOPT_HTTPHEADER, NULL); -+ HTTP_CURL_OPT(CURLOPT_COOKIE, NULL); -+ HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 0L); -+ /* these options would enable curl's cookie engine by default which we don't want -+ HTTP_CURL_OPT(CURLOPT_COOKIEFILE, NULL); -+ HTTP_CURL_OPT(CURLOPT_COOKIEJAR, NULL); */ -+#if HTTP_CURL_VERSION(7,14,1) -+ HTTP_CURL_OPT(CURLOPT_COOKIELIST, NULL); -+#endif -+ HTTP_CURL_OPT(CURLOPT_RANGE, NULL); -+ HTTP_CURL_OPT(CURLOPT_RESUME_FROM, 0L); -+ HTTP_CURL_OPT(CURLOPT_MAXFILESIZE, 0L); -+ HTTP_CURL_OPT(CURLOPT_TIMECONDITION, 0L); -+ HTTP_CURL_OPT(CURLOPT_TIMEVALUE, 0L); -+ HTTP_CURL_OPT(CURLOPT_TIMEOUT, 0L); -+ HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, 3); -+ HTTP_CURL_OPT(CURLOPT_SSLCERT, NULL); -+ HTTP_CURL_OPT(CURLOPT_SSLCERTTYPE, NULL); -+ HTTP_CURL_OPT(CURLOPT_SSLCERTPASSWD, NULL); -+ HTTP_CURL_OPT(CURLOPT_SSLKEY, NULL); -+ HTTP_CURL_OPT(CURLOPT_SSLKEYTYPE, NULL); -+ HTTP_CURL_OPT(CURLOPT_SSLKEYPASSWD, NULL); -+ HTTP_CURL_OPT(CURLOPT_SSLENGINE, NULL); -+ HTTP_CURL_OPT(CURLOPT_SSLVERSION, 0L); -+ HTTP_CURL_OPT(CURLOPT_SSL_VERIFYPEER, 0L); -+ HTTP_CURL_OPT(CURLOPT_SSL_VERIFYHOST, 0L); -+ HTTP_CURL_OPT(CURLOPT_SSL_CIPHER_LIST, NULL); -+#if HTTP_CURL_VERSION(7,19,0) -+ HTTP_CURL_OPT(CURLOPT_ISSUERCERT, NULL); -+ #if defined(HTTP_HAVE_OPENSSL) -+ HTTP_CURL_OPT(CURLOPT_CRLFILE, NULL); -+ #endif -+#endif -+#if HTTP_CURL_VERSION(7,19,1) && defined(HTTP_HAVE_OPENSSL) -+ HTTP_CURL_OPT(CURLOPT_CERTINFO, NULL); -+#endif -+#ifdef HTTP_CURL_CAINFO -+ HTTP_CURL_OPT(CURLOPT_CAINFO, HTTP_CURL_CAINFO); -+#else -+ HTTP_CURL_OPT(CURLOPT_CAINFO, NULL); -+#endif -+ HTTP_CURL_OPT(CURLOPT_CAPATH, NULL); -+ HTTP_CURL_OPT(CURLOPT_RANDOM_FILE, NULL); -+ HTTP_CURL_OPT(CURLOPT_EGDSOCKET, NULL); -+ HTTP_CURL_OPT(CURLOPT_POSTFIELDS, NULL); -+ HTTP_CURL_OPT(CURLOPT_POSTFIELDSIZE, 0L); -+ HTTP_CURL_OPT(CURLOPT_HTTPPOST, NULL); -+ HTTP_CURL_OPT(CURLOPT_IOCTLDATA, NULL); -+ HTTP_CURL_OPT(CURLOPT_READDATA, NULL); -+ HTTP_CURL_OPT(CURLOPT_INFILESIZE, 0L); -+ HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_NONE); -+ HTTP_CURL_OPT(CURLOPT_CUSTOMREQUEST, NULL); -+ HTTP_CURL_OPT(CURLOPT_NOBODY, 0L); -+ HTTP_CURL_OPT(CURLOPT_POST, 0L); -+ HTTP_CURL_OPT(CURLOPT_UPLOAD, 0L); -+ HTTP_CURL_OPT(CURLOPT_HTTPGET, 1L); -+ } -+} -+/* }}} */ -+ -+PHP_HTTP_API void _http_request_set_progress_callback(http_request *request, zval *cb) -+{ -+ if (request->_progress_callback) { -+ zval_ptr_dtor(&request->_progress_callback); -+ } -+ if ((request->_progress_callback = cb)) { -+ ZVAL_ADDREF(cb); -+ HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 0); -+ HTTP_CURL_OPT(CURLOPT_PROGRESSDATA, request); -+ HTTP_CURL_OPT(CURLOPT_PROGRESSFUNCTION, http_curl_progress_callback); -+ } else { -+ HTTP_CURL_OPT(CURLOPT_NOPROGRESS, 1); -+ HTTP_CURL_OPT(CURLOPT_PROGRESSDATA, NULL); -+ HTTP_CURL_OPT(CURLOPT_PROGRESSFUNCTION, NULL); -+ } -+} -+ -+/* {{{ STATUS http_request_prepare(http_request *, HashTable *) */ -+PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *options) -+{ -+ zval *zoption; -+ zend_bool range_req = 0; -+ http_request_storage *storage; -+ -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ -+ HTTP_CHECK_CURL_INIT(request->ch, http_curl_init(request), return FAILURE); -+ -+ if (!request->url) { -+ return FAILURE; -+ } -+ if (!(storage = http_request_storage_get(request->ch))) { -+ return FAILURE; -+ } -+ storage->errorbuffer[0] = '\0'; -+ /* set options */ -+ if (storage->url) { -+ pefree(storage->url, 1); -+ } -+ storage->url = pestrdup(request->url, 1); -+ HTTP_CURL_OPT(CURLOPT_URL, storage->url); -+ -+ /* progress callback */ -+ if ((zoption = http_request_option(request, options, "onprogress", -1))) { -+ http_request_set_progress_callback(request, zoption); -+ } -+ -+ /* proxy */ -+ if ((zoption = http_request_option(request, options, "proxyhost", IS_STRING))) { -+ HTTP_CURL_OPT(CURLOPT_PROXY, Z_STRVAL_P(zoption)); -+ /* type */ -+ if ((zoption = http_request_option(request, options, "proxytype", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_PROXYTYPE, Z_LVAL_P(zoption)); -+ } -+ /* port */ -+ if ((zoption = http_request_option(request, options, "proxyport", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_PROXYPORT, Z_LVAL_P(zoption)); -+ } -+ /* user:pass */ -+ if ((zoption = http_request_option(request, options, "proxyauth", IS_STRING)) && Z_STRLEN_P(zoption)) { -+ HTTP_CURL_OPT(CURLOPT_PROXYUSERPWD, Z_STRVAL_P(zoption)); -+ } -+ /* auth method */ -+ if ((zoption = http_request_option(request, options, "proxyauthtype", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_PROXYAUTH, Z_LVAL_P(zoption)); -+ } -+ /* tunnel */ -+ if ((zoption = http_request_option(request, options, "proxytunnel", IS_BOOL)) && Z_BVAL_P(zoption)) { -+ HTTP_CURL_OPT(CURLOPT_HTTPPROXYTUNNEL, 1L); -+ } -+ } -+#if HTTP_CURL_VERSION(7,19,4) -+ if ((zoption = http_request_option(request, options, "noproxy", IS_STRING))) { -+ HTTP_CURL_OPT(CURLOPT_NOPROXY, Z_STRVAL_P(zoption)); -+ } -+#endif -+ -+ /* dns */ -+ if ((zoption = http_request_option(request, options, "dns_cache_timeout", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_DNS_CACHE_TIMEOUT, Z_LVAL_P(zoption)); -+ } -+ if ((zoption = http_request_option(request, options, "ipresolve", IS_LONG)) && Z_LVAL_P(zoption)) { -+ HTTP_CURL_OPT(CURLOPT_IPRESOLVE, Z_LVAL_P(zoption)); -+ } -+ -+ /* limits */ -+ if ((zoption = http_request_option(request, options, "low_speed_limit", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_LOW_SPEED_LIMIT, Z_LVAL_P(zoption)); -+ } -+ if ((zoption = http_request_option(request, options, "low_speed_time", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_LOW_SPEED_TIME, Z_LVAL_P(zoption)); -+ } -+#if HTTP_CURL_VERSION(7,15,5) -+ /* LSF weirdance -+ if ((zoption = http_request_option(request, options, "max_send_speed", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_MAX_SEND_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption)); -+ } -+ if ((zoption = http_request_option(request, options, "max_recv_speed", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_MAX_RECV_SPEED_LARGE, (curl_off_t) Z_LVAL_P(zoption)); -+ } -+ */ -+#endif -+ /* crashes -+ if ((zoption = http_request_option(request, options, "maxconnects", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_MAXCONNECTS, Z_LVAL_P(zoption)); -+ } */ -+ if ((zoption = http_request_option(request, options, "fresh_connect", IS_BOOL)) && Z_BVAL_P(zoption)) { -+ HTTP_CURL_OPT(CURLOPT_FRESH_CONNECT, 1L); -+ } -+ if ((zoption = http_request_option(request, options, "forbid_reuse", IS_BOOL)) && Z_BVAL_P(zoption)) { -+ HTTP_CURL_OPT(CURLOPT_FORBID_REUSE, 1L); -+ } -+ -+ /* outgoing interface */ -+ if ((zoption = http_request_option(request, options, "interface", IS_STRING))) { -+ HTTP_CURL_OPT(CURLOPT_INTERFACE, Z_STRVAL_P(zoption)); -+ -+#if HTTP_CURL_VERSION(7,15,2) -+ if ((zoption = http_request_option(request, options, "portrange", IS_ARRAY))) { -+ zval **prs, **pre; -+ -+ zend_hash_internal_pointer_reset(Z_ARRVAL_P(zoption)); -+ if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &prs)) { -+ zend_hash_move_forward(Z_ARRVAL_P(zoption)); -+ if (SUCCESS == zend_hash_get_current_data(Z_ARRVAL_P(zoption), (void *) &pre)) { -+ zval *prs_cpy = http_zsep(IS_LONG, *prs); -+ zval *pre_cpy = http_zsep(IS_LONG, *pre); -+ -+ if (Z_LVAL_P(prs_cpy) && Z_LVAL_P(pre_cpy)) { -+ HTTP_CURL_OPT(CURLOPT_LOCALPORT, MIN(Z_LVAL_P(prs_cpy), Z_LVAL_P(pre_cpy))); -+ HTTP_CURL_OPT(CURLOPT_LOCALPORTRANGE, labs(Z_LVAL_P(prs_cpy)-Z_LVAL_P(pre_cpy))+1L); -+ } -+ zval_ptr_dtor(&prs_cpy); -+ zval_ptr_dtor(&pre_cpy); -+ } -+ } -+ } -+#endif -+ } -+ -+ /* another port */ -+ if ((zoption = http_request_option(request, options, "port", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_PORT, Z_LVAL_P(zoption)); -+ } -+ -+ /* RFC4007 zone_id */ -+#if HTTP_CURL_VERSION(7,19,0) -+ if ((zoption = http_request_option(request, options, "address_scope", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_ADDRESS_SCOPE, Z_LVAL_P(zoption)); -+ } -+#endif -+ -+ /* auth */ -+ if ((zoption = http_request_option(request, options, "httpauth", IS_STRING)) && Z_STRLEN_P(zoption)) { -+ HTTP_CURL_OPT(CURLOPT_USERPWD, Z_STRVAL_P(zoption)); -+ } -+ if ((zoption = http_request_option(request, options, "httpauthtype", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_HTTPAUTH, Z_LVAL_P(zoption)); -+ } -+ -+ /* redirects, defaults to 0 */ -+ if ((zoption = http_request_option(request, options, "redirect", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_FOLLOWLOCATION, Z_LVAL_P(zoption) ? 1L : 0L); -+ HTTP_CURL_OPT(CURLOPT_MAXREDIRS, Z_LVAL_P(zoption)); -+ if ((zoption = http_request_option(request, options, "unrestrictedauth", IS_BOOL))) { -+ HTTP_CURL_OPT(CURLOPT_UNRESTRICTED_AUTH, Z_LVAL_P(zoption)); -+ } -+#if HTTP_CURL_VERSION(7,17,1) -+ if ((zoption = http_request_option(request, options, "postredir", IS_BOOL))) { -+# if HTTP_CURL_VERSION(7,19,1) -+ HTTP_CURL_OPT(CURLOPT_POSTREDIR, Z_BVAL_P(zoption) ? 1L : 0L); -+# else -+ HTTP_CURL_OPT(CURLOPT_POST301, Z_BVAL_P(zoption) ? 1L : 0L); -+# endif -+ } -+#endif -+ } -+ -+ /* retries, defaults to 0 */ -+ if ((zoption = http_request_option(request, options, "retrycount", IS_LONG))) { -+ request->_retry.count = Z_LVAL_P(zoption); -+ if ((zoption = http_request_option(request, options, "retrydelay", IS_DOUBLE))) { -+ request->_retry.delay = Z_DVAL_P(zoption); -+ } else { -+ request->_retry.delay = 0; -+ } -+ } else { -+ request->_retry.count = 0; -+ } -+ -+ /* referer */ -+ if ((zoption = http_request_option(request, options, "referer", IS_STRING)) && Z_STRLEN_P(zoption)) { -+ HTTP_CURL_OPT(CURLOPT_REFERER, Z_STRVAL_P(zoption)); -+ } -+ -+ /* useragent, default "PECL::HTTP/version (PHP/version)" */ -+ if ((zoption = http_request_option(request, options, "useragent", IS_STRING))) { -+ /* allow to send no user agent, not even default one */ -+ if (Z_STRLEN_P(zoption)) { -+ HTTP_CURL_OPT(CURLOPT_USERAGENT, Z_STRVAL_P(zoption)); -+ } else { -+ HTTP_CURL_OPT(CURLOPT_USERAGENT, NULL); -+ } -+ } -+ -+ /* resume */ -+ if ((zoption = http_request_option(request, options, "resume", IS_LONG)) && (Z_LVAL_P(zoption) > 0)) { -+ range_req = 1; -+ HTTP_CURL_OPT(CURLOPT_RESUME_FROM, Z_LVAL_P(zoption)); -+ } -+ /* or range of kind array(array(0,499), array(100,1499)) */ -+ else if ((zoption = http_request_option(request, options, "range", IS_ARRAY)) && zend_hash_num_elements(Z_ARRVAL_P(zoption))) { -+ HashPosition pos1, pos2; -+ zval **rr, **rb, **re; -+ phpstr rs; -+ -+ phpstr_init(&rs); -+ FOREACH_VAL(pos1, zoption, rr) { -+ if (Z_TYPE_PP(rr) == IS_ARRAY) { -+ zend_hash_internal_pointer_reset_ex(Z_ARRVAL_PP(rr), &pos2); -+ if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &rb, &pos2)) { -+ zend_hash_move_forward_ex(Z_ARRVAL_PP(rr), &pos2); -+ if (SUCCESS == zend_hash_get_current_data_ex(Z_ARRVAL_PP(rr), (void *) &re, &pos2)) { -+ if ( ((Z_TYPE_PP(rb) == IS_LONG) || ((Z_TYPE_PP(rb) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(rb), Z_STRLEN_PP(rb), NULL, NULL, 1))) && -+ ((Z_TYPE_PP(re) == IS_LONG) || ((Z_TYPE_PP(re) == IS_STRING) && is_numeric_string(Z_STRVAL_PP(re), Z_STRLEN_PP(re), NULL, NULL, 1)))) { -+ zval *rbl = http_zsep(IS_LONG, *rb); -+ zval *rel = http_zsep(IS_LONG, *re); -+ -+ if ((Z_LVAL_P(rbl) >= 0) && (Z_LVAL_P(rel) >= 0)) { -+ phpstr_appendf(&rs, "%ld-%ld,", Z_LVAL_P(rbl), Z_LVAL_P(rel)); -+ } -+ zval_ptr_dtor(&rbl); -+ zval_ptr_dtor(&rel); -+ } -+ } -+ } -+ } -+ } -+ -+ if (PHPSTR_LEN(&rs)) { -+ zval *cached_range; -+ -+ /* ditch last comma */ -+ PHPSTR_VAL(&rs)[PHPSTR_LEN(&rs)-- -1] = '\0'; -+ /* cache string */ -+ MAKE_STD_ZVAL(cached_range); -+ ZVAL_STRINGL(cached_range, PHPSTR_VAL(&rs), PHPSTR_LEN(&rs), 0); -+ HTTP_CURL_OPT(CURLOPT_RANGE, Z_STRVAL_P(http_request_option_cache(request, "range", cached_range))); -+ zval_ptr_dtor(&cached_range); -+ } -+ } -+ -+ /* additional headers, array('name' => 'value') */ -+ if (request->_cache.headers) { -+ curl_slist_free_all(request->_cache.headers); -+ request->_cache.headers = NULL; -+ } -+ if ((zoption = http_request_option(request, options, "headers", IS_ARRAY))) { -+ HashKey header_key = initHashKey(0); -+ zval **header_val; -+ HashPosition pos; -+ phpstr header; -+ -+ phpstr_init(&header); -+ FOREACH_KEYVAL(pos, zoption, header_key, header_val) { -+ if (header_key.type == HASH_KEY_IS_STRING) { -+ zval *header_cpy = http_zsep(IS_STRING, *header_val); -+ -+ if (!strcasecmp(header_key.str, "range")) { -+ range_req = 1; -+ } -+ -+ phpstr_appendf(&header, "%s: %s", header_key.str, Z_STRVAL_P(header_cpy)); -+ phpstr_fix(&header); -+ request->_cache.headers = curl_slist_append(request->_cache.headers, PHPSTR_VAL(&header)); -+ phpstr_reset(&header); -+ -+ zval_ptr_dtor(&header_cpy); -+ } -+ } -+ phpstr_dtor(&header); -+ } -+ /* etag */ -+ if ((zoption = http_request_option(request, options, "etag", IS_STRING)) && Z_STRLEN_P(zoption)) { -+ zend_bool is_quoted = !((Z_STRVAL_P(zoption)[0] != '"') || (Z_STRVAL_P(zoption)[Z_STRLEN_P(zoption)-1] != '"')); -+ phpstr header; -+ -+ phpstr_init(&header); -+ phpstr_appendf(&header, is_quoted?"%s: %s":"%s: \"%s\"", range_req?"If-Match":"If-None-Match", Z_STRVAL_P(zoption)); -+ phpstr_fix(&header); -+ request->_cache.headers = curl_slist_append(request->_cache.headers, PHPSTR_VAL(&header)); -+ phpstr_dtor(&header); -+ } -+ /* compression */ -+ if ((zoption = http_request_option(request, options, "compress", IS_BOOL)) && Z_LVAL_P(zoption)) { -+ request->_cache.headers = curl_slist_append(request->_cache.headers, "Accept-Encoding: gzip;q=1.0,deflate;q=0.5"); -+ } -+ HTTP_CURL_OPT(CURLOPT_HTTPHEADER, request->_cache.headers); -+ -+ /* lastmodified */ -+ if ((zoption = http_request_option(request, options, "lastmodified", IS_LONG))) { -+ if (Z_LVAL_P(zoption)) { -+ if (Z_LVAL_P(zoption) > 0) { -+ HTTP_CURL_OPT(CURLOPT_TIMEVALUE, Z_LVAL_P(zoption)); -+ } else { -+ HTTP_CURL_OPT(CURLOPT_TIMEVALUE, (long) HTTP_G->request.time + Z_LVAL_P(zoption)); -+ } -+ HTTP_CURL_OPT(CURLOPT_TIMECONDITION, (long) (range_req ? CURL_TIMECOND_IFUNMODSINCE : CURL_TIMECOND_IFMODSINCE)); -+ } else { -+ HTTP_CURL_OPT(CURLOPT_TIMECONDITION, CURL_TIMECOND_NONE); -+ } -+ } -+ -+ /* cookies, array('name' => 'value') */ -+ if ((zoption = http_request_option(request, options, "cookies", IS_ARRAY))) { -+ phpstr_dtor(&request->_cache.cookies); -+ if (zend_hash_num_elements(Z_ARRVAL_P(zoption))) { -+ zval *urlenc_cookies = NULL; -+ /* check whether cookies should not be urlencoded; default is to urlencode them */ -+ if ((!(urlenc_cookies = http_request_option(request, options, "encodecookies", IS_BOOL))) || Z_BVAL_P(urlenc_cookies)) { -+ if (SUCCESS == http_urlencode_hash_recursive(HASH_OF(zoption), &request->_cache.cookies, "; ", lenof("; "), NULL, 0)) { -+ phpstr_fix(&request->_cache.cookies); -+ HTTP_CURL_OPT(CURLOPT_COOKIE, request->_cache.cookies.data); -+ } -+ } else { -+ HashPosition pos; -+ HashKey cookie_key = initHashKey(0); -+ zval **cookie_val; -+ -+ FOREACH_KEYVAL(pos, zoption, cookie_key, cookie_val) { -+ if (cookie_key.type == HASH_KEY_IS_STRING) { -+ zval *val = http_zsep(IS_STRING, *cookie_val); -+ phpstr_appendf(&request->_cache.cookies, "%s=%s; ", cookie_key.str, Z_STRVAL_P(val)); -+ zval_ptr_dtor(&val); -+ } -+ } -+ -+ phpstr_fix(&request->_cache.cookies); -+ if (PHPSTR_LEN(&request->_cache.cookies)) { -+ HTTP_CURL_OPT(CURLOPT_COOKIE, PHPSTR_VAL(&request->_cache.cookies)); -+ } -+ } -+ } -+ } -+ -+ /* don't load session cookies from cookiestore */ -+ if ((zoption = http_request_option(request, options, "cookiesession", IS_BOOL)) && Z_BVAL_P(zoption)) { -+ HTTP_CURL_OPT(CURLOPT_COOKIESESSION, 1L); -+ } -+ -+ /* cookiestore, read initial cookies from that file and store cookies back into that file */ -+ if ((zoption = http_request_option(request, options, "cookiestore", IS_STRING))) { -+ if (Z_STRLEN_P(zoption)) { -+ HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(zoption), return FAILURE); -+ } -+ if (storage->cookiestore) { -+ pefree(storage->cookiestore, 1); -+ } -+ storage->cookiestore = pestrndup(Z_STRVAL_P(zoption), Z_STRLEN_P(zoption), 1); -+ HTTP_CURL_OPT(CURLOPT_COOKIEFILE, storage->cookiestore); -+ HTTP_CURL_OPT(CURLOPT_COOKIEJAR, storage->cookiestore); -+ } -+ -+ /* maxfilesize */ -+ if ((zoption = http_request_option(request, options, "maxfilesize", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_MAXFILESIZE, Z_LVAL_P(zoption)); -+ } -+ -+ /* http protocol */ -+ if ((zoption = http_request_option(request, options, "protocol", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_HTTP_VERSION, Z_LVAL_P(zoption)); -+ } -+ -+#if HTTP_CURL_VERSION(7,16,2) -+ /* timeout, defaults to 0 */ -+ if ((zoption = http_request_option(request, options, "timeout", IS_DOUBLE))) { -+ HTTP_CURL_OPT(CURLOPT_TIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000)); -+ } -+ /* connecttimeout, defaults to 0 */ -+ if ((zoption = http_request_option(request, options, "connecttimeout", IS_DOUBLE))) { -+ HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT_MS, (long)(Z_DVAL_P(zoption)*1000)); -+ } -+#else -+ /* timeout, defaults to 0 */ -+ if ((zoption = http_request_option(request, options, "timeout", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_TIMEOUT, Z_LVAL_P(zoption)); -+ } -+ /* connecttimeout, defaults to 0 */ -+ if ((zoption = http_request_option(request, options, "connecttimeout", IS_LONG))) { -+ HTTP_CURL_OPT(CURLOPT_CONNECTTIMEOUT, Z_LVAL_P(zoption)); -+ } -+#endif -+ -+ /* ssl */ -+ if ((zoption = http_request_option(request, options, "ssl", IS_ARRAY))) { -+ HashKey key = initHashKey(0); -+ zval **param; -+ HashPosition pos; -+ -+ FOREACH_KEYVAL(pos, zoption, key, param) { -+ if (key.type == HASH_KEY_IS_STRING) { -+ HTTP_CURL_OPT_STRING(CURLOPT_SSLCERT, 0, 1); -+ HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTTYPE, 0, 0); -+ HTTP_CURL_OPT_STRING(CURLOPT_SSLCERTPASSWD, 0, 0); -+ -+ HTTP_CURL_OPT_STRING(CURLOPT_SSLKEY, 0, 0); -+ HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYTYPE, 0, 0); -+ HTTP_CURL_OPT_STRING(CURLOPT_SSLKEYPASSWD, 0, 0); -+ -+ HTTP_CURL_OPT_STRING(CURLOPT_SSLENGINE, 0, 0); -+ HTTP_CURL_OPT_LONG(CURLOPT_SSLVERSION, 0); -+ -+ HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYPEER, 1); -+ HTTP_CURL_OPT_LONG(CURLOPT_SSL_VERIFYHOST, 1); -+ HTTP_CURL_OPT_STRING(CURLOPT_SSL_CIPHER_LIST, 1, 0); -+ -+ HTTP_CURL_OPT_STRING(CURLOPT_CAINFO, -3, 1); -+ HTTP_CURL_OPT_STRING(CURLOPT_CAPATH, -3, 1); -+ HTTP_CURL_OPT_STRING(CURLOPT_RANDOM_FILE, -3, 1); -+ HTTP_CURL_OPT_STRING(CURLOPT_EGDSOCKET, -3, 1); -+#if HTTP_CURL_VERSION(7,19,0) -+ HTTP_CURL_OPT_STRING(CURLOPT_ISSUERCERT, -3, 1); -+ #if defined(HTTP_HAVE_OPENSSL) -+ HTTP_CURL_OPT_STRING(CURLOPT_CRLFILE, -3, 1); -+ #endif -+#endif -+#if HTTP_CURL_VERSION(7,19,1) && defined(HTTP_HAVE_OPENSSL) -+ HTTP_CURL_OPT_LONG(CURLOPT_CERTINFO, -3); -+#endif -+ } -+ } -+ } -+ -+ /* request method */ -+ switch (request->meth) { -+ case HTTP_GET: -+ HTTP_CURL_OPT(CURLOPT_HTTPGET, 1L); -+ break; -+ -+ case HTTP_HEAD: -+ HTTP_CURL_OPT(CURLOPT_NOBODY, 1L); -+ break; -+ -+ case HTTP_POST: -+ HTTP_CURL_OPT(CURLOPT_POST, 1L); -+ break; -+ -+ case HTTP_PUT: -+ HTTP_CURL_OPT(CURLOPT_UPLOAD, 1L); -+ break; -+ -+ default: -+ if (http_request_method_exists(0, request->meth, NULL)) { -+ HTTP_CURL_OPT(CURLOPT_CUSTOMREQUEST, http_request_method_name(request->meth)); -+ } else { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Unsupported request method: %d (%s)", request->meth, request->url); -+ return FAILURE; -+ } -+ break; -+ } -+ -+ /* attach request body */ -+ if (request->body && (request->meth != HTTP_GET) && (request->meth != HTTP_HEAD) && (request->meth != HTTP_OPTIONS)) { -+ switch (request->body->type) { -+ case HTTP_REQUEST_BODY_EMPTY: -+ /* nothing */ -+ break; -+ -+ case HTTP_REQUEST_BODY_CURLPOST: -+ HTTP_CURL_OPT(CURLOPT_HTTPPOST, (struct curl_httppost *) request->body->data); -+ break; -+ -+ case HTTP_REQUEST_BODY_CSTRING: -+ if (request->meth != HTTP_PUT) { -+ HTTP_CURL_OPT(CURLOPT_POSTFIELDS, request->body->data); -+ HTTP_CURL_OPT(CURLOPT_POSTFIELDSIZE, request->body->size); -+ break; -+ } -+ /* fallthrough, PUT/UPLOAD _needs_ READDATA */ -+ case HTTP_REQUEST_BODY_UPLOADFILE: -+ HTTP_CURL_OPT(CURLOPT_IOCTLDATA, request); -+ HTTP_CURL_OPT(CURLOPT_READDATA, request); -+ HTTP_CURL_OPT(CURLOPT_INFILESIZE, request->body->size); -+ break; -+ -+ default: -+ /* shouldn't ever happen */ -+ http_error_ex(HE_ERROR, 0, "Unknown request body type: %d (%s)", request->body->type, request->url); -+ return FAILURE; -+ } -+ } -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ void http_request_exec(http_request *) */ -+PHP_HTTP_API void _http_request_exec(http_request *request) -+{ -+ uint tries = 0; -+ CURLcode result; -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ -+retry: -+ if (CURLE_OK != (result = curl_easy_perform(request->ch))) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(result), http_request_storage_get(request->ch)->errorbuffer, request->url); -+#ifdef ZEND_ENGINE_2 -+ if ((HTTP_G->only_exceptions || GLOBAL_ERROR_HANDLING == EH_THROW) && EG(exception)) { -+ add_property_long(EG(exception), "curlCode", result); -+ } -+#endif -+ -+ if (request->_retry.count > tries++) { -+ switch (result) { -+ case CURLE_COULDNT_RESOLVE_PROXY: -+ case CURLE_COULDNT_RESOLVE_HOST: -+ case CURLE_COULDNT_CONNECT: -+ case CURLE_WRITE_ERROR: -+ case CURLE_READ_ERROR: -+ case CURLE_OPERATION_TIMEDOUT: -+ case CURLE_SSL_CONNECT_ERROR: -+ case CURLE_GOT_NOTHING: -+ case CURLE_SSL_ENGINE_SETFAILED: -+ case CURLE_SEND_ERROR: -+ case CURLE_RECV_ERROR: -+ case CURLE_SSL_ENGINE_INITFAILED: -+ case CURLE_LOGIN_DENIED: -+ if (request->_retry.delay >= HTTP_DIFFSEC) { -+ http_sleep(request->_retry.delay); -+ } -+ goto retry; -+ default: -+ break; -+ } -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ static size_t http_curl_read_callback(void *, size_t, size_t, void *) */ -+static size_t http_curl_read_callback(void *data, size_t len, size_t n, void *ctx) -+{ -+ http_request *request = (http_request *) ctx; -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ -+ if (request->body) { -+ switch (request->body->type) { -+ case HTTP_REQUEST_BODY_CSTRING: -+ { -+ size_t out = MIN(len * n, request->body->size - request->body->priv); -+ -+ if (out) { -+ memcpy(data, ((char *) request->body->data) + request->body->priv, out); -+ request->body->priv += out; -+ return out; -+ } -+ break; -+ } -+ -+ case HTTP_REQUEST_BODY_UPLOADFILE: -+ return php_stream_read((php_stream *) request->body->data, data, len * n); -+ } -+ } -+ return 0; -+} -+/* }}} */ -+ -+/* {{{ static int http_curl_progress_callback(void *, double, double, double, double) */ -+static int http_curl_progress_callback(void *ctx, double dltotal, double dlnow, double ultotal, double ulnow) -+{ -+ zval *param, retval; -+ http_request *request = (http_request *) ctx; -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ -+ INIT_PZVAL(&retval); -+ ZVAL_NULL(&retval); -+ -+ MAKE_STD_ZVAL(param); -+ array_init(param); -+ add_assoc_double(param, "dltotal", dltotal); -+ add_assoc_double(param, "dlnow", dlnow); -+ add_assoc_double(param, "ultotal", ultotal); -+ add_assoc_double(param, "ulnow", ulnow); -+ -+ with_error_handling(EH_NORMAL, NULL) { -+ request->_in_progress_cb = 1; -+ call_user_function(EG(function_table), NULL, request->_progress_callback, &retval, 1, ¶m TSRMLS_CC); -+ request->_in_progress_cb = 0; -+ } end_error_handling(); -+ -+ zval_ptr_dtor(¶m); -+ zval_dtor(&retval); -+ -+ return 0; -+} -+/* }}} */ -+ -+/* {{{ static curlioerr http_curl_ioctl_callback(CURL *, curliocmd, void *) */ -+static curlioerr http_curl_ioctl_callback(CURL *ch, curliocmd cmd, void *ctx) -+{ -+ http_request *request = (http_request *) ctx; -+ TSRMLS_FETCH_FROM_CTX(request->tsrm_ls); -+ -+ if (cmd != CURLIOCMD_RESTARTREAD) { -+ return CURLIOE_UNKNOWNCMD; -+ } -+ -+ if (request->body) { -+ switch (request->body->type) { -+ case HTTP_REQUEST_BODY_CSTRING: -+ request->body->priv = 0; -+ return CURLIOE_OK; -+ break; -+ -+ case HTTP_REQUEST_BODY_UPLOADFILE: -+ if (SUCCESS == php_stream_rewind((php_stream *) request->body->data)) { -+ return CURLIOE_OK; -+ } -+ break; -+ } -+ } -+ -+ return CURLIOE_FAILRESTART; -+} -+/* }}} */ -+ -+/* {{{ static int http_curl_raw_callback(CURL *, curl_infotype, char *, size_t, void *) */ -+static int http_curl_raw_callback(CURL *ch, curl_infotype type, char *data, size_t length, void *ctx) -+{ -+ http_request *request = (http_request *) ctx; -+ -+#define EMPTY_HEADER(d, l) (!l || (l == 1 && d[0] == '\n') || (l == 2 && d[0] == '\r' && d[1] == '\n')) -+ switch (type) { -+ case CURLINFO_DATA_IN: -+ if (request->conv.last_type == CURLINFO_HEADER_IN) { -+ phpstr_appends(&request->conv.response, HTTP_CRLF); -+ } -+ phpstr_append(&request->conv.response, data, length); -+ break; -+ case CURLINFO_HEADER_IN: -+ if (!EMPTY_HEADER(data, length)) { -+ phpstr_append(&request->conv.response, data, length); -+ } -+ break; -+ case CURLINFO_DATA_OUT: -+ case CURLINFO_HEADER_OUT: -+ phpstr_append(&request->conv.request, data, length); -+ break; -+ default: -+ break; -+ } -+ -+#if 0 -+ { -+ const char _sym[] = "><><><"; -+ if (type) { -+ for (fprintf(stderr, "%c ", _sym[type-1]); length--; data++) { -+ fprintf(stderr, HTTP_IS_CTYPE(print, *data)?"%c":"\\x%02X", (int) *data); -+ if (*data == '\n' && length) { -+ fprintf(stderr, "\n%c ", _sym[type-1]); -+ } -+ } -+ fprintf(stderr, "\n"); -+ } else { -+ fprintf(stderr, "# %s", data); -+ } -+ } -+#endif -+ -+ if (type) { -+ request->conv.last_type = type; -+ } -+ return 0; -+} -+/* }}} */ -+ -+/* {{{ static inline zval *http_request_option(http_request *, HashTable *, char *, size_t, int) */ -+static inline zval *_http_request_option_ex(http_request *r, HashTable *options, char *key, size_t keylen, int type TSRMLS_DC) -+{ -+ if (options) { -+ zval **zoption; -+ ulong h = zend_hash_func(key, keylen); -+ -+ if (SUCCESS == zend_hash_quick_find(options, key, keylen, h, (void *) &zoption)) { -+ zval *option, *cached; -+ -+ option = http_zsep(type, *zoption); -+ cached = http_request_option_cache_ex(r, key, keylen, h, option); -+ -+ zval_ptr_dtor(&option); -+ return cached; -+ } -+ } -+ -+ return NULL; -+} -+/* }}} */ -+ -+/* {{{ static inline zval *http_request_option_cache(http_request *, char *key, zval *) */ -+static inline zval *_http_request_option_cache_ex(http_request *r, char *key, size_t keylen, ulong h, zval *opt TSRMLS_DC) -+{ -+ ZVAL_ADDREF(opt); -+ -+ if (h) { -+ zend_hash_quick_update(&r->_cache.options, key, keylen, h, &opt, sizeof(zval *), NULL); -+ } else { -+ zend_hash_update(&r->_cache.options, key, keylen, &opt, sizeof(zval *), NULL); -+ } -+ -+ return opt; -+} -+/* }}} */ -+ -+/* {{{ static inline int http_request_cookies_enabled(http_request *) */ -+static inline int _http_request_cookies_enabled(http_request *request) { -+ http_request_storage *st; -+ -+ if (request->ch && (st = http_request_storage_get(request->ch)) && st->cookiestore) { -+ /* cookies are enabled */ -+ return 1; -+ } -+ return 0; -+} -+/* }}} */ -+ -+#endif /* HTTP_HAVE_CURL */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_request_body_api.c -@@ -0,0 +1,332 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_request_body_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#define HTTP_WANT_CURL -+#include "php_http.h" -+ -+#ifdef HTTP_HAVE_CURL -+ -+#include "php_http_api.h" -+#include "php_http_url_api.h" -+#include "php_http_request_body_api.h" -+ -+/* {{{ */ -+typedef struct curl_httppost *post_data[2]; -+static STATUS recursive_fields(post_data http_post_data, HashTable *fields, const char *prefix TSRMLS_DC); -+static STATUS recursive_files(post_data http_post_data, HashTable *files, const char *prefix TSRMLS_DC); -+/* }}} */ -+ -+/* {{{ http_request_body *http_request_body_new() */ -+PHP_HTTP_API http_request_body *_http_request_body_init_ex(http_request_body *body, int type, void *data, size_t size, zend_bool free ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ if (!body) { -+ body = emalloc_rel(sizeof(http_request_body)); -+ } -+ -+ body->type = type; -+ body->free = free; -+ body->priv = 0; -+ body->data = data; -+ body->size = size; -+ -+ return body; -+} -+/* }}} */ -+ -+/* {{{ http_request_body *http_request_body_fill(http_request_body *body, HashTable *, HashTable *) */ -+PHP_HTTP_API http_request_body *_http_request_body_fill(http_request_body *body, HashTable *fields, HashTable *files ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC) -+{ -+ if (files && (zend_hash_num_elements(files) > 0)) { -+ struct curl_httppost *http_post_data[2] = {NULL, NULL}; -+ -+ if (fields && SUCCESS != recursive_fields(http_post_data, fields, NULL TSRMLS_CC)) { -+ return NULL; -+ } -+ if (SUCCESS != recursive_files(http_post_data, files, NULL TSRMLS_CC)) { -+ return NULL; -+ } -+ return http_request_body_init_rel(body, HTTP_REQUEST_BODY_CURLPOST, http_post_data[0], 0, 1); -+ } else if (fields) { -+ char *encoded; -+ size_t encoded_len; -+ -+ if (SUCCESS != http_urlencode_hash_ex(fields, 1, NULL, 0, &encoded, &encoded_len)) { -+ http_error(HE_WARNING, HTTP_E_ENCODING, "Could not encode post data"); -+ return NULL; -+ } -+ -+ return http_request_body_init_rel(body, HTTP_REQUEST_BODY_CSTRING, encoded, encoded_len, 1); -+ } else { -+ return http_request_body_init_rel(body, HTTP_REQUEST_BODY_CSTRING, estrndup("", 0), 0, 1); -+ } -+} -+ -+/* STATUS http_request_body_encode(http_request_body *, char**, size_t *) */ -+PHP_HTTP_API STATUS _http_request_body_encode(http_request_body *body, char **buf, size_t *len TSRMLS_DC) -+{ -+ switch (body->type) { -+ case HTTP_REQUEST_BODY_CURLPOST: -+ { -+#ifdef HAVE_CURL_FORMGET -+ phpstr str; -+ -+ phpstr_init_ex(&str, 0x8000, 0); -+ if (curl_formget(body->data, &str, (curl_formget_callback) phpstr_append)) { -+ phpstr_dtor(&str); -+ } else { -+ phpstr_fix(&str); -+ *buf = PHPSTR_VAL(&str); -+ *len = PHPSTR_LEN(&str); -+ return SUCCESS; -+ } -+#endif -+ break; -+ } -+ -+ case HTTP_REQUEST_BODY_CSTRING: -+ *buf = estrndup(body->data, *len = body->size); -+ return SUCCESS; -+ -+ default: -+ break; -+ } -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ void http_request_body_dtor(http_request_body *) */ -+PHP_HTTP_API void _http_request_body_dtor(http_request_body *body TSRMLS_DC) -+{ -+ if (body) { -+ if (body->free) { -+ switch (body->type) { -+ case HTTP_REQUEST_BODY_CSTRING: -+ if (body->data) { -+ efree(body->data); -+ } -+ break; -+ -+ case HTTP_REQUEST_BODY_CURLPOST: -+ curl_formfree(body->data); -+ break; -+ -+ case HTTP_REQUEST_BODY_UPLOADFILE: -+ php_stream_close(body->data); -+ break; -+ } -+ } -+ memset(body, 0, sizeof(http_request_body)); -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_request_body_free(http_request_body *) */ -+PHP_HTTP_API void _http_request_body_free(http_request_body **body TSRMLS_DC) -+{ -+ if (*body) { -+ http_request_body_dtor(*body); -+ efree(*body); -+ *body = NULL; -+ } -+} -+/* }}} */ -+ -+static inline char *format_key(uint type, char *str, ulong num, const char *prefix, int numeric_key_for_empty_prefix) { -+ char *new_key = NULL; -+ -+ if (prefix && *prefix) { -+ if (type == HASH_KEY_IS_STRING) { -+ spprintf(&new_key, 0, "%s[%s]", prefix, str); -+ } else { -+ spprintf(&new_key, 0, "%s[%lu]", prefix, num); -+ } -+ } else if (type == HASH_KEY_IS_STRING) { -+ new_key = estrdup(str); -+ } else if (numeric_key_for_empty_prefix) { -+ spprintf(&new_key, 0, "%lu", num); -+ } -+ -+ return new_key; -+} -+ -+/* {{{ static STATUS recursive_fields(post_data d, HashTable *f, const char *p TSRMLS_DC) */ -+static STATUS recursive_fields(post_data http_post_data, HashTable *fields, const char *prefix TSRMLS_DC) { -+ HashKey key = initHashKey(0); -+ zval **data_ptr; -+ HashPosition pos; -+ char *new_key = NULL; -+ CURLcode err = 0; -+ -+ if (fields && !fields->nApplyCount) { -+ FOREACH_HASH_KEYVAL(pos, fields, key, data_ptr) { -+ if (key.type != HASH_KEY_IS_STRING || *key.str) { -+ new_key = format_key(key.type, key.str, key.num, prefix, 1); -+ -+ switch (Z_TYPE_PP(data_ptr)) { -+ case IS_ARRAY: -+ case IS_OBJECT: { -+ STATUS status; -+ -+ ++fields->nApplyCount; -+ status = recursive_fields(http_post_data, HASH_OF(*data_ptr), new_key TSRMLS_CC); -+ --fields->nApplyCount; -+ -+ if (SUCCESS != status) { -+ goto error; -+ } -+ break; -+ } -+ -+ default: { -+ zval *data = http_zsep(IS_STRING, *data_ptr); -+ -+ err = curl_formadd(&http_post_data[0], &http_post_data[1], -+ CURLFORM_COPYNAME, new_key, -+ CURLFORM_COPYCONTENTS, Z_STRVAL_P(data), -+ CURLFORM_CONTENTSLENGTH, (long) Z_STRLEN_P(data), -+ CURLFORM_END -+ ); -+ -+ zval_ptr_dtor(&data); -+ -+ if (CURLE_OK != err) { -+ goto error; -+ } -+ break; -+ } -+ } -+ STR_FREE(new_key); -+ } -+ } -+ } -+ -+ return SUCCESS; -+ -+error: -+ if (new_key) { -+ efree(new_key); -+ } -+ if (http_post_data[0]) { -+ curl_formfree(http_post_data[0]); -+ } -+ if (err) { -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: %s", curl_easy_strerror(err)); -+ } else { -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post fields: unknown error"); -+ } -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ static STATUS recursive_files(post_data d, HashTable *f, const char *p TSRMLS_DC) */ -+static STATUS recursive_files(post_data http_post_data, HashTable *files, const char *prefix TSRMLS_DC) { -+ HashKey key = initHashKey(0); -+ zval **data_ptr; -+ HashPosition pos; -+ char *new_key = NULL; -+ CURLcode err = 0; -+ -+ if (files && !files->nApplyCount) { -+ FOREACH_HASH_KEYVAL(pos, files, key, data_ptr) { -+ zval **file_ptr, **type_ptr, **name_ptr; -+ -+ if (key.type != HASH_KEY_IS_STRING || *key.str) { -+ new_key = format_key(key.type, key.str, key.num, prefix, 0); -+ -+ if (Z_TYPE_PP(data_ptr) != IS_ARRAY && Z_TYPE_PP(data_ptr) != IS_OBJECT) { -+ if (new_key || key.type == HASH_KEY_IS_STRING) { -+ http_error_ex(HE_NOTICE, HTTP_E_INVALID_PARAM, "Unrecognized type of post file array entry '%s'", new_key ? new_key : key.str); -+ } else { -+ http_error_ex(HE_NOTICE, HTTP_E_INVALID_PARAM, "Unrecognized type of post file array entry '%lu'", key.num); -+ } -+ } else if ( SUCCESS != zend_hash_find(HASH_OF(*data_ptr), "name", sizeof("name"), (void *) &name_ptr) || -+ SUCCESS != zend_hash_find(HASH_OF(*data_ptr), "type", sizeof("type"), (void *) &type_ptr) || -+ SUCCESS != zend_hash_find(HASH_OF(*data_ptr), "file", sizeof("file"), (void *) &file_ptr)) { -+ STATUS status; -+ -+ ++files->nApplyCount; -+ status = recursive_files(http_post_data, HASH_OF(*data_ptr), new_key TSRMLS_CC); -+ --files->nApplyCount; -+ -+ if (SUCCESS != status) { -+ goto error; -+ } -+ } else { -+ const char *path; -+ zval *file = http_zsep(IS_STRING, *file_ptr); -+ zval *type = http_zsep(IS_STRING, *type_ptr); -+ zval *name = http_zsep(IS_STRING, *name_ptr); -+ -+ HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(file), goto error); -+ -+ /* this is blatant but should be sufficient for most cases */ -+ if (strncasecmp(Z_STRVAL_P(file), "file://", lenof("file://"))) { -+ path = Z_STRVAL_P(file); -+ } else { -+ path = Z_STRVAL_P(file) + lenof("file://"); -+ } -+ -+ if (new_key) { -+ char *tmp_key = format_key(HASH_KEY_IS_STRING, Z_STRVAL_P(name), 0, new_key, 0); -+ STR_SET(new_key, tmp_key); -+ } -+ -+ err = curl_formadd(&http_post_data[0], &http_post_data[1], -+ CURLFORM_COPYNAME, new_key ? new_key : Z_STRVAL_P(name), -+ CURLFORM_FILE, path, -+ CURLFORM_CONTENTTYPE, Z_STRVAL_P(type), -+ CURLFORM_END -+ ); -+ -+ zval_ptr_dtor(&file); -+ zval_ptr_dtor(&type); -+ zval_ptr_dtor(&name); -+ -+ if (CURLE_OK != err) { -+ goto error; -+ } -+ } -+ STR_FREE(new_key); -+ } -+ } -+ } -+ -+ return SUCCESS; -+ -+error: -+ if (new_key) { -+ efree(new_key); -+ } -+ if (http_post_data[0]) { -+ curl_formfree(http_post_data[0]); -+ } -+ if (err) { -+ http_error_ex(HE_WARNING, HTTP_E_ENCODING, "Could not encode post files: %s", curl_easy_strerror(err)); -+ } else { -+ http_error(HE_WARNING, HTTP_E_ENCODING, "Could not encode post files: unknown error"); -+ } -+ return FAILURE; -+} -+/* }}} */ -+ -+#endif /* HTTP_HAVE_CURL */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/http_request_datashare_api.c -@@ -0,0 +1,288 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_request_datashare_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#define HTTP_WANT_CURL -+#include "php_http.h" -+ -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) -+ -+#include "php_http_api.h" -+#include "php_http_persistent_handle_api.h" -+#include "php_http_request_datashare_api.h" -+#include "php_http_request_api.h" -+#include "php_http_request_object.h" -+ -+static HashTable http_request_datashare_options; -+static http_request_datashare http_request_datashare_global; -+static int http_request_datashare_compare_handles(void *h1, void *h2); -+static void http_request_datashare_destroy_handles(void *el); -+#ifdef ZTS -+static void *http_request_datashare_locks_init(void); -+static void http_request_datashare_locks_dtor(void *l); -+static void http_request_datashare_lock_func(CURL *handle, curl_lock_data data, curl_lock_access locktype, void *userptr); -+static void http_request_datashare_unlock_func(CURL *handle, curl_lock_data data, void *userptr); -+#endif -+ -+http_request_datashare *_http_request_datashare_global_get(void) -+{ -+ return &http_request_datashare_global; -+} -+ -+PHP_MINIT_FUNCTION(http_request_datashare) -+{ -+ curl_lock_data val; -+ -+ if (SUCCESS != http_persistent_handle_provide("http_request_datashare", curl_share_init, (http_persistent_handle_dtor) curl_share_cleanup, NULL)) { -+ return FAILURE; -+ } -+#ifdef ZTS -+ if (SUCCESS != http_persistent_handle_provide("http_request_datashare_lock", http_request_datashare_locks_init, http_request_datashare_locks_dtor, NULL)) { -+ return FAILURE; -+ } -+#endif -+ -+ if (!http_request_datashare_init_ex(&http_request_datashare_global, 1)) { -+ return FAILURE; -+ } -+ -+ zend_hash_init(&http_request_datashare_options, 4, NULL, NULL, 1); -+#define ADD_DATASHARE_OPT(name, opt) \ -+ val = opt; \ -+ zend_hash_add(&http_request_datashare_options, name, sizeof(name), &val, sizeof(curl_lock_data), NULL) -+ ADD_DATASHARE_OPT("cookie", CURL_LOCK_DATA_COOKIE); -+ ADD_DATASHARE_OPT("dns", CURL_LOCK_DATA_DNS); -+ ADD_DATASHARE_OPT("ssl", CURL_LOCK_DATA_SSL_SESSION); -+ ADD_DATASHARE_OPT("connect", CURL_LOCK_DATA_CONNECT); -+ -+ return SUCCESS; -+} -+ -+PHP_MSHUTDOWN_FUNCTION(http_request_datashare) -+{ -+ http_request_datashare_dtor(&http_request_datashare_global); -+ zend_hash_destroy(&http_request_datashare_options); -+ -+ return SUCCESS; -+} -+ -+PHP_RINIT_FUNCTION(http_request_datashare) -+{ -+ zend_llist_init(&HTTP_G->request.datashare.handles, sizeof(zval *), http_request_datashare_destroy_handles, 0); -+ -+ return SUCCESS; -+} -+ -+PHP_RSHUTDOWN_FUNCTION(http_request_datashare) -+{ -+ zend_llist_destroy(&HTTP_G->request.datashare.handles); -+ -+ return SUCCESS; -+} -+ -+PHP_HTTP_API http_request_datashare *_http_request_datashare_init_ex(http_request_datashare *share, zend_bool persistent TSRMLS_DC) -+{ -+ zend_bool free_share; -+ -+ if ((free_share = !share)) { -+ share = pemalloc(sizeof(http_request_datashare), persistent); -+ } -+ memset(share, 0, sizeof(http_request_datashare)); -+ -+ if (SUCCESS != http_persistent_handle_acquire("http_request_datashare", &share->ch)) { -+ if (free_share) { -+ pefree(share, persistent); -+ } -+ return NULL; -+ } -+ -+ if (!(share->persistent = persistent)) { -+ share->handle.list = emalloc(sizeof(zend_llist)); -+ zend_llist_init(share->handle.list, sizeof(zval *), ZVAL_PTR_DTOR, 0); -+#ifdef ZTS -+ } else { -+ if (SUCCESS == http_persistent_handle_acquire("http_request_datashare_lock", (void *) &share->handle.locks)) { -+ curl_share_setopt(share->ch, CURLSHOPT_LOCKFUNC, http_request_datashare_lock_func); -+ curl_share_setopt(share->ch, CURLSHOPT_UNLOCKFUNC, http_request_datashare_unlock_func); -+ curl_share_setopt(share->ch, CURLSHOPT_USERDATA, share->handle.locks); -+ } -+#endif -+ } -+ -+ return share; -+} -+ -+PHP_HTTP_API STATUS _http_request_datashare_attach(http_request_datashare *share, zval *request TSRMLS_DC) -+{ -+ CURLcode rc; -+ getObjectEx(http_request_object, obj, request); -+ -+ if (obj->share) { -+ if (obj->share == share) { -+ return SUCCESS; -+ } else if (SUCCESS != http_request_datashare_detach(obj->share, request)) { -+ return FAILURE; -+ } -+ } -+ -+ HTTP_CHECK_CURL_INIT(obj->request->ch, http_curl_init_ex(obj->request->ch, obj->request), return FAILURE); -+ if (CURLE_OK != (rc = curl_easy_setopt(obj->request->ch, CURLOPT_SHARE, share->ch))) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not attach HttpRequest object(#%d) to the HttpRequestDataShare: %s", Z_OBJ_HANDLE_P(request), curl_easy_strerror(rc)); -+ return FAILURE; -+ } -+ -+ obj->share = share; -+ ZVAL_ADDREF(request); -+ zend_llist_add_element(HTTP_RSHARE_HANDLES(share), (void *) &request); -+ -+ return SUCCESS; -+} -+ -+PHP_HTTP_API STATUS _http_request_datashare_detach(http_request_datashare *share, zval *request TSRMLS_DC) -+{ -+ CURLcode rc; -+ getObjectEx(http_request_object, obj, request); -+ -+ if (!obj->share) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "HttpRequest object(#%d) is not attached to any HttpRequestDataShare", Z_OBJ_HANDLE_P(request)); -+ } else if (obj->share != share) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "HttpRequest object(#%d) is not attached to this HttpRequestDataShare", Z_OBJ_HANDLE_P(request)); -+ } else if (CURLE_OK != (rc = curl_easy_setopt(obj->request->ch, CURLOPT_SHARE, NULL))) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not detach HttpRequest object(#%d) from the HttpRequestDataShare: %s", Z_OBJ_HANDLE_P(request), curl_share_strerror(rc)); -+ } else { -+ obj->share = NULL; -+ zend_llist_del_element(HTTP_RSHARE_HANDLES(share), request, http_request_datashare_compare_handles); -+ return SUCCESS; -+ } -+ return FAILURE; -+} -+ -+PHP_HTTP_API void _http_request_datashare_detach_all(http_request_datashare *share TSRMLS_DC) -+{ -+ zval **r; -+ -+ while ((r = zend_llist_get_first(HTTP_RSHARE_HANDLES(share)))) { -+ http_request_datashare_detach(share, *r); -+ } -+} -+ -+PHP_HTTP_API void _http_request_datashare_dtor(http_request_datashare *share TSRMLS_DC) -+{ -+ if (!share->persistent) { -+ zend_llist_destroy(share->handle.list); -+ efree(share->handle.list); -+ } -+ http_persistent_handle_release("http_request_datashare", &share->ch); -+#ifdef ZTS -+ if (share->persistent) { -+ http_persistent_handle_release("http_request_datashare_lock", (void *) &share->handle.locks); -+ } -+#endif -+} -+ -+PHP_HTTP_API void _http_request_datashare_free(http_request_datashare **share TSRMLS_DC) -+{ -+ http_request_datashare_dtor(*share); -+ pefree(*share, (*share)->persistent); -+ *share = NULL; -+} -+ -+PHP_HTTP_API STATUS _http_request_datashare_set(http_request_datashare *share, const char *option, size_t option_len, zend_bool enable TSRMLS_DC) -+{ -+ curl_lock_data *opt; -+ CURLSHcode rc; -+ -+ if (SUCCESS == zend_hash_find(&http_request_datashare_options, (char *) option, option_len + 1, (void *) &opt)) { -+ if (CURLSHE_OK == (rc = curl_share_setopt(share->ch, enable ? CURLSHOPT_SHARE : CURLSHOPT_UNSHARE, *opt))) { -+ return SUCCESS; -+ } -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not %s sharing of %s data: %s", enable ? "enable" : "disable", option, curl_share_strerror(rc)); -+ } -+ return FAILURE; -+} -+ -+static int http_request_datashare_compare_handles(void *h1, void *h2) -+{ -+ return (Z_OBJ_HANDLE_PP((zval **) h1) == Z_OBJ_HANDLE_P((zval *) h2)); -+} -+ -+static void http_request_datashare_destroy_handles(void *el) -+{ -+ zval **r = (zval **) el; -+ TSRMLS_FETCH(); -+ -+ { /* gcc 2.95 needs these braces */ -+ getObjectEx(http_request_object, obj, *r); -+ -+ curl_easy_setopt(obj->request->ch, CURLOPT_SHARE, NULL); -+ zval_ptr_dtor(r); -+ } -+} -+ -+#ifdef ZTS -+static void *http_request_datashare_locks_init(void) -+{ -+ int i; -+ http_request_datashare_lock *locks = pecalloc(CURL_LOCK_DATA_LAST, sizeof(http_request_datashare_lock), 1); -+ -+ if (locks) { -+ for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) { -+ locks[i].mx = tsrm_mutex_alloc(); -+ } -+ } -+ -+ return locks; -+} -+ -+static void http_request_datashare_locks_dtor(void *l) -+{ -+ int i; -+ http_request_datashare_lock *locks = (http_request_datashare_lock *) l; -+ -+ for (i = 0; i < CURL_LOCK_DATA_LAST; ++i) { -+ tsrm_mutex_free(locks[i].mx); -+ } -+ pefree(locks, 1); -+} -+ -+static void http_request_datashare_lock_func(CURL *handle, curl_lock_data data, curl_lock_access locktype, void *userptr) -+{ -+ http_request_datashare_lock *locks = (http_request_datashare_lock *) userptr; -+ -+ /* TSRM can't distinguish shared/exclusive locks */ -+ tsrm_mutex_lock(locks[data].mx); -+ locks[data].ch = handle; -+} -+ -+static void http_request_datashare_unlock_func(CURL *handle, curl_lock_data data, void *userptr) -+{ -+ http_request_datashare_lock *locks = (http_request_datashare_lock *) userptr; -+ -+ if (locks[data].ch == handle) { -+ tsrm_mutex_unlock(locks[data].mx); -+ } -+} -+#endif -+ -+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */ -+ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_request_info.c -@@ -0,0 +1,198 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_request_info.c 293136 2010-01-05 08:48:52Z mike $ */ -+ -+#define HTTP_WANT_CURL -+#include "php_http.h" -+ -+#ifdef HTTP_HAVE_CURL -+#include "php_http_request_api.h" -+ -+/* {{{ void http_request_info(http_request *, HashTable *) */ -+PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info) -+{ -+ char *c; -+ long l; -+ double d; -+ struct curl_slist *s, *p; -+ zval *subarray, array; -+ INIT_ZARR(array, info); -+ -+ /* BEGIN */ -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_EFFECTIVE_URL, &c)) { -+ add_assoc_string_ex(&array, "effective_url", sizeof("effective_url"), c ? c : "", 1); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_RESPONSE_CODE, &l)) { -+ add_assoc_long_ex(&array, "response_code", sizeof("response_code"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_TOTAL_TIME, &d)) { -+ add_assoc_double_ex(&array, "total_time", sizeof("total_time"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_NAMELOOKUP_TIME, &d)) { -+ add_assoc_double_ex(&array, "namelookup_time", sizeof("namelookup_time"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_CONNECT_TIME, &d)) { -+ add_assoc_double_ex(&array, "connect_time", sizeof("connect_time"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_PRETRANSFER_TIME, &d)) { -+ add_assoc_double_ex(&array, "pretransfer_time", sizeof("pretransfer_time"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_SIZE_UPLOAD, &d)) { -+ add_assoc_double_ex(&array, "size_upload", sizeof("size_upload"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_SIZE_DOWNLOAD, &d)) { -+ add_assoc_double_ex(&array, "size_download", sizeof("size_download"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_SPEED_DOWNLOAD, &d)) { -+ add_assoc_double_ex(&array, "speed_download", sizeof("speed_download"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_SPEED_UPLOAD, &d)) { -+ add_assoc_double_ex(&array, "speed_upload", sizeof("speed_upload"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_HEADER_SIZE, &l)) { -+ add_assoc_long_ex(&array, "header_size", sizeof("header_size"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_REQUEST_SIZE, &l)) { -+ add_assoc_long_ex(&array, "request_size", sizeof("request_size"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_SSL_VERIFYRESULT, &l)) { -+ add_assoc_long_ex(&array, "ssl_verifyresult", sizeof("ssl_verifyresult"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_FILETIME, &l)) { -+ add_assoc_long_ex(&array, "filetime", sizeof("filetime"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &d)) { -+ add_assoc_double_ex(&array, "content_length_download", sizeof("content_length_download"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_CONTENT_LENGTH_UPLOAD, &d)) { -+ add_assoc_double_ex(&array, "content_length_upload", sizeof("content_length_upload"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_STARTTRANSFER_TIME, &d)) { -+ add_assoc_double_ex(&array, "starttransfer_time", sizeof("starttransfer_time"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_CONTENT_TYPE, &c)) { -+ add_assoc_string_ex(&array, "content_type", sizeof("content_type"), c ? c : "", 1); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_REDIRECT_TIME, &d)) { -+ add_assoc_double_ex(&array, "redirect_time", sizeof("redirect_time"), d); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_REDIRECT_COUNT, &l)) { -+ add_assoc_long_ex(&array, "redirect_count", sizeof("redirect_count"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_HTTP_CONNECTCODE, &l)) { -+ add_assoc_long_ex(&array, "connect_code", sizeof("connect_code"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_HTTPAUTH_AVAIL, &l)) { -+ add_assoc_long_ex(&array, "httpauth_avail", sizeof("httpauth_avail"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_PROXYAUTH_AVAIL, &l)) { -+ add_assoc_long_ex(&array, "proxyauth_avail", sizeof("proxyauth_avail"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_OS_ERRNO, &l)) { -+ add_assoc_long_ex(&array, "os_errno", sizeof("os_errno"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_NUM_CONNECTS, &l)) { -+ add_assoc_long_ex(&array, "num_connects", sizeof("num_connects"), l); -+ } -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_SSL_ENGINES, &s)) { -+ MAKE_STD_ZVAL(subarray); -+ array_init(subarray); -+ for (p = s; p; p = p->next) { -+ if (p->data) { -+ add_next_index_string(subarray, p->data, 1); -+ } -+ } -+ add_assoc_zval_ex(&array, "ssl_engines", sizeof("ssl_engines"), subarray); -+ curl_slist_free_all(s); -+ } -+#if HTTP_CURL_VERSION(7,14,1) -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_COOKIELIST, &s)) { -+ MAKE_STD_ZVAL(subarray); -+ array_init(subarray); -+ for (p = s; p; p = p->next) { -+ if (p->data) { -+ add_next_index_string(subarray, p->data, 1); -+ } -+ } -+ add_assoc_zval_ex(&array, "cookies", sizeof("cookies"), subarray); -+ curl_slist_free_all(s); -+ } -+#endif -+#if HTTP_CURL_VERSION(7,18,2) -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_REDIRECT_URL, &c)) { -+ add_assoc_string_ex(&array, "redirect_url", sizeof("redirect_url"), c ? c : "", 1); -+ } -+#endif -+#if HTTP_CURL_VERSION(7,19,0) -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_PRIMARY_IP, &c)) { -+ add_assoc_string_ex(&array, "primary_ip", sizeof("primary_ip"), c ? c : "", 1); -+ } -+#endif -+#if HTTP_CURL_VERSION(7,19,0) -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_APPCONNECT_TIME, &d)) { -+ add_assoc_double_ex(&array, "appconnect_time", sizeof("appconnect_time"), d); -+ } -+#endif -+#if HTTP_CURL_VERSION(7,19,4) -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_CONDITION_UNMET, &l)) { -+ add_assoc_long_ex(&array, "condition_unmet", sizeof("condition_unmet"), l); -+ } -+#endif -+/* END */ -+#if HTTP_CURL_VERSION(7,19,1) && defined(HTTP_HAVE_OPENSSL) -+ { -+ int i; -+ zval *ci_array; -+ struct curl_certinfo *ci; -+ char *colon, *keyname; -+ -+ if (CURLE_OK == curl_easy_getinfo(request->ch, CURLINFO_CERTINFO, &ci)) { -+ MAKE_STD_ZVAL(ci_array); -+ array_init(ci_array); -+ -+ for (i = 0; i < ci->num_of_certs; ++i) { -+ s = ci->certinfo[i]; -+ -+ MAKE_STD_ZVAL(subarray); -+ array_init(subarray); -+ for (p = s; p; p = p->next) { -+ if (p->data) { -+ if ((colon = strchr(p->data, ':'))) { -+ keyname = estrndup(p->data, colon - p->data); -+ add_assoc_string_ex(subarray, keyname, colon - p->data + 1, colon + 1, 1); -+ efree(keyname); -+ } else { -+ add_next_index_string(subarray, p->data, 1); -+ } -+ } -+ } -+ add_next_index_zval(ci_array, subarray); -+ } -+ add_assoc_zval_ex(&array, "certinfo", sizeof("certinfo"), ci_array); -+ } -+ } -+#endif -+ add_assoc_string_ex(&array, "error", sizeof("error"), http_request_storage_get(request->ch)->errorbuffer, 1); -+} -+/* }}} */ -+ -+#endif /* HTTP_HAVE_CURL */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/http_request_method_api.c -@@ -0,0 +1,321 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_request_method_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#define HTTP_WANT_CURL -+#include "php_http.h" -+ -+#include "php_http_api.h" -+#include "php_http_request_api.h" -+#include "php_http_request_method_api.h" -+ -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) && !defined(WONKY) -+# include "php_http_request_object.h" -+#endif -+ -+/* {{{ char *http_request_methods[] */ -+static const char *const http_request_methods[] = { -+ "UNKNOWN", -+ /* HTTP/1.1 */ -+ "GET", -+ "HEAD", -+ "POST", -+ "PUT", -+ "DELETE", -+ "OPTIONS", -+ "TRACE", -+ "CONNECT", -+ /* WebDAV - RFC 2518 */ -+ "PROPFIND", -+ "PROPPATCH", -+ "MKCOL", -+ "COPY", -+ "MOVE", -+ "LOCK", -+ "UNLOCK", -+ /* WebDAV Versioning - RFC 3253 */ -+ "VERSION-CONTROL", -+ "REPORT", -+ "CHECKOUT", -+ "CHECKIN", -+ "UNCHECKOUT", -+ "MKWORKSPACE", -+ "UPDATE", -+ "LABEL", -+ "MERGE", -+ "BASELINE-CONTROL", -+ "MKACTIVITY", -+ /* WebDAV Access Control - RFC 3744 */ -+ "ACL", -+ NULL -+}; -+/* }}} */ -+ -+/* {{{ */ -+PHP_MINIT_FUNCTION(http_request_method) -+{ -+ /* HTTP/1.1 */ -+ HTTP_LONG_CONSTANT("HTTP_METH_GET", HTTP_GET); -+ HTTP_LONG_CONSTANT("HTTP_METH_HEAD", HTTP_HEAD); -+ HTTP_LONG_CONSTANT("HTTP_METH_POST", HTTP_POST); -+ HTTP_LONG_CONSTANT("HTTP_METH_PUT", HTTP_PUT); -+ HTTP_LONG_CONSTANT("HTTP_METH_DELETE", HTTP_DELETE); -+ HTTP_LONG_CONSTANT("HTTP_METH_OPTIONS", HTTP_OPTIONS); -+ HTTP_LONG_CONSTANT("HTTP_METH_TRACE", HTTP_TRACE); -+ HTTP_LONG_CONSTANT("HTTP_METH_CONNECT", HTTP_CONNECT); -+ /* WebDAV - RFC 2518 */ -+ HTTP_LONG_CONSTANT("HTTP_METH_PROPFIND", HTTP_PROPFIND); -+ HTTP_LONG_CONSTANT("HTTP_METH_PROPPATCH", HTTP_PROPPATCH); -+ HTTP_LONG_CONSTANT("HTTP_METH_MKCOL", HTTP_MKCOL); -+ HTTP_LONG_CONSTANT("HTTP_METH_COPY", HTTP_COPY); -+ HTTP_LONG_CONSTANT("HTTP_METH_MOVE", HTTP_MOVE); -+ HTTP_LONG_CONSTANT("HTTP_METH_LOCK", HTTP_LOCK); -+ HTTP_LONG_CONSTANT("HTTP_METH_UNLOCK", HTTP_UNLOCK); -+ /* WebDAV Versioning - RFC 3253 */ -+ HTTP_LONG_CONSTANT("HTTP_METH_VERSION_CONTROL", HTTP_VERSION_CONTROL); -+ HTTP_LONG_CONSTANT("HTTP_METH_REPORT", HTTP_REPORT); -+ HTTP_LONG_CONSTANT("HTTP_METH_CHECKOUT", HTTP_CHECKOUT); -+ HTTP_LONG_CONSTANT("HTTP_METH_CHECKIN", HTTP_CHECKIN); -+ HTTP_LONG_CONSTANT("HTTP_METH_UNCHECKOUT", HTTP_UNCHECKOUT); -+ HTTP_LONG_CONSTANT("HTTP_METH_MKWORKSPACE", HTTP_MKWORKSPACE); -+ HTTP_LONG_CONSTANT("HTTP_METH_UPDATE", HTTP_UPDATE); -+ HTTP_LONG_CONSTANT("HTTP_METH_LABEL", HTTP_LABEL); -+ HTTP_LONG_CONSTANT("HTTP_METH_MERGE", HTTP_MERGE); -+ HTTP_LONG_CONSTANT("HTTP_METH_BASELINE_CONTROL", HTTP_BASELINE_CONTROL); -+ HTTP_LONG_CONSTANT("HTTP_METH_MKACTIVITY", HTTP_MKACTIVITY); -+ /* WebDAV Access Control - RFC 3744 */ -+ HTTP_LONG_CONSTANT("HTTP_METH_ACL", HTTP_ACL); -+ -+ return SUCCESS; -+} -+ -+static void free_method(void *el) -+{ -+ efree(*(char **)el); -+} -+ -+static void unregister_method(const char *name TSRMLS_DC) -+{ -+ char *ptr, tmp[sizeof("HTTP_METH_") + HTTP_REQUEST_METHOD_MAXLEN] = "HTTP_METH_"; -+ -+ strlcpy(tmp + lenof("HTTP_METH_"), name, HTTP_REQUEST_METHOD_MAXLEN); -+ for (ptr = tmp + lenof("HTTP_METH_"); *ptr; ++ptr) { -+ if (*ptr == '-') { -+ *ptr = '_'; -+ } -+ } -+ -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) && !defined(WONKY) -+ if (SUCCESS != zend_hash_del(&http_request_object_ce->constants_table, tmp + lenof("HTTP_"), strlen(tmp + lenof("HTTP_")) + 1)) { -+ http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Could not unregister request method: HttpRequest::%s", tmp + lenof("HTTP_")); -+ } -+#endif -+ if (SUCCESS != zend_hash_del(EG(zend_constants), tmp, strlen(tmp) + 1)) { -+ http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Could not unregister request method: %s", tmp); -+ } -+} -+ -+PHP_RINIT_FUNCTION(http_request_method) -+{ -+ HashTable ht; -+ -+ zend_hash_init(&HTTP_G->request.methods.registered, 0, NULL, free_method, 0); -+#define HTTP_METH_REG(m) \ -+ { \ -+ char *_m=estrdup(m); \ -+ zend_hash_next_index_insert(&HTTP_G->request.methods.registered, (void *) &_m, sizeof(char *), NULL); \ -+ } -+ HTTP_METH_REG("UNKNOWN"); -+ /* HTTP/1.1 */ -+ HTTP_METH_REG("GET"); -+ HTTP_METH_REG("HEAD"); -+ HTTP_METH_REG("POST"); -+ HTTP_METH_REG("PUT"); -+ HTTP_METH_REG("DELETE"); -+ HTTP_METH_REG("OPTIONS"); -+ HTTP_METH_REG("TRACE"); -+ HTTP_METH_REG("CONNECT"); -+ /* WebDAV - RFC 2518 */ -+ HTTP_METH_REG("PROPFIND"); -+ HTTP_METH_REG("PROPPATCH"); -+ HTTP_METH_REG("MKCOL"); -+ HTTP_METH_REG("COPY"); -+ HTTP_METH_REG("MOVE"); -+ HTTP_METH_REG("LOCK"); -+ HTTP_METH_REG("UNLOCK"); -+ /* WebDAV Versioning - RFC 3253 */ -+ HTTP_METH_REG("VERSION-CONTROL"); -+ HTTP_METH_REG("REPORT"); -+ HTTP_METH_REG("CHECKOUT"); -+ HTTP_METH_REG("CHECKIN"); -+ HTTP_METH_REG("UNCHECKOUT"); -+ HTTP_METH_REG("MKWORKSPACE"); -+ HTTP_METH_REG("UPDATE"); -+ HTTP_METH_REG("LABEL"); -+ HTTP_METH_REG("MERGE"); -+ HTTP_METH_REG("BASELINE-CONTROL"); -+ HTTP_METH_REG("MKACTIVITY"); -+ /* WebDAV Access Control - RFC 3744 */ -+ HTTP_METH_REG("ACL"); -+ -+ zend_hash_init(&ht, 0, NULL, ZVAL_PTR_DTOR, 0); -+ if (*HTTP_G->request.methods.custom && SUCCESS == http_parse_params(HTTP_G->request.methods.custom, HTTP_PARAMS_DEFAULT, &ht)) { -+ HashPosition pos; -+ zval **val; -+ -+ FOREACH_HASH_VAL(pos, &ht, val) { -+ if (Z_TYPE_PP(val) == IS_STRING) { -+ http_request_method_register(Z_STRVAL_PP(val), Z_STRLEN_PP(val)); -+ } -+ } -+ } -+ zend_hash_destroy(&ht); -+ -+ return SUCCESS; -+} -+ -+PHP_RSHUTDOWN_FUNCTION(http_request_method) -+{ -+ char **name; -+ int i, c = zend_hash_next_free_element(&HTTP_G->request.methods.registered); -+ -+ for (i = HTTP_MAX_REQUEST_METHOD; i < c; ++i) { -+ if (SUCCESS == zend_hash_index_find(&HTTP_G->request.methods.registered, i, (void *) &name)) { -+ unregister_method(*name TSRMLS_CC); -+ } -+ } -+ -+ zend_hash_destroy(&HTTP_G->request.methods.registered); -+ return SUCCESS; -+} -+ -+#define http_request_method_cncl(m, c) _http_request_method_cncl_ex((m), strlen(m), (c) TSRMLS_CC) -+#define http_request_method_cncl_ex(m, l, c) _http_request_method_cncl_ex((m), (l), (c) TSRMLS_CC) -+static STATUS _http_request_method_cncl_ex(const char *method_name, int method_name_len, char **cnst TSRMLS_DC) -+{ -+ int i; -+ char *cncl; -+ -+ if (method_name_len >= HTTP_REQUEST_METHOD_MAXLEN) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Request method too long (%s)", method_name); -+ } -+ cncl = emalloc(method_name_len + 1); -+ -+ for (i = 0; i < method_name_len; ++i) { -+ switch (method_name[i]) { -+ case '-': -+ cncl[i] = '-'; -+ break; -+ -+ default: -+ if (!HTTP_IS_CTYPE(alnum, method_name[i])) { -+ efree(cncl); -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Request method contains illegal characters (%s)", method_name); -+ return FAILURE; -+ } -+ cncl[i] = HTTP_TO_CTYPE(upper, method_name[i]); -+ break; -+ } -+ } -+ cncl[method_name_len] = '\0'; -+ -+ *cnst = cncl; -+ return SUCCESS; -+} -+ -+PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC) -+{ -+ char **name; -+ -+ if (SUCCESS == zend_hash_index_find(&HTTP_G->request.methods.registered, m, (void *) &name)) { -+ return *name; -+ } -+ return "UNKNOWN"; -+} -+ -+PHP_HTTP_API int _http_request_method_exists(int by_name, http_request_method id_num, const char *id_str TSRMLS_DC) -+{ -+ char *id_dup; -+ -+ if (by_name && (SUCCESS == http_request_method_cncl(id_str, &id_dup))) { -+ char **name; -+ HashPosition pos; -+ HashKey key = initHashKey(0); -+ -+ FOREACH_HASH_KEYVAL(pos, &HTTP_G->request.methods.registered, key, name) { -+ if (key.type == HASH_KEY_IS_LONG && !strcmp(*name, id_dup)) { -+ efree(id_dup); -+ return key.num; -+ } -+ } -+ efree(id_dup); -+ } else if (zend_hash_index_exists(&HTTP_G->request.methods.registered, id_num)){ -+ return id_num; -+ } -+ return 0; -+} -+ -+PHP_HTTP_API int _http_request_method_register(const char *method_str, int method_len TSRMLS_DC) -+{ -+ char *method_dup, *ptr, tmp[sizeof("HTTP_METH_") + HTTP_REQUEST_METHOD_MAXLEN] = "HTTP_METH_"; -+ int method_num = http_request_method_exists(1, 0, method_str); -+ -+ if (!method_num && (SUCCESS == http_request_method_cncl_ex(method_str, method_len, &method_dup))) { -+ method_num = zend_hash_next_free_element(&HTTP_G->request.methods.registered); -+ zend_hash_index_update(&HTTP_G->request.methods.registered, method_num, (void *) &method_dup, sizeof(char *), NULL); -+ -+ strlcpy(tmp + lenof("HTTP_METH_"), method_dup, HTTP_REQUEST_METHOD_MAXLEN); -+ for (ptr = tmp + lenof("HTTP_METH_"); *ptr; ++ptr) { -+ if (*ptr == '-') { -+ *ptr = '_'; -+ } -+ } -+ -+ zend_register_long_constant(tmp, strlen(tmp) + 1, method_num, CONST_CS, http_module_number TSRMLS_CC); -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) && !defined(WONKY) -+ zend_declare_class_constant_long(http_request_object_ce, tmp + lenof("HTTP_"), strlen(tmp + lenof("HTTP_")), method_num TSRMLS_CC); -+#endif -+ } -+ -+ return method_num; -+} -+ -+PHP_HTTP_API STATUS _http_request_method_unregister(int method TSRMLS_DC) -+{ -+ char **name; -+ -+ if (HTTP_STD_REQUEST_METHOD(method)) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_METHOD, "Standard request methods cannot be unregistered"); -+ return FAILURE; -+ } -+ -+ if (SUCCESS != zend_hash_index_find(&HTTP_G->request.methods.registered, method, (void *) &name)) { -+ http_error_ex(HE_NOTICE, HTTP_E_REQUEST_METHOD, "Custom request method with id %d does not exist", method); -+ return FAILURE; -+ } -+ -+ unregister_method(*name TSRMLS_CC); -+ -+ zend_hash_index_del(&HTTP_G->request.methods.registered, method); -+ return SUCCESS; -+} -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_request_object.c -@@ -0,0 +1,1922 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_request_object.c 300299 2010-06-09 06:23:16Z mike $ */ -+ -+#define HTTP_WANT_CURL -+#include "php_http.h" -+ -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) -+ -+#include "zend_interfaces.h" -+ -+#include "php_http_api.h" -+#include "php_http_cookie_api.h" -+#include "php_http_exception_object.h" -+#include "php_http_message_api.h" -+#include "php_http_message_object.h" -+#include "php_http_request_api.h" -+#include "php_http_request_object.h" -+#include "php_http_request_pool_api.h" -+#include "php_http_url_api.h" -+ -+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpRequest, method, 0, req_args) -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpRequest, method, 0) -+#define HTTP_REQUEST_ME(method, visibility) PHP_ME(HttpRequest, method, HTTP_ARGS(HttpRequest, method), visibility) -+#define HTTP_REQUEST_ALIAS(method, func) HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpRequest, method)) -+#define HTTP_REQUEST_MALIAS(me, al, vis) ZEND_FENTRY(me, ZEND_MN(HttpRequest_##al), HTTP_ARGS(HttpRequest, al), vis) -+ -+HTTP_BEGIN_ARGS(__construct, 0) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(method, 0) -+ HTTP_ARG_VAL(options, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(factory, 0) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(method, 0) -+ HTTP_ARG_VAL(options, 0) -+ HTTP_ARG_VAL(class_name, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getOptions); -+HTTP_BEGIN_ARGS(setOptions, 0) -+ HTTP_ARG_VAL(options, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getSslOptions); -+HTTP_BEGIN_ARGS(setSslOptions, 0) -+ HTTP_ARG_VAL(ssl_options, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(addSslOptions, 0) -+ HTTP_ARG_VAL(ssl_optins, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getHeaders); -+HTTP_BEGIN_ARGS(setHeaders, 0) -+ HTTP_ARG_VAL(headers, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(addHeaders, 1) -+ HTTP_ARG_VAL(headers, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getCookies); -+HTTP_BEGIN_ARGS(setCookies, 0) -+ HTTP_ARG_VAL(cookies, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(addCookies, 1) -+ HTTP_ARG_VAL(cookies, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(enableCookies); -+HTTP_BEGIN_ARGS(resetCookies, 0) -+ HTTP_ARG_VAL(session_only, 0) -+HTTP_END_ARGS; -+HTTP_EMPTY_ARGS(flushCookies); -+ -+HTTP_EMPTY_ARGS(getUrl); -+HTTP_BEGIN_ARGS(setUrl, 1) -+ HTTP_ARG_VAL(url, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getMethod); -+HTTP_BEGIN_ARGS(setMethod, 1) -+ HTTP_ARG_VAL(request_method, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getContentType); -+HTTP_BEGIN_ARGS(setContentType, 1) -+ HTTP_ARG_VAL(content_type, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getQueryData); -+HTTP_BEGIN_ARGS(setQueryData, 0) -+ HTTP_ARG_VAL(query_data, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(addQueryData, 1) -+ HTTP_ARG_VAL(query_data, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getPostFields); -+HTTP_BEGIN_ARGS(setPostFields, 0) -+ HTTP_ARG_VAL(post_fields, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(addPostFields, 1) -+ HTTP_ARG_VAL(post_fields, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getPostFiles); -+HTTP_BEGIN_ARGS(setPostFiles, 0) -+ HTTP_ARG_VAL(post_files, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(addPostFile, 2) -+ HTTP_ARG_VAL(formname, 0) -+ HTTP_ARG_VAL(filename, 0) -+ HTTP_ARG_VAL(content_type, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getBody); -+HTTP_BEGIN_ARGS(setBody, 0) -+ HTTP_ARG_VAL(request_body_data, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(addBody, 1) -+ HTTP_ARG_VAL(request_body_data, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getPutFile); -+HTTP_BEGIN_ARGS(setPutFile, 0) -+ HTTP_ARG_VAL(filename, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getPutData); -+HTTP_BEGIN_ARGS(setPutData, 0) -+ HTTP_ARG_VAL(put_data, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(addPutData, 1) -+ HTTP_ARG_VAL(put_data, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getResponseData); -+HTTP_BEGIN_ARGS(getResponseHeader, 0) -+ HTTP_ARG_VAL(name, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(getResponseCookies, 0) -+ HTTP_ARG_VAL(flags, 0) -+ HTTP_ARG_VAL(allowed_extras, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getResponseBody); -+HTTP_EMPTY_ARGS(getResponseCode); -+HTTP_EMPTY_ARGS(getResponseStatus); -+HTTP_BEGIN_ARGS(getResponseInfo, 0) -+ HTTP_ARG_VAL(name, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getMessageClass); -+HTTP_BEGIN_ARGS(setMessageClass, 1) -+ HTTP_ARG_VAL(message_class_name, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getResponseMessage); -+HTTP_EMPTY_ARGS(getRawResponseMessage); -+HTTP_EMPTY_ARGS(getRequestMessage); -+HTTP_EMPTY_ARGS(getRawRequestMessage); -+HTTP_EMPTY_ARGS(getHistory); -+HTTP_EMPTY_ARGS(clearHistory); -+HTTP_EMPTY_ARGS(send); -+ -+HTTP_BEGIN_ARGS(get, 1) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(options, 0) -+ HTTP_ARG_VAL(info, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(head, 1) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(options, 0) -+ HTTP_ARG_VAL(info, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(postData, 2) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(data, 0) -+ HTTP_ARG_VAL(options, 0) -+ HTTP_ARG_VAL(info, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(postFields, 2) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(data, 0) -+ HTTP_ARG_VAL(options, 0) -+ HTTP_ARG_VAL(info, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(putData, 2) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(data, 0) -+ HTTP_ARG_VAL(options, 0) -+ HTTP_ARG_VAL(info, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(putFile, 2) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(file, 0) -+ HTTP_ARG_VAL(options, 0) -+ HTTP_ARG_VAL(info, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(putStream, 2) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(stream, 0) -+ HTTP_ARG_VAL(options, 0) -+ HTTP_ARG_VAL(info, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(methodRegister, 1) -+ HTTP_ARG_VAL(method_name, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(methodUnregister, 1) -+ HTTP_ARG_VAL(method, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(methodName, 1) -+ HTTP_ARG_VAL(method_id, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(methodExists, 1) -+ HTTP_ARG_VAL(method, 0) -+HTTP_END_ARGS; -+ -+#ifdef HAVE_CURL_FORMGET -+HTTP_BEGIN_ARGS(encodeBody, 2) -+ HTTP_ARG_VAL(fields, 0) -+ HTTP_ARG_VAL(files, 0) -+HTTP_END_ARGS; -+#endif -+ -+#define THIS_CE http_request_object_ce -+zend_class_entry *http_request_object_ce; -+zend_function_entry http_request_object_fe[] = { -+ HTTP_REQUEST_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -+ -+ HTTP_REQUEST_ME(setOptions, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getOptions, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(setSslOptions, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getSslOptions, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(addSslOptions, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(addHeaders, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getHeaders, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(setHeaders, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(addCookies, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getCookies, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(setCookies, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(enableCookies, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(resetCookies, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(flushCookies, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(setMethod, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getMethod, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(setUrl, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getUrl, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(setContentType, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getContentType, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(setQueryData, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getQueryData, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(addQueryData, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(setPostFields, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getPostFields, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(addPostFields, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(setBody, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getBody, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(addBody, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_MALIAS(setRawPostData, setBody, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) -+ HTTP_REQUEST_MALIAS(getRawPostData, getBody, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) -+ HTTP_REQUEST_MALIAS(addRawPostData, addBody, ZEND_ACC_PUBLIC|ZEND_ACC_DEPRECATED) -+ -+ HTTP_REQUEST_ME(setPostFiles, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(addPostFile, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getPostFiles, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(setPutFile, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getPutFile, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(setPutData, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getPutData, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(addPutData, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(send, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(getResponseData, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getResponseHeader, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getResponseCookies, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getResponseCode, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getResponseStatus, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getResponseBody, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getResponseInfo, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getResponseMessage, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getRawResponseMessage, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getRequestMessage, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getRawRequestMessage, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(getHistory, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(clearHistory, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(getMessageClass, ZEND_ACC_PUBLIC) -+ HTTP_REQUEST_ME(setMessageClass, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQUEST_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+ -+ HTTP_REQUEST_ALIAS(get, http_get) -+ HTTP_REQUEST_ALIAS(head, http_head) -+ HTTP_REQUEST_ALIAS(postData, http_post_data) -+ HTTP_REQUEST_ALIAS(postFields, http_post_fields) -+ HTTP_REQUEST_ALIAS(putData, http_put_data) -+ HTTP_REQUEST_ALIAS(putFile, http_put_file) -+ HTTP_REQUEST_ALIAS(putStream, http_put_stream) -+ -+ HTTP_REQUEST_ALIAS(methodRegister, http_request_method_register) -+ HTTP_REQUEST_ALIAS(methodUnregister, http_request_method_unregister) -+ HTTP_REQUEST_ALIAS(methodName, http_request_method_name) -+ HTTP_REQUEST_ALIAS(methodExists, http_request_method_exists) -+#ifdef HAVE_CURL_FORMGET -+ HTTP_REQUEST_ALIAS(encodeBody, http_request_body_encode) -+#endif -+ EMPTY_FUNCTION_ENTRY -+}; -+static zend_object_handlers http_request_object_handlers; -+ -+PHP_MINIT_FUNCTION(http_request_object) -+{ -+ HTTP_REGISTER_CLASS_EX(HttpRequest, http_request_object, NULL, 0); -+ http_request_object_handlers.clone_obj = _http_request_object_clone_obj; -+ -+ zend_declare_property_null(THIS_CE, ZEND_STRS("options")-1, ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("postFields")-1, ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("postFiles")-1, ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("responseInfo")-1, ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("responseMessage")-1, ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_long(THIS_CE, ZEND_STRS("responseCode")-1, 0, ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("responseStatus")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_long(THIS_CE, ZEND_STRS("method")-1, HTTP_GET, ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("url")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("contentType")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("requestBody")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("queryData")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("putFile")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("putData")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("history")-1, ZEND_ACC_PRIVATE TSRMLS_CC); -+ zend_declare_property_bool(THIS_CE, ZEND_STRS("recordHistory")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); -+ zend_declare_property_string(THIS_CE, ZEND_STRS("messageClass")-1, "", ZEND_ACC_PRIVATE TSRMLS_CC); -+ -+#ifndef WONKY -+ /* -+ * Request Method Constants -+ */ -+ /* HTTP/1.1 */ -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_GET")-1, HTTP_GET TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_HEAD")-1, HTTP_HEAD TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_POST")-1, HTTP_POST TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_PUT")-1, HTTP_PUT TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_DELETE")-1, HTTP_DELETE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_OPTIONS")-1, HTTP_OPTIONS TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_TRACE")-1, HTTP_TRACE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_CONNECT")-1, HTTP_CONNECT TSRMLS_CC); -+ /* WebDAV - RFC 2518 */ -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_PROPFIND")-1, HTTP_PROPFIND TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_PROPPATCH")-1, HTTP_PROPPATCH TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MKCOL")-1, HTTP_MKCOL TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_COPY")-1, HTTP_COPY TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MOVE")-1, HTTP_MOVE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_LOCK")-1, HTTP_LOCK TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_UNLOCK")-1, HTTP_UNLOCK TSRMLS_CC); -+ /* WebDAV Versioning - RFC 3253 */ -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_VERSION_CONTROL")-1, HTTP_VERSION_CONTROL TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_REPORT")-1, HTTP_REPORT TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_CHECKOUT")-1, HTTP_CHECKOUT TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_CHECKIN")-1, HTTP_CHECKIN TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_UNCHECKOUT")-1, HTTP_UNCHECKOUT TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MKWORKSPACE")-1, HTTP_MKWORKSPACE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_UPDATE")-1, HTTP_UPDATE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_LABEL")-1, HTTP_LABEL TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MERGE")-1, HTTP_MERGE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_BASELINE_CONTROL")-1, HTTP_BASELINE_CONTROL TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_MKACTIVITY")-1, HTTP_MKACTIVITY TSRMLS_CC); -+ /* WebDAV Access Control - RFC 3744 */ -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("METH_ACL")-1, HTTP_ACL TSRMLS_CC); -+ -+ /* -+ * HTTP Protocol Version Constants -+ */ -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("VERSION_1_0")-1, CURL_HTTP_VERSION_1_0 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("VERSION_1_1")-1, CURL_HTTP_VERSION_1_1 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("VERSION_NONE")-1, CURL_HTTP_VERSION_NONE TSRMLS_CC); /* to be removed */ -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("VERSION_ANY")-1, CURL_HTTP_VERSION_NONE TSRMLS_CC); -+ -+ /* -+ * SSL Version Constants -+ */ -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("SSL_VERSION_TLSv1")-1, CURL_SSLVERSION_TLSv1 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("SSL_VERSION_SSLv2")-1, CURL_SSLVERSION_SSLv2 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("SSL_VERSION_SSLv3")-1, CURL_SSLVERSION_SSLv3 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("SSL_VERSION_ANY")-1, CURL_SSLVERSION_DEFAULT TSRMLS_CC); -+ -+ /* -+ * DNS IPvX resolving -+ */ -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("IPRESOLVE_V4")-1, CURL_IPRESOLVE_V4 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("IPRESOLVE_V6")-1, CURL_IPRESOLVE_V6 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("IPRESOLVE_ANY")-1, CURL_IPRESOLVE_WHATEVER TSRMLS_CC); -+ -+ /* -+ * Auth Constants -+ */ -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_BASIC")-1, CURLAUTH_BASIC TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_DIGEST")-1, CURLAUTH_DIGEST TSRMLS_CC); -+#if HTTP_CURL_VERSION(7,19,3) -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_DIGEST_IE")-1, CURLAUTH_DIGEST_IE TSRMLS_CC); -+#endif -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_NTLM")-1, CURLAUTH_NTLM TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_GSSNEG")-1, CURLAUTH_GSSNEGOTIATE TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("AUTH_ANY")-1, CURLAUTH_ANY TSRMLS_CC); -+ -+ /* -+ * Proxy Type Constants -+ */ -+# if HTTP_CURL_VERSION(7,15,2) -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS4")-1, CURLPROXY_SOCKS4 TSRMLS_CC); -+# endif -+#if HTTP_CURL_VERSION(7,18,0) -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS4A")-1, CURLPROXY_SOCKS5 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS5_HOSTNAME")-1, CURLPROXY_SOCKS5 TSRMLS_CC); -+#endif -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_SOCKS5")-1, CURLPROXY_SOCKS5 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_HTTP")-1, CURLPROXY_HTTP TSRMLS_CC); -+# if HTTP_CURL_VERSION(7,19,4) -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("PROXY_HTTP_1_0")-1, CURLPROXY_HTTP_1_0 TSRMLS_CC); -+# endif -+#endif /* WONKY */ -+ -+ /* -+ * Post Redirection Constants -+ */ -+#if HTTP_CURL_VERSION(7,19,1) -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("POSTREDIR_301")-1, CURL_REDIR_POST_301 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("POSTREDIR_302")-1, CURL_REDIR_POST_302 TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("POSTREDIR_ALL")-1, CURL_REDIR_POST_ALL TSRMLS_CC); -+#endif -+ -+ return SUCCESS; -+} -+ -+zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC) -+{ -+ return http_request_object_new_ex(ce, NULL, NULL); -+} -+ -+zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, http_request_object **ptr TSRMLS_DC) -+{ -+ zend_object_value ov; -+ http_request_object *o; -+ -+ o = ecalloc(1, sizeof(http_request_object)); -+ o->zo.ce = ce; -+ o->request = http_request_init_ex(NULL, ch, 0, NULL); -+ -+ if (ptr) { -+ *ptr = o; -+ } -+ -+ ALLOC_HASHTABLE(OBJ_PROP(o)); -+ zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ -+ ov.handle = putObject(http_request_object, o); -+ ov.handlers = &http_request_object_handlers; -+ -+ return ov; -+} -+ -+zend_object_value _http_request_object_clone_obj(zval *this_ptr TSRMLS_DC) -+{ -+ zend_object_value new_ov; -+ http_request_object *new_obj; -+ getObject(http_request_object, old_obj); -+ -+ new_ov = http_request_object_new_ex(old_obj->zo.ce, NULL, &new_obj); -+ if (old_obj->request->ch) { -+ http_curl_init_ex(http_curl_copy(old_obj->request->ch), new_obj->request); -+ } -+ -+ zend_objects_clone_members(&new_obj->zo, new_ov, &old_obj->zo, Z_OBJ_HANDLE_P(this_ptr) TSRMLS_CC); -+ phpstr_append(&new_obj->request->conv.request, old_obj->request->conv.request.data, old_obj->request->conv.request.used); -+ phpstr_append(&new_obj->request->conv.response, old_obj->request->conv.response.data, old_obj->request->conv.response.used); -+ -+ return new_ov; -+} -+ -+void _http_request_object_free(zend_object *object TSRMLS_DC) -+{ -+ http_request_object *o = (http_request_object *) object; -+ -+ http_request_free(&o->request); -+ freeObject(o); -+} -+ -+#define http_request_object_check_request_content_type(t) _http_request_object_check_request_content_type((t) TSRMLS_CC) -+static inline void _http_request_object_check_request_content_type(zval *this_ptr TSRMLS_DC) -+{ -+ zval *ctype = zend_read_property(THIS_CE, getThis(), ZEND_STRS("contentType")-1, 0 TSRMLS_CC); -+ -+ if (Z_STRLEN_P(ctype)) { -+ zval **headers, *opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); -+ -+ if ( (Z_TYPE_P(opts) == IS_ARRAY) && -+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), "headers", sizeof("headers"), (void *) &headers)) && -+ (Z_TYPE_PP(headers) == IS_ARRAY)) { -+ zval **ct_header; -+ -+ /* only override if not already set */ -+ if ((SUCCESS != zend_hash_find(Z_ARRVAL_PP(headers), "Content-Type", sizeof("Content-Type"), (void *) &ct_header))) { -+ add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); -+ } else -+ /* or not a string, zero length string or a string of spaces */ -+ if ((Z_TYPE_PP(ct_header) != IS_STRING) || !Z_STRLEN_PP(ct_header)) { -+ add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); -+ } else { -+ int i, only_space = 1; -+ -+ /* check for spaces only */ -+ for (i = 0; i < Z_STRLEN_PP(ct_header); ++i) { -+ if (!HTTP_IS_CTYPE(space, Z_STRVAL_PP(ct_header)[i])) { -+ only_space = 0; -+ break; -+ } -+ } -+ if (only_space) { -+ add_assoc_stringl(*headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); -+ } -+ } -+ } else { -+ zval *headers; -+ -+ MAKE_STD_ZVAL(headers); -+ array_init(headers); -+ add_assoc_stringl(headers, "Content-Type", Z_STRVAL_P(ctype), Z_STRLEN_P(ctype), 1); -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, headers); -+ zval_ptr_dtor(&headers); -+ } -+ } -+} -+ -+#define http_request_object_message(zo, msg) _http_request_object_message((zo), (msg) TSRMLS_CC) -+static inline zend_object_value _http_request_object_message(zval *this_ptr, http_message *msg TSRMLS_DC) -+{ -+ zend_object_value ov; -+ zval *zcn = zend_read_property(THIS_CE, getThis(), ZEND_STRS("messageClass")-1, 0 TSRMLS_CC); -+ -+ if (Z_STRLEN_P(zcn) && (SUCCESS == http_object_new(&ov, Z_STRVAL_P(zcn), Z_STRLEN_P(zcn), _http_message_object_new_ex, http_message_object_ce, msg, NULL))) { -+ return ov; -+ } else { -+ return http_message_object_new_ex(http_message_object_ce, msg, NULL); -+ } -+} -+ -+STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC) -+{ -+ STATUS status = SUCCESS; -+ char *url = http_absolute_url(Z_STRVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("url")-1, 0 TSRMLS_CC))); -+ -+ if (!url) { -+ return FAILURE; -+ } -+ -+ http_request_reset(obj->request); -+ obj->request->url = url; -+ HTTP_CHECK_CURL_INIT(obj->request->ch, http_curl_init(obj->request), return FAILURE); -+ -+ switch (obj->request->meth = Z_LVAL_P(zend_read_property(THIS_CE, getThis(), ZEND_STRS("method")-1, 0 TSRMLS_CC))) -+ { -+ case HTTP_GET: -+ case HTTP_HEAD: -+ break; -+ -+ case HTTP_PUT: -+ { -+ zval *put_file = zend_read_property(THIS_CE, getThis(), ZEND_STRS("putFile")-1, 0 TSRMLS_CC); -+ -+ http_request_object_check_request_content_type(getThis()); -+ -+ if (Z_STRLEN_P(put_file)) { -+ php_stream_statbuf ssb; -+ php_stream *stream = php_stream_open_wrapper_ex(Z_STRVAL_P(put_file), "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT); -+ -+ if (stream && SUCCESS == php_stream_stat(stream, &ssb)) { -+ obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_UPLOADFILE, stream, ssb.sb.st_size, 1); -+ } else { -+ status = FAILURE; -+ } -+ } else { -+ zval *put_data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("putData")-1, 0 TSRMLS_CC); -+ obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING, -+ estrndup(Z_STRVAL_P(put_data), Z_STRLEN_P(put_data)), Z_STRLEN_P(put_data), 1); -+ } -+ break; -+ } -+ -+ case HTTP_POST: -+ default: -+ { -+ /* check for raw request body */ -+ zval *raw_data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, 0 TSRMLS_CC); -+ -+ if (Z_STRLEN_P(raw_data)) { -+ http_request_object_check_request_content_type(getThis()); -+ obj->request->body = http_request_body_init_ex(obj->request->body, HTTP_REQUEST_BODY_CSTRING, -+ estrndup(Z_STRVAL_P(raw_data), Z_STRLEN_P(raw_data)), Z_STRLEN_P(raw_data), 1); -+ } else { -+ zval *zfields = zend_read_property(THIS_CE, getThis(), ZEND_STRS("postFields")-1, 0 TSRMLS_CC), *zfiles = zend_read_property(THIS_CE, getThis(), ZEND_STRS("postFiles")-1, 0 TSRMLS_CC); -+ HashTable *fields; -+ HashTable *files; -+ -+ fields = (Z_TYPE_P(zfields) == IS_ARRAY) ? Z_ARRVAL_P(zfields) : NULL; -+ files = (Z_TYPE_P(zfiles) == IS_ARRAY) ? Z_ARRVAL_P(zfiles) : NULL; -+ -+ if ((fields && zend_hash_num_elements(fields)) || (files && zend_hash_num_elements(files))) { -+ if (!(obj->request->body = http_request_body_fill(obj->request->body, fields, files))) { -+ status = FAILURE; -+ } -+ } -+ } -+ break; -+ } -+ } -+ -+ if (status == SUCCESS) { -+ zval *qdata = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryData")-1, 0 TSRMLS_CC); -+ zval *options = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); -+ -+ if (Z_STRLEN_P(qdata)) { -+ if (!strchr(obj->request->url, '?')) { -+ strlcat(obj->request->url, "?", HTTP_URL_MAXLEN); -+ } else { -+ strlcat(obj->request->url, "&", HTTP_URL_MAXLEN); -+ } -+ strlcat(obj->request->url, Z_STRVAL_P(qdata), HTTP_URL_MAXLEN); -+ } -+ -+ http_request_prepare(obj->request, Z_ARRVAL_P(options)); -+ -+ /* check if there's a onProgress method and add it as progress callback if one isn't already set */ -+ if (zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onprogress", sizeof("onprogress"))) { -+ zval **entry, *pcb; -+ -+ if ( (Z_TYPE_P(options) != IS_ARRAY) -+ || (SUCCESS != zend_hash_find(Z_ARRVAL_P(options), "onprogress", sizeof("onprogress"), (void *) &entry) -+ || (!IS_CALLABLE(*entry, 0, NULL)))) { -+ MAKE_STD_ZVAL(pcb); -+ array_init(pcb); -+ ZVAL_ADDREF(getThis()); -+ add_next_index_zval(pcb, getThis()); -+ add_next_index_stringl(pcb, "onprogress", lenof("onprogress"), 1); -+ http_request_set_progress_callback(obj->request, pcb); -+ zval_ptr_dtor(&pcb); -+ } -+ } -+ } -+ -+ return status; -+} -+ -+STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC) -+{ -+ STATUS ret; -+ zval *info; -+ http_message *msg; -+ -+ /* always fetch info */ -+ MAKE_STD_ZVAL(info); -+ array_init(info); -+ http_request_info(obj->request, Z_ARRVAL_P(info)); -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("responseInfo")-1, info TSRMLS_CC); -+ zval_ptr_dtor(&info); -+ -+ /* parse response message */ -+ phpstr_fix(&obj->request->conv.request); -+ phpstr_fix(&obj->request->conv.response); -+ -+ if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response)))) { -+ zval *message; -+ -+ if (i_zend_is_true(zend_read_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, 0 TSRMLS_CC))) { -+ zval *hist, *history = zend_read_property(THIS_CE, getThis(), ZEND_STRS("history")-1, 0 TSRMLS_CC); -+ http_message *response = http_message_parse(PHPSTR_VAL(&obj->request->conv.response), PHPSTR_LEN(&obj->request->conv.response)); -+ http_message *request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)); -+ -+ MAKE_STD_ZVAL(hist); -+ ZVAL_OBJVAL(hist, http_request_object_message(getThis(), http_message_interconnect(response, request)), 0); -+ if (Z_TYPE_P(history) == IS_OBJECT) { -+ http_message_object_prepend(hist, history); -+ } -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("history")-1, hist TSRMLS_CC); -+ zval_ptr_dtor(&hist); -+ } -+ -+ zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("responseCode")-1, msg->http.info.response.code TSRMLS_CC); -+ zend_update_property_string(THIS_CE, getThis(), ZEND_STRS("responseStatus")-1, STR_PTR(msg->http.info.response.status) TSRMLS_CC); -+ -+ MAKE_STD_ZVAL(message); -+ ZVAL_OBJVAL(message, http_request_object_message(getThis(), msg), 0); -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, message TSRMLS_CC); -+ zval_ptr_dtor(&message); -+ -+ ret = SUCCESS; -+ } else { -+ /* update properties with empty values*/ -+ zval *znull; -+ -+ MAKE_STD_ZVAL(znull); -+ ZVAL_NULL(znull); -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, znull TSRMLS_CC); -+ zval_ptr_dtor(&znull); -+ -+ zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("responseCode")-1, 0 TSRMLS_CC); -+ zend_update_property_string(THIS_CE, getThis(), ZEND_STRS("responseStatus")-1, "" TSRMLS_CC); -+ -+ /* append request message to history */ -+ if (i_zend_is_true(zend_read_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, 0 TSRMLS_CC))) { -+ http_message *request; -+ -+ if ((request = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)))) { -+ zval *hist, *history = zend_read_property(THIS_CE, getThis(), ZEND_STRS("history")-1, 0 TSRMLS_CC); -+ -+ MAKE_STD_ZVAL(hist); -+ ZVAL_OBJVAL(hist, http_request_object_message(getThis(), request), 0); -+ if (Z_TYPE_P(history) == IS_OBJECT) { -+ http_message_object_prepend(hist, history); -+ } -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("history")-1, hist TSRMLS_CC); -+ zval_ptr_dtor(&hist); -+ } -+ } -+ -+ ret = FAILURE; -+ } -+ -+ http_request_set_progress_callback(obj->request, NULL); -+ -+ if (!EG(exception) && zend_hash_exists(&Z_OBJCE_P(getThis())->function_table, "onfinish", sizeof("onfinish"))) { -+ zval *param; -+ -+ MAKE_STD_ZVAL(param); -+ ZVAL_BOOL(param, ret == SUCCESS); -+ with_error_handling(EH_NORMAL, NULL) { -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "onfinish", NULL, param); -+ } end_error_handling(); -+ zval_ptr_dtor(¶m); -+ } -+ -+ return ret; -+} -+ -+static int apply_pretty_key(void *pDest, int num_args, va_list args, zend_hash_key *hash_key) -+{ -+ if (hash_key->arKey && hash_key->nKeyLength > 1) { -+ hash_key->h = zend_hash_func(pretty_key(hash_key->arKey, hash_key->nKeyLength - 1, 1, 0), hash_key->nKeyLength); -+ } -+ return ZEND_HASH_APPLY_KEEP; -+} -+ -+#define http_request_object_set_options_subr(key, ow, pk) \ -+ _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key), (ow), (pk)) -+static inline void _http_request_object_set_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len, int overwrite, int prettify_keys) -+{ -+ zval *old_opts, *new_opts, *opts = NULL, **entry = NULL; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a/!", &opts)) { -+ RETURN_FALSE; -+ } -+ -+ MAKE_STD_ZVAL(new_opts); -+ array_init(new_opts); -+ old_opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); -+ if (Z_TYPE_P(old_opts) == IS_ARRAY) { -+ array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); -+ } -+ -+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(new_opts), key, len, (void *) &entry)) { -+ if (overwrite) { -+ zend_hash_clean(Z_ARRVAL_PP(entry)); -+ } -+ if (opts && zend_hash_num_elements(Z_ARRVAL_P(opts))) { -+ if (overwrite) { -+ array_copy(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry)); -+ } else { -+ array_join(Z_ARRVAL_P(opts), Z_ARRVAL_PP(entry), 0, prettify_keys ? ARRAY_JOIN_PRETTIFY : 0); -+ } -+ } -+ } else if (opts) { -+ if (prettify_keys) { -+ zend_hash_apply_with_arguments(Z_ARRVAL_P(opts) HTTP_ZAPI_HASH_TSRMLS_CC, apply_pretty_key, 0, NULL); -+ } -+ ZVAL_ADDREF(opts); -+ add_assoc_zval_ex(new_opts, key, len, opts); -+ } -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("options")-1, new_opts TSRMLS_CC); -+ zval_ptr_dtor(&new_opts); -+ -+ RETURN_TRUE; -+} -+ -+#define http_request_object_get_options_subr(key) \ -+ _http_request_get_options_subr(INTERNAL_FUNCTION_PARAM_PASSTHRU, (key), sizeof(key)) -+static inline void _http_request_get_options_subr(INTERNAL_FUNCTION_PARAMETERS, char *key, size_t len) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *opts, **options; -+ -+ opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); -+ array_init(return_value); -+ -+ if ( (Z_TYPE_P(opts) == IS_ARRAY) && -+ (SUCCESS == zend_hash_find(Z_ARRVAL_P(opts), key, len, (void *) &options))) { -+ convert_to_array(*options); -+ array_copy(Z_ARRVAL_PP(options), Z_ARRVAL_P(return_value)); -+ } -+ } -+} -+ -+ -+/* ### USERLAND ### */ -+ -+/* {{{ proto void HttpRequest::__construct([string url[, int request_method = HTTP_METH_GET[, array options]]]) -+ Create a new HttpRequest object instance. */ -+PHP_METHOD(HttpRequest, __construct) -+{ -+ char *URL = NULL; -+ int URL_len; -+ long meth = -1; -+ zval *options = NULL; -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla!", &URL, &URL_len, &meth, &options)) { -+ if (URL) { -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("url")-1, URL, URL_len TSRMLS_CC); -+ } -+ if (meth > -1) { -+ zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("method")-1, meth TSRMLS_CC); -+ } -+ if (options) { -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setoptions", NULL, options); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto HttpRequest HttpRequest::factory([string url[, int request_method HTTP_METH_GET[, array options[, string class_name = "HttpRequest"]]]]) -+ Create a new HttpRequest object instance. */ -+PHP_METHOD(HttpRequest, factory) -+{ -+ char *cn = NULL, *URL = NULL; -+ int cl = 0, URL_len = 0; -+ long meth = -1; -+ zval *options = NULL; -+ zend_object_value ov; -+ -+ SET_EH_THROW_HTTP(); -+ if ( SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|sla!s", &URL, &URL_len, &meth, &options, &cn, &cl) && -+ SUCCESS == http_object_new(&ov, cn, cl, _http_request_object_new_ex, http_request_object_ce, NULL, NULL)) { -+ RETVAL_OBJVAL(ov, 0); -+ getThis() = return_value; -+ if (URL) { -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("url")-1, URL, URL_len TSRMLS_CC); -+ } -+ if (meth > -1) { -+ zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("method")-1, meth TSRMLS_CC); -+ } -+ if (options) { -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setoptions", NULL, options); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setOptions([array options]) -+ Set the request options to use. See http_get() for a full list of available options. */ -+PHP_METHOD(HttpRequest, setOptions) -+{ -+ HashKey key = initHashKey(0); -+ HashPosition pos; -+ zval *opts = NULL, *old_opts, *new_opts, *add_opts, **opt; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|a!/", &opts)) { -+ RETURN_FALSE; -+ } -+ -+ MAKE_STD_ZVAL(new_opts); -+ array_init(new_opts); -+ -+ if (!opts || !zend_hash_num_elements(Z_ARRVAL_P(opts))) { -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("options")-1, new_opts TSRMLS_CC); -+ zval_ptr_dtor(&new_opts); -+ RETURN_TRUE; -+ } -+ -+ MAKE_STD_ZVAL(add_opts); -+ array_init(add_opts); -+ /* some options need extra attention -- thus cannot use array_merge() directly */ -+ FOREACH_KEYVAL(pos, opts, key, opt) { -+ if (key.type == HASH_KEY_IS_STRING) { -+#define KEYMATCH(k, s) ((sizeof(s)==k.len) && !strcasecmp(k.str, s)) -+ if (KEYMATCH(key, "headers")) { -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addheaders", NULL, *opt); -+ } else if (KEYMATCH(key, "cookies")) { -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addcookies", NULL, *opt); -+ } else if (KEYMATCH(key, "ssl")) { -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "addssloptions", NULL, *opt); -+ } else if (KEYMATCH(key, "url") || KEYMATCH(key, "uri")) { -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "seturl", NULL, *opt); -+ } else if (KEYMATCH(key, "method")) { -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmethod", NULL, *opt); -+ } else if (KEYMATCH(key, "flushcookies")) { -+ getObject(http_request_object, obj); -+ if (i_zend_is_true(*opt)) { -+ http_request_flush_cookies(obj->request); -+ } -+ } else if (KEYMATCH(key, "resetcookies")) { -+ getObject(http_request_object, obj); -+ http_request_reset_cookies(obj->request, (zend_bool) i_zend_is_true(*opt)); -+ } else if (KEYMATCH(key, "enablecookies")) { -+ getObject(http_request_object, obj); -+ http_request_enable_cookies(obj->request); -+ } else if (KEYMATCH(key, "recordHistory")) { -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("recordHistory")-1, *opt TSRMLS_CC); -+ } else if (KEYMATCH(key, "messageClass")) { -+ zend_call_method_with_1_params(&getThis(), Z_OBJCE_P(getThis()), NULL, "setmessageclass", NULL, *opt); -+ } else if (Z_TYPE_PP(opt) == IS_NULL) { -+ old_opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); -+ if (Z_TYPE_P(old_opts) == IS_ARRAY) { -+ zend_hash_del(Z_ARRVAL_P(old_opts), key.str, key.len); -+ } -+ } else { -+ ZVAL_ADDREF(*opt); -+ add_assoc_zval_ex(add_opts, key.str, key.len, *opt); -+ } -+ } -+ } -+ -+ old_opts = zend_read_property(THIS_CE, getThis(), ZEND_STRS("options")-1, 0 TSRMLS_CC); -+ if (Z_TYPE_P(old_opts) == IS_ARRAY) { -+ array_copy(Z_ARRVAL_P(old_opts), Z_ARRVAL_P(new_opts)); -+ } -+ array_join(Z_ARRVAL_P(add_opts), Z_ARRVAL_P(new_opts), 0, 0); -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("options")-1, new_opts TSRMLS_CC); -+ zval_ptr_dtor(&new_opts); -+ zval_ptr_dtor(&add_opts); -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto array HttpRequest::getOptions() -+ Get currently set options. */ -+PHP_METHOD(HttpRequest, getOptions) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(options); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setSslOptions([array options]) -+ Set SSL options. */ -+PHP_METHOD(HttpRequest, setSslOptions) -+{ -+ http_request_object_set_options_subr("ssl", 1, 0); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::addSslOptions(array options) -+ Set additional SSL options. */ -+PHP_METHOD(HttpRequest, addSslOptions) -+{ -+ http_request_object_set_options_subr("ssl", 0, 0); -+} -+/* }}} */ -+ -+/* {{{ proto array HttpRequest::getSslOtpions() -+ Get previously set SSL options. */ -+PHP_METHOD(HttpRequest, getSslOptions) -+{ -+ http_request_object_get_options_subr("ssl"); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::addHeaders(array headers) -+ Add request header name/value pairs. */ -+PHP_METHOD(HttpRequest, addHeaders) -+{ -+ http_request_object_set_options_subr("headers", 0, 1); -+} -+ -+/* {{{ proto bool HttpRequest::setHeaders([array headers]) -+ Set request header name/value pairs. */ -+PHP_METHOD(HttpRequest, setHeaders) -+{ -+ http_request_object_set_options_subr("headers", 1, 1); -+} -+/* }}} */ -+ -+/* {{{ proto array HttpRequest::getHeaders() -+ Get previously set request headers. */ -+PHP_METHOD(HttpRequest, getHeaders) -+{ -+ http_request_object_get_options_subr("headers"); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setCookies([array cookies]) -+ Set cookies. */ -+PHP_METHOD(HttpRequest, setCookies) -+{ -+ http_request_object_set_options_subr("cookies", 1, 0); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::addCookies(array cookies) -+ Add cookies. */ -+PHP_METHOD(HttpRequest, addCookies) -+{ -+ http_request_object_set_options_subr("cookies", 0, 0); -+} -+/* }}} */ -+ -+/* {{{ proto array HttpRequest::getCookies() -+ Get previously set cookies. */ -+PHP_METHOD(HttpRequest, getCookies) -+{ -+ http_request_object_get_options_subr("cookies"); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::enableCookies() -+ Enable automatic sending of received cookies. Note that customly set cookies will be sent anyway. */ -+PHP_METHOD(HttpRequest, enableCookies) -+{ -+ NO_ARGS { -+ getObject(http_request_object, obj); -+ RETURN_SUCCESS(http_request_enable_cookies(obj->request)); -+ } -+ -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::resetCookies([bool session_only = FALSE]) -+ Reset all automatically received/sent cookies. Note that customly set cookies are not affected. */ -+PHP_METHOD(HttpRequest, resetCookies) -+{ -+ zend_bool session_only = 0; -+ getObject(http_request_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &session_only)) { -+ RETURN_FALSE; -+ } -+ RETURN_SUCCESS(http_request_reset_cookies(obj->request, session_only)); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::flushCookies() -+ Flush internal cookies to the cookiestore file */ -+PHP_METHOD(HttpRequest, flushCookies) -+{ -+ NO_ARGS { -+ getObject(http_request_object, obj); -+ RETURN_SUCCESS(http_request_flush_cookies(obj->request)); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setUrl(string url) -+ Set the request URL. */ -+PHP_METHOD(HttpRequest, setUrl) -+{ -+ char *URL = NULL; -+ int URL_len; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &URL, &URL_len)) { -+ RETURN_FALSE; -+ } -+ -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("url")-1, URL, URL_len TSRMLS_CC); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getUrl() -+ Get the previously set request URL. */ -+PHP_METHOD(HttpRequest, getUrl) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(url); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setMethod(int request_method) -+ Set the request method. */ -+PHP_METHOD(HttpRequest, setMethod) -+{ -+ long meth; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &meth)) { -+ RETURN_FALSE; -+ } -+ -+ zend_update_property_long(THIS_CE, getThis(), ZEND_STRS("method")-1, meth TSRMLS_CC); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto int HttpRequest::getMethod() -+ Get the previously set request method. */ -+PHP_METHOD(HttpRequest, getMethod) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(method); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setContentType(string content_type) -+ Set the content type the post request should have. */ -+PHP_METHOD(HttpRequest, setContentType) -+{ -+ char *ctype; -+ int ct_len; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ct_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (ct_len) { -+ HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE); -+ } -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("contentType")-1, ctype, ct_len TSRMLS_CC); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getContentType() -+ Get the previously content type. */ -+PHP_METHOD(HttpRequest, getContentType) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(contentType); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setQueryData([mixed query_data]) -+ Set the URL query parameters to use, overwriting previously set query parameters. */ -+PHP_METHOD(HttpRequest, setQueryData) -+{ -+ zval *qdata = NULL; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z!", &qdata)) { -+ RETURN_FALSE; -+ } -+ -+ if ((!qdata) || Z_TYPE_P(qdata) == IS_NULL) { -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, "", 0 TSRMLS_CC); -+ } else if ((Z_TYPE_P(qdata) == IS_ARRAY) || (Z_TYPE_P(qdata) == IS_OBJECT)) { -+ char *query_data = NULL; -+ -+ if (SUCCESS != http_urlencode_hash(HASH_OF(qdata), &query_data)) { -+ RETURN_FALSE; -+ } -+ -+ zend_update_property_string(THIS_CE, getThis(), ZEND_STRS("queryData")-1, query_data TSRMLS_CC); -+ efree(query_data); -+ } else { -+ zval *data = http_zsep(IS_STRING, qdata); -+ -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, Z_STRVAL_P(data), Z_STRLEN_P(data) TSRMLS_CC); -+ zval_ptr_dtor(&data); -+ } -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getQueryData() -+ Get the current query data in form of an urlencoded query string. */ -+PHP_METHOD(HttpRequest, getQueryData) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(queryData); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::addQueryData(array query_params) -+ Add parameters to the query parameter list, leaving previously set unchanged. */ -+PHP_METHOD(HttpRequest, addQueryData) -+{ -+ zval *qdata, *old_qdata; -+ char *query_data = NULL; -+ size_t query_data_len = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &qdata)) { -+ RETURN_FALSE; -+ } -+ -+ old_qdata = zend_read_property(THIS_CE, getThis(), ZEND_STRS("queryData")-1, 0 TSRMLS_CC); -+ -+ if (SUCCESS != http_urlencode_hash_ex(HASH_OF(qdata), 1, Z_STRVAL_P(old_qdata), Z_STRLEN_P(old_qdata), &query_data, &query_data_len)) { -+ RETURN_FALSE; -+ } -+ -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("queryData")-1, query_data, query_data_len TSRMLS_CC); -+ efree(query_data); -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::addPostFields(array post_data) -+ Adds POST data entries, leaving previously set unchanged, unless a post entry with the same name already exists. */ -+PHP_METHOD(HttpRequest, addPostFields) -+{ -+ zval *post_data, *old_post, *new_post; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/", &post_data)) { -+ RETURN_FALSE; -+ } -+ -+ if (zend_hash_num_elements(Z_ARRVAL_P(post_data))) { -+ MAKE_STD_ZVAL(new_post); -+ array_init(new_post); -+ old_post = zend_read_property(THIS_CE, getThis(), ZEND_STRS("postFields")-1, 0 TSRMLS_CC); -+ if (Z_TYPE_P(old_post) == IS_ARRAY) { -+ array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post)); -+ } -+ array_join(Z_ARRVAL_P(post_data), Z_ARRVAL_P(new_post), 0, 0); -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("postFields")-1, new_post TSRMLS_CC); -+ zval_ptr_dtor(&new_post); -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setPostFields([array post_data]) -+ Set the POST data entries, overwriting previously set POST data. */ -+PHP_METHOD(HttpRequest, setPostFields) -+{ -+ zval *post, *post_data = NULL; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a/!", &post_data)) { -+ RETURN_FALSE; -+ } -+ -+ MAKE_STD_ZVAL(post); -+ array_init(post); -+ if (post_data && zend_hash_num_elements(Z_ARRVAL_P(post_data))) { -+ array_copy(Z_ARRVAL_P(post_data), Z_ARRVAL_P(post)); -+ } -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("postFields")-1, post TSRMLS_CC); -+ zval_ptr_dtor(&post); -+ -+ RETURN_TRUE; -+} -+/* }}}*/ -+ -+/* {{{ proto array HttpRequest::getPostFields() -+ Get previously set POST data. */ -+PHP_METHOD(HttpRequest, getPostFields) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(postFields); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setBody([string request_body_data]) -+ Set request body to send, overwriting previously set request body. Don't forget to specify a content type. */ -+PHP_METHOD(HttpRequest, setBody) -+{ -+ char *raw_data = NULL; -+ int data_len = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &raw_data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (!raw_data) { -+ raw_data = ""; -+ } -+ -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, raw_data, data_len TSRMLS_CC); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::addBody(string request_body_data) -+ Add request body data, leaving previously set request body data unchanged. */ -+PHP_METHOD(HttpRequest, addBody) -+{ -+ char *raw_data; -+ int data_len; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &raw_data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (data_len) { -+ zval *data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, 0 TSRMLS_CC); -+ -+ if (Z_STRLEN_P(data)) { -+ Z_STRVAL_P(data) = erealloc(Z_STRVAL_P(data), (Z_STRLEN_P(data) += data_len) + 1); -+ Z_STRVAL_P(data)[Z_STRLEN_P(data)] = '\0'; -+ memcpy(Z_STRVAL_P(data) + Z_STRLEN_P(data) - data_len, raw_data, data_len); -+ } else { -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("requestBody")-1, raw_data, data_len TSRMLS_CC); -+ } -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getBody() -+ Get previously set request body data. */ -+PHP_METHOD(HttpRequest, getBody) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(requestBody); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::addPostFile(string name, string file[, string content_type = "application/x-octetstream"]) -+ Add a file to the POST request, leaving previously set files unchanged. */ -+PHP_METHOD(HttpRequest, addPostFile) -+{ -+ zval *entry, *old_post, *new_post; -+ char *name, *file, *type = NULL; -+ int name_len, file_len, type_len = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ss|s", &name, &name_len, &file, &file_len, &type, &type_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (type_len) { -+ HTTP_CHECK_CONTENT_TYPE(type, RETURN_FALSE); -+ } else { -+ type = "application/x-octetstream"; -+ type_len = sizeof("application/x-octetstream") - 1; -+ } -+ -+ MAKE_STD_ZVAL(entry); -+ array_init(entry); -+ -+ add_assoc_stringl(entry, "name", name, name_len, 1); -+ add_assoc_stringl(entry, "type", type, type_len, 1); -+ add_assoc_stringl(entry, "file", file, file_len, 1); -+ -+ MAKE_STD_ZVAL(new_post); -+ array_init(new_post); -+ old_post = zend_read_property(THIS_CE, getThis(), ZEND_STRS("postFiles")-1, 0 TSRMLS_CC); -+ if (Z_TYPE_P(old_post) == IS_ARRAY) { -+ array_copy(Z_ARRVAL_P(old_post), Z_ARRVAL_P(new_post)); -+ } -+ add_next_index_zval(new_post, entry); -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("postFiles")-1, new_post TSRMLS_CC); -+ zval_ptr_dtor(&new_post); -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setPostFiles([array post_files]) -+ Set files to post, overwriting previously set post files. */ -+PHP_METHOD(HttpRequest, setPostFiles) -+{ -+ zval *files = NULL, *post; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "a!/", &files)) { -+ RETURN_FALSE; -+ } -+ -+ MAKE_STD_ZVAL(post); -+ array_init(post); -+ if (files && (Z_TYPE_P(files) == IS_ARRAY)) { -+ array_copy(Z_ARRVAL_P(files), Z_ARRVAL_P(post)); -+ } -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("postFiles")-1, post TSRMLS_CC); -+ zval_ptr_dtor(&post); -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto array HttpRequest::getPostFiles() -+ Get all previously added POST files. */ -+PHP_METHOD(HttpRequest, getPostFiles) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(postFiles); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setPutFile([string file]) -+ Set file to put. Affects only PUT requests. */ -+PHP_METHOD(HttpRequest, setPutFile) -+{ -+ char *file = ""; -+ int file_len = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &file, &file_len)) { -+ RETURN_FALSE; -+ } -+ -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("putFile")-1, file, file_len TSRMLS_CC); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getPutFile() -+ Get previously set put file. */ -+PHP_METHOD(HttpRequest, getPutFile) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(putFile); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::setPutData([string put_data]) -+ Set PUT data to send, overwriting previously set PUT data. */ -+PHP_METHOD(HttpRequest, setPutData) -+{ -+ char *put_data = NULL; -+ int data_len = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &put_data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (!put_data) { -+ put_data = ""; -+ } -+ -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("putData")-1, put_data, data_len TSRMLS_CC); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequest::addPutData(string put_data) -+ Add PUT data, leaving previously set PUT data unchanged. */ -+PHP_METHOD(HttpRequest, addPutData) -+{ -+ char *put_data; -+ int data_len; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &put_data, &data_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (data_len) { -+ zval *data = zend_read_property(THIS_CE, getThis(), ZEND_STRS("putData")-1, 0 TSRMLS_CC); -+ -+ if (Z_STRLEN_P(data)) { -+ Z_STRVAL_P(data) = erealloc(Z_STRVAL_P(data), (Z_STRLEN_P(data) += data_len) + 1); -+ Z_STRVAL_P(data)[Z_STRLEN_P(data)] = '\0'; -+ memcpy(Z_STRVAL_P(data) + Z_STRLEN_P(data) - data_len, put_data, data_len); -+ } else { -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("putData")-1, put_data, data_len TSRMLS_CC); -+ } -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getPutData() -+ Get previously set PUT data. */ -+PHP_METHOD(HttpRequest, getPutData) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(putData); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto array HttpRequest::getResponseData() -+ Get all response data after the request has been sent. */ -+PHP_METHOD(HttpRequest, getResponseData) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ char *body; -+ size_t body_len; -+ zval *headers, *message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); -+ -+ if (Z_TYPE_P(message) == IS_OBJECT) { -+ getObjectEx(http_message_object, msg, message); -+ -+ array_init(return_value); -+ -+ MAKE_STD_ZVAL(headers); -+ array_init(headers); -+ zend_hash_copy(Z_ARRVAL_P(headers), &msg->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ add_assoc_zval(return_value, "headers", headers); -+ -+ phpstr_data(PHPSTR(msg->message), &body, &body_len); -+ add_assoc_stringl(return_value, "body", body, body_len, 0); -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto mixed HttpRequest::getResponseHeader([string name]) -+ Get response header(s) after the request has been sent. */ -+PHP_METHOD(HttpRequest, getResponseHeader) -+{ -+ if (return_value_used) { -+ zval *header; -+ char *header_name = NULL; -+ int header_len = 0; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &header_name, &header_len)) { -+ zval *message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); -+ -+ if (Z_TYPE_P(message) == IS_OBJECT) { -+ getObjectEx(http_message_object, msg, message); -+ -+ if (header_len) { -+ if ((header = http_message_header_ex(msg->message, pretty_key(header_name, header_len, 1, 1), header_len + 1, 0))) { -+ RETURN_ZVAL(header, 1, 1); -+ } -+ } else { -+ array_init(return_value); -+ zend_hash_copy(Z_ARRVAL_P(return_value), &msg->message->hdrs, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ return; -+ } -+ } -+ } -+ RETURN_FALSE; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto array HttpRequest::getResponseCookies([int flags[, array allowed_extras]]) -+ Get response cookie(s) after the request has been sent. */ -+PHP_METHOD(HttpRequest, getResponseCookies) -+{ -+ if (return_value_used) { -+ long flags = 0; -+ zval *allowed_extras_array = NULL; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|la!", &flags, &allowed_extras_array)) { -+ int i = 0; -+ HashKey key = initHashKey(0); -+ char **allowed_extras = NULL; -+ zval **header = NULL, **entry = NULL, *message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); -+ HashPosition pos, pos1, pos2; -+ -+ if (Z_TYPE_P(message) == IS_OBJECT) { -+ getObjectEx(http_message_object, msg, message); -+ -+ array_init(return_value); -+ -+ if (allowed_extras_array) { -+ allowed_extras = ecalloc(zend_hash_num_elements(Z_ARRVAL_P(allowed_extras_array)) + 1, sizeof(char *)); -+ FOREACH_VAL(pos, allowed_extras_array, entry) { -+ zval *data = http_zsep(IS_STRING, *entry); -+ allowed_extras[i++] = estrndup(Z_STRVAL_P(data), Z_STRLEN_P(data)); -+ zval_ptr_dtor(&data); -+ } -+ } -+ -+ FOREACH_HASH_KEYVAL(pos1, &msg->message->hdrs, key, header) { -+ if (key.type == HASH_KEY_IS_STRING && !strcasecmp(key.str, "Set-Cookie")) { -+ http_cookie_list list; -+ -+ if (Z_TYPE_PP(header) == IS_ARRAY) { -+ zval **single_header; -+ -+ FOREACH_VAL(pos2, *header, single_header) { -+ zval *data = http_zsep(IS_STRING, *single_header); -+ -+ if (http_parse_cookie_ex(&list, Z_STRVAL_P(data), flags, allowed_extras)) { -+ zval *cookie; -+ -+ MAKE_STD_ZVAL(cookie); -+ object_init(cookie); -+ http_cookie_list_tostruct(&list, cookie); -+ add_next_index_zval(return_value, cookie); -+ http_cookie_list_dtor(&list); -+ } -+ zval_ptr_dtor(&data); -+ } -+ } else { -+ zval *data = http_zsep(IS_STRING, *header); -+ if (http_parse_cookie_ex(&list, Z_STRVAL_P(data), flags, allowed_extras)) { -+ zval *cookie; -+ -+ MAKE_STD_ZVAL(cookie); -+ object_init(cookie); -+ http_cookie_list_tostruct(&list, cookie); -+ add_next_index_zval(return_value, cookie); -+ http_cookie_list_dtor(&list); -+ } -+ zval_ptr_dtor(&data); -+ } -+ } -+ } -+ -+ if (allowed_extras) { -+ for (i = 0; allowed_extras[i]; ++i) { -+ efree(allowed_extras[i]); -+ } -+ efree(allowed_extras); -+ } -+ -+ return; -+ } -+ } -+ RETURN_FALSE; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getResponseBody() -+ Get the response body after the request has been sent. */ -+PHP_METHOD(HttpRequest, getResponseBody) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); -+ -+ if (Z_TYPE_P(message) == IS_OBJECT) { -+ getObjectEx(http_message_object, msg, message); -+ RETURN_PHPSTR_DUP(&msg->message->body); -+ } else { -+ RETURN_FALSE; -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto int HttpRequest::getResponseCode() -+ Get the response code after the request has been sent. */ -+PHP_METHOD(HttpRequest, getResponseCode) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(responseCode); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getResponseStatus() -+ Get the response status (i.e. the string after the response code) after the message has been sent. */ -+PHP_METHOD(HttpRequest, getResponseStatus) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP(responseStatus); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto mixed HttpRequest::getResponseInfo([string name]) -+ Get response info after the request has been sent. */ -+PHP_METHOD(HttpRequest, getResponseInfo) -+{ -+ if (return_value_used) { -+ zval *info, **infop; -+ char *info_name = NULL; -+ int info_len = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &info_name, &info_len)) { -+ RETURN_FALSE; -+ } -+ -+ info = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseInfo")-1, 0 TSRMLS_CC); -+ -+ if (Z_TYPE_P(info) != IS_ARRAY) { -+ RETURN_FALSE; -+ } -+ -+ if (info_len && info_name) { -+ if (SUCCESS == zend_hash_find(Z_ARRVAL_P(info), pretty_key(info_name, info_len, 0, 0), info_len + 1, (void *) &infop)) { -+ RETURN_ZVAL(*infop, 1, 0); -+ } else { -+ http_error_ex(HE_NOTICE, HTTP_E_INVALID_PARAM, "Could not find response info named %s", info_name); -+ RETURN_FALSE; -+ } -+ } else { -+ RETURN_ZVAL(info, 1, 0); -+ } -+ } -+} -+/* }}}*/ -+ -+/* {{{ proto HttpMessage HttpRequest::getResponseMessage() -+ Get the full response as HttpMessage object after the request has been sent. */ -+PHP_METHOD(HttpRequest, getResponseMessage) -+{ -+ NO_ARGS { -+ zval *message; -+ -+ SET_EH_THROW_HTTP(); -+ message = zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC); -+ if (Z_TYPE_P(message) == IS_OBJECT) { -+ RETVAL_OBJECT(message, 1); -+ } else { -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "HttpRequest does not contain a response message"); -+ } -+ SET_EH_NORMAL(); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto HttpMessage HttpRequest::getRequestMessage() -+ Get sent HTTP message. */ -+PHP_METHOD(HttpRequest, getRequestMessage) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ http_message *msg; -+ getObject(http_request_object, obj); -+ -+ SET_EH_THROW_HTTP(); -+ if ((msg = http_message_parse(PHPSTR_VAL(&obj->request->conv.request), PHPSTR_LEN(&obj->request->conv.request)))) { -+ RETVAL_OBJVAL(http_request_object_message(getThis(), msg), 0); -+ } -+ SET_EH_NORMAL(); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getRawRequestMessage() -+ Get sent HTTP message. */ -+PHP_METHOD(HttpRequest, getRawRequestMessage) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_request_object, obj); -+ -+ RETURN_PHPSTR_DUP(&obj->request->conv.request); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getRawResponseMessage() -+ Get the entire HTTP response. */ -+PHP_METHOD(HttpRequest, getRawResponseMessage) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_request_object, obj); -+ -+ RETURN_PHPSTR_DUP(&obj->request->conv.response); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto HttpMessage HttpRequest::getHistory() -+ Get all sent requests and received responses as an HttpMessage object. */ -+PHP_METHOD(HttpRequest, getHistory) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *hist; -+ -+ SET_EH_THROW_HTTP(); -+ hist = zend_read_property(THIS_CE, getThis(), ZEND_STRS("history")-1, 0 TSRMLS_CC); -+ if (Z_TYPE_P(hist) == IS_OBJECT) { -+ RETVAL_OBJECT(hist, 1); -+ } else { -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "The history is empty"); -+ } -+ SET_EH_NORMAL(); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpRequest::clearHistory() -+ Clear the history. */ -+PHP_METHOD(HttpRequest, clearHistory) -+{ -+ NO_ARGS { -+ zval *hist; -+ -+ MAKE_STD_ZVAL(hist); -+ ZVAL_NULL(hist); -+ zend_update_property(THIS_CE, getThis(), ZEND_STRS("history")-1, hist TSRMLS_CC); -+ zval_ptr_dtor(&hist); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto string HttpRequest::getMessageClass() -+ Get the message class name. */ -+PHP_METHOD(HttpRequest, getMessageClass) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ RETURN_PROP("messageClass"); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void setMessageClass(string class_name) -+ Set the message class name. */ -+PHP_METHOD(HttpRequest, setMessageClass) -+{ -+ char *cn; -+ int cl; -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &cn, &cl)) { -+ zend_update_property_stringl(THIS_CE, getThis(), ZEND_STRS("messageClass")-1, cn, cl TSRMLS_CC); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto HttpMessage HttpRequest::send() -+ Send the HTTP request. */ -+PHP_METHOD(HttpRequest, send) -+{ -+ getObject(http_request_object, obj); -+ -+ NO_ARGS; -+ -+ SET_EH_THROW_HTTP(); -+ -+ RETVAL_FALSE; -+ -+ if (obj->pool) { -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot perform HttpRequest::send() while attached to an HttpRequestPool"); -+ } else if (SUCCESS == http_request_object_requesthandler(obj, getThis())) { -+ http_request_exec(obj->request); -+ if (SUCCESS == http_request_object_responsehandler(obj, getThis())) { -+ RETVAL_OBJECT(zend_read_property(THIS_CE, getThis(), ZEND_STRS("responseMessage")-1, 0 TSRMLS_CC), 1); -+ } -+ } -+ -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_request_pool_api.c -@@ -0,0 +1,660 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_request_pool_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#define HTTP_WANT_CURL -+#define HTTP_WANT_EVENT -+#include "php_http.h" -+ -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) -+ -+#include "php_http_api.h" -+#include "php_http_exception_object.h" -+#include "php_http_persistent_handle_api.h" -+#include "php_http_request_api.h" -+#include "php_http_request_object.h" -+#include "php_http_request_pool_api.h" -+#include "php_http_requestpool_object.h" -+ -+#ifndef HTTP_DEBUG_REQPOOLS -+# define HTTP_DEBUG_REQPOOLS 0 -+#endif -+ -+#ifdef HTTP_HAVE_EVENT -+typedef struct _http_request_pool_event_t { -+ struct event evnt; -+ http_request_pool *pool; -+} http_request_pool_event; -+ -+static void http_request_pool_timeout_callback(int socket, short action, void *event_data); -+static void http_request_pool_event_callback(int socket, short action, void *event_data); -+static int http_request_pool_socket_callback(CURL *easy, curl_socket_t s, int action, void *, void *); -+static void http_request_pool_timer_callback(CURLM *multi, long timeout_ms, void *timer_data); -+#endif -+ -+static int http_request_pool_compare_handles(void *h1, void *h2); -+ -+PHP_MINIT_FUNCTION(http_request_pool) -+{ -+ if (SUCCESS != http_persistent_handle_provide("http_request_pool", curl_multi_init, (http_persistent_handle_dtor) curl_multi_cleanup, NULL)) { -+ return FAILURE; -+ } -+ return SUCCESS; -+} -+ -+#ifdef HTTP_HAVE_EVENT -+PHP_RINIT_FUNCTION(http_request_pool) -+{ -+ if (!HTTP_G->request.pool.event.base && !(HTTP_G->request.pool.event.base = event_init())) { -+ return FAILURE; -+ } -+ -+ return SUCCESS; -+} -+#endif -+ -+/* {{{ http_request_pool *http_request_pool_init(http_request_pool *) */ -+PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC) -+{ -+ zend_bool free_pool; -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Initializing request pool %p\n", pool); -+#endif -+ -+ if ((free_pool = (!pool))) { -+ pool = emalloc(sizeof(http_request_pool)); -+ pool->ch = NULL; -+ } -+ -+ if (SUCCESS != http_persistent_handle_acquire("http_request_pool", &pool->ch)) { -+ if (free_pool) { -+ efree(pool); -+ } -+ return NULL; -+ } -+ -+ TSRMLS_SET_CTX(pool->tsrm_ls); -+ -+#ifdef HTTP_HAVE_EVENT -+ pool->timeout = ecalloc(1, sizeof(struct event)); -+ curl_multi_setopt(pool->ch, CURLMOPT_SOCKETDATA, pool); -+ curl_multi_setopt(pool->ch, CURLMOPT_SOCKETFUNCTION, http_request_pool_socket_callback); -+ curl_multi_setopt(pool->ch, CURLMOPT_TIMERDATA, pool); -+ curl_multi_setopt(pool->ch, CURLMOPT_TIMERFUNCTION, http_request_pool_timer_callback); -+#endif -+ -+ pool->unfinished = 0; -+ zend_llist_init(&pool->finished, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0); -+ zend_llist_init(&pool->handles, sizeof(zval *), (llist_dtor_func_t) ZVAL_PTR_DTOR, 0); -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Initialized request pool %p\n", pool); -+#endif -+ -+ return pool; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_request_pool_attach(http_request_pool *, zval *) */ -+PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request) -+{ -+#ifdef ZTS -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+#endif -+ getObjectEx(http_request_object, req, request); -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Attaching HttpRequest(#%d) %p to pool %p\n", Z_OBJ_HANDLE_P(request), req, pool); -+#endif -+ -+ if (req->pool) { -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is already member of %s HttpRequestPool", Z_OBJ_HANDLE_P(request), req->pool == pool ? "this" : "another"); -+ } else if (SUCCESS != http_request_object_requesthandler(req, request)) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "Could not initialize HttpRequest object(#%d) for attaching to the HttpRequestPool", Z_OBJ_HANDLE_P(request)); -+ } else { -+ CURLMcode code = curl_multi_add_handle(pool->ch, req->request->ch); -+ -+ if (CURLM_OK != code) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not attach HttpRequest object(#%d) to the HttpRequestPool: %s", Z_OBJ_HANDLE_P(request), curl_multi_strerror(code)); -+ } else { -+ req->pool = pool; -+ -+ ZVAL_ADDREF(request); -+ zend_llist_add_element(&pool->handles, &request); -+ ++pool->unfinished; -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "> %d HttpRequests attached to pool %p\n", zend_llist_count(&pool->handles), pool); -+#endif -+ return SUCCESS; -+ } -+ } -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_request_pool_detach(http_request_pool *, zval *) */ -+PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request) -+{ -+ CURLMcode code; -+#ifdef ZTS -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+#endif -+ getObjectEx(http_request_object, req, request); -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Detaching HttpRequest(#%d) %p from pool %p\n", Z_OBJ_HANDLE_P(request), req, pool); -+#endif -+ -+ if (!req->pool) { -+ /* not attached to any pool */ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "HttpRequest object(#%d) %p is not attached to any HttpRequestPool\n", Z_OBJ_HANDLE_P(request), req); -+#endif -+ } else if (req->pool != pool) { -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "HttpRequest object(#%d) is not attached to this HttpRequestPool", Z_OBJ_HANDLE_P(request)); -+ } else if (req->request->_in_progress_cb) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "HttpRequest object(#%d) cannot be detached from the HttpRequestPool while executing the progress callback", Z_OBJ_HANDLE_P(request)); -+ } else if (CURLM_OK != (code = curl_multi_remove_handle(pool->ch, req->request->ch))) { -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST_POOL, "Could not detach HttpRequest object(#%d) from the HttpRequestPool: %s", Z_OBJ_HANDLE_P(request), curl_multi_strerror(code)); -+ } else { -+ req->pool = NULL; -+ zend_llist_del_element(&pool->finished, request, http_request_pool_compare_handles); -+ zend_llist_del_element(&pool->handles, request, http_request_pool_compare_handles); -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "> %d HttpRequests remaining in pool %p\n", zend_llist_count(&pool->handles), pool); -+#endif -+ -+ return SUCCESS; -+ } -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ void http_request_pool_apply(http_request_pool *, http_request_pool_apply_func) */ -+PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request_pool_apply_func cb) -+{ -+ int count = zend_llist_count(&pool->handles); -+ -+ if (count) { -+ int i = 0; -+ zend_llist_position pos; -+ zval **handle, **handles = emalloc(count * sizeof(zval *)); -+ -+ for (handle = zend_llist_get_first_ex(&pool->handles, &pos); handle; handle = zend_llist_get_next_ex(&pool->handles, &pos)) { -+ handles[i++] = *handle; -+ } -+ -+ /* should never happen */ -+ if (i != count) { -+ zend_error(E_ERROR, "number of fetched request handles do not match overall count"); -+ count = i; -+ } -+ -+ for (i = 0; i < count; ++i) { -+ if (cb(pool, handles[i])) { -+ break; -+ } -+ } -+ efree(handles); -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_request_pool_apply_with_arg(http_request_pool *, http_request_pool_apply_with_arg_func, void *) */ -+PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, http_request_pool_apply_with_arg_func cb, void *arg) -+{ -+ int count = zend_llist_count(&pool->handles); -+ -+ if (count) { -+ int i = 0; -+ zend_llist_position pos; -+ zval **handle, **handles = emalloc(count * sizeof(zval *)); -+ -+ for (handle = zend_llist_get_first_ex(&pool->handles, &pos); handle; handle = zend_llist_get_next_ex(&pool->handles, &pos)) { -+ handles[i++] = *handle; -+ } -+ -+ /* should never happen */ -+ if (i != count) { -+ zend_error(E_ERROR, "number of fetched request handles do not match overall count"); -+ count = i; -+ } -+ -+ for (i = 0; i < count; ++i) { -+ if (cb(pool, handles[i], arg)) { -+ break; -+ } -+ } -+ efree(handles); -+ } -+} -+/* }}} */ -+ -+/* {{{ void http_request_pool_detach_all(http_request_pool *) */ -+PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool) -+{ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Detaching %d requests from pool %p\n", zend_llist_count(&pool->handles), pool); -+#endif -+ http_request_pool_apply(pool, _http_request_pool_detach); -+} -+/* }}} */ -+ -+/* {{{ STATUS http_request_pool_send(http_request_pool *) */ -+PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool) -+{ -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Attempt to send %d requests of pool %p\n", zend_llist_count(&pool->handles), pool); -+#endif -+ -+#ifdef HTTP_HAVE_EVENT -+ if (pool->useevents) { -+ do { -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "& Starting event dispatcher of pool %p\n", pool); -+#endif -+ event_base_dispatch(HTTP_G->request.pool.event.base); -+ } while (pool->unfinished); -+ } else -+#endif -+ { -+ while (http_request_pool_perform(pool)) { -+ if (SUCCESS != http_request_pool_select(pool)) { -+#ifdef PHP_WIN32 -+ /* see http://msdn.microsoft.com/library/en-us/winsock/winsock/windows_sockets_error_codes_2.asp */ -+ http_error_ex(HE_WARNING, HTTP_E_SOCKET, "WinSock error: %d", WSAGetLastError()); -+#else -+ http_error(HE_WARNING, HTTP_E_SOCKET, strerror(errno)); -+#endif -+ return FAILURE; -+ } -+ } -+ } -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Finished sending %d HttpRequests of pool %p (still unfinished: %d)\n", zend_llist_count(&pool->handles), pool, pool->unfinished); -+#endif -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ void http_request_pool_dtor(http_request_pool *) */ -+PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool) -+{ -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Destructing request pool %p\n", pool); -+#endif -+ -+#ifdef HTTP_HAVE_EVENT -+ efree(pool->timeout); -+#endif -+ -+ http_request_pool_detach_all(pool); -+ -+ pool->unfinished = 0; -+ zend_llist_clean(&pool->finished); -+ zend_llist_clean(&pool->handles); -+ http_persistent_handle_release("http_request_pool", &pool->ch); -+} -+/* }}} */ -+ -+#ifdef PHP_WIN32 -+# define SELECT_ERROR SOCKET_ERROR -+#else -+# define SELECT_ERROR -1 -+#endif -+ -+/* {{{ STATUS http_request_pool_select(http_request_pool *) */ -+PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool) -+{ -+ return http_request_pool_select_ex(pool, NULL); -+} -+/* }}} */ -+ -+/* {{{ STATUS http_request_pool_select_ex(http_request_pool *, struct timeval *) */ -+PHP_HTTP_API STATUS _http_request_pool_select_ex(http_request_pool *pool, struct timeval *custom_timeout) -+{ -+ int MAX; -+ fd_set R, W, E; -+ struct timeval timeout; -+ -+#ifdef HTTP_HAVE_EVENT -+ if (pool->useevents) { -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "not implemented; use HttpRequest callbacks"); -+ return FAILURE; -+ } -+#endif -+ -+ if (custom_timeout && timerisset(custom_timeout)) { -+ timeout = *custom_timeout; -+ } else { -+ http_request_pool_timeout(pool, &timeout); -+ } -+ -+ FD_ZERO(&R); -+ FD_ZERO(&W); -+ FD_ZERO(&E); -+ -+ if (CURLM_OK == curl_multi_fdset(pool->ch, &R, &W, &E, &MAX)) { -+ if (MAX == -1) { -+ http_sleep((double) timeout.tv_sec + (double) (timeout.tv_usec / HTTP_MCROSEC)); -+ return SUCCESS; -+ } else if (SELECT_ERROR != select(MAX + 1, &R, &W, &E, &timeout)) { -+ return SUCCESS; -+ } -+ } -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ int http_request_pool_perform(http_request_pool *) */ -+PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool) -+{ -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+ -+#ifdef HTTP_HAVE_EVENT -+ if (pool->useevents) { -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "not implemented; use HttpRequest callbacks"); -+ return FAILURE; -+ } -+#endif -+ -+ while (CURLM_CALL_MULTI_PERFORM == curl_multi_perform(pool->ch, &pool->unfinished)); -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "%u unfinished requests of pool %p remaining\n", pool->unfinished, pool); -+#endif -+ -+ http_request_pool_responsehandler(pool); -+ -+ return pool->unfinished; -+} -+/* }}} */ -+ -+/* {{{ void http_request_pool_responsehandler(http_request_pool *) */ -+void _http_request_pool_responsehandler(http_request_pool *pool) -+{ -+ CURLMsg *msg; -+ int remaining = 0; -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+ -+ do { -+ msg = curl_multi_info_read(pool->ch, &remaining); -+ if (msg && CURLMSG_DONE == msg->msg) { -+ if (CURLE_OK != msg->data.result) { -+ http_request_storage *st = http_request_storage_get(msg->easy_handle); -+ http_error_ex(HE_WARNING, HTTP_E_REQUEST, "%s; %s (%s)", curl_easy_strerror(msg->data.result), st?st->errorbuffer:"", st?st->url:""); -+ } -+ http_request_pool_apply_with_arg(pool, _http_request_pool_apply_responsehandler, msg->easy_handle); -+ } -+ } while (remaining); -+} -+/* }}} */ -+ -+/* {{{ int http_request_pool_apply_responsehandler(http_request_pool *, zval *, void *) */ -+int _http_request_pool_apply_responsehandler(http_request_pool *pool, zval *req, void *ch) -+{ -+#ifdef ZTS -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+#endif -+ getObjectEx(http_request_object, obj, req); -+ -+ if ((!ch) || obj->request->ch == (CURL *) ch) { -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Fetching data from HttpRequest(#%d) %p of pool %p\n", Z_OBJ_HANDLE_P(req), obj, obj->pool); -+#endif -+ -+ ZVAL_ADDREF(req); -+ zend_llist_add_element(&obj->pool->finished, &req); -+ http_request_object_responsehandler(obj, req); -+ return 1; -+ } -+ return 0; -+} -+/* }}} */ -+ -+/* {{{ struct timeval *_http_request_pool_timeout(http_request_pool *, struct timeval *) */ -+struct timeval *_http_request_pool_timeout(http_request_pool *pool, struct timeval *timeout) -+{ -+#ifdef HAVE_CURL_MULTI_TIMEOUT -+ long max_tout = 1000; -+ -+ if ((CURLM_OK == curl_multi_timeout(pool->ch, &max_tout)) && (max_tout > 0)) { -+ timeout->tv_sec = max_tout / 1000; -+ timeout->tv_usec = (max_tout % 1000) * 1000; -+ } else { -+#endif -+ timeout->tv_sec = 0; -+ timeout->tv_usec = 1000; -+#ifdef HAVE_CURL_MULTI_TIMEOUT -+ } -+#endif -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Calculating timeout (%lu, %lu) of pool %p\n", (ulong) timeout->tv_sec, (ulong) timeout->tv_usec, pool); -+#endif -+ -+ return timeout; -+} -+/* }}} */ -+ -+/*#*/ -+ -+/* {{{ static int http_request_pool_compare_handles(void *, void *) */ -+static int http_request_pool_compare_handles(void *h1, void *h2) -+{ -+ return (Z_OBJ_HANDLE_PP((zval **) h1) == Z_OBJ_HANDLE_P((zval *) h2)); -+} -+/* }}} */ -+ -+#ifdef HTTP_HAVE_EVENT -+/* {{{ static void http_request_pool_timeout_callback(int, short, void *) */ -+static void http_request_pool_timeout_callback(int socket, short action, void *event_data) -+{ -+ http_request_pool *pool = event_data; -+ -+ if (pool->useevents) { -+ CURLMcode rc; -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Timeout occurred of pool %p\n", pool); -+#endif -+ -+ while (CURLM_CALL_MULTI_PERFORM == (rc = curl_multi_socket(pool->ch, CURL_SOCKET_TIMEOUT, &pool->unfinished))); -+ -+ if (CURLM_OK != rc) { -+ http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc)); -+ } -+ -+ http_request_pool_responsehandler(pool); -+ } -+} -+/* }}} */ -+ -+/* {{{ static void http_request_pool_event_callback(int, short, void *) */ -+static void http_request_pool_event_callback(int socket, short action, void *event_data) -+{ -+ http_request_pool_event *ev = event_data; -+ http_request_pool *pool = ev->pool; -+ -+ if (pool->useevents) { -+ CURLMcode rc = CURLE_OK; -+ TSRMLS_FETCH_FROM_CTX(ev->pool->tsrm_ls); -+ -+#if HTTP_DEBUG_REQPOOLS -+ { -+ static const char event_strings[][20] = {"NONE","TIMEOUT","READ","TIMEOUT|READ","WRITE","TIMEOUT|WRITE","READ|WRITE","TIMEOUT|READ|WRITE","SIGNAL"}; -+ fprintf(stderr, "Event on socket %d (%s) event %p of pool %p\n", socket, event_strings[action], ev, pool); -+ } -+#endif -+ -+ /* don't use 'ev' below this loop as it might 've been freed in the socket callback */ -+ do { -+#ifdef HAVE_CURL_MULTI_SOCKET_ACTION -+ switch (action & (EV_READ|EV_WRITE)) { -+ case EV_READ: -+ rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_IN, &pool->unfinished); -+ break; -+ case EV_WRITE: -+ rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_OUT, &pool->unfinished); -+ break; -+ case EV_READ|EV_WRITE: -+ rc = curl_multi_socket_action(pool->ch, socket, CURL_CSELECT_IN|CURL_CSELECT_OUT, &pool->unfinished); -+ break; -+ default: -+ http_error_ex(HE_WARNING, HTTP_E_SOCKET, "Unknown event %d", (int) action); -+ return; -+ } -+#else -+ rc = curl_multi_socket(pool->ch, socket, &pool->unfinished); -+#endif -+ } while (CURLM_CALL_MULTI_PERFORM == rc); -+ -+ switch (rc) { -+ case CURLM_BAD_SOCKET: -+#if 0 -+ fprintf(stderr, "!!! Bad socket: %d (%d)\n", socket, (int) action); -+#endif -+ case CURLM_OK: -+ break; -+ default: -+ http_error(HE_WARNING, HTTP_E_SOCKET, curl_multi_strerror(rc)); -+ break; -+ } -+ -+ http_request_pool_responsehandler(pool); -+ -+ /* remove timeout if there are no transfers left */ -+ if (!pool->unfinished && event_initialized(pool->timeout) && event_pending(pool->timeout, EV_TIMEOUT, NULL)) { -+ event_del(pool->timeout); -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Removed timeout of pool %p\n", pool); -+#endif -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ static int http_request_pool_socket_callback(CURL *, curl_socket_t, int, void *, void *) */ -+static int http_request_pool_socket_callback(CURL *easy, curl_socket_t sock, int action, void *socket_data, void *assign_data) -+{ -+ http_request_pool *pool = socket_data; -+ -+ if (pool->useevents) { -+ int events = EV_PERSIST; -+ http_request_pool_event *ev = assign_data; -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+ -+ if (!ev) { -+ ev = ecalloc(1, sizeof(http_request_pool_event)); -+ ev->pool = pool; -+ curl_multi_assign(pool->ch, sock, ev); -+ event_base_set(HTTP_G->request.pool.event.base, &ev->evnt); -+ } else { -+ event_del(&ev->evnt); -+ } -+ -+#if HTTP_DEBUG_REQPOOLS -+ { -+ static const char action_strings[][8] = {"NONE", "IN", "OUT", "INOUT", "REMOVE"}; -+ http_request *r; -+ curl_easy_getinfo(easy, CURLINFO_PRIVATE, &r); -+ fprintf(stderr, "Callback on socket %2d (%8s) event %p of pool %p (%d)\n", (int) sock, action_strings[action], ev, pool, pool->unfinished); -+ } -+#endif -+ -+ switch (action) { -+ case CURL_POLL_IN: -+ events |= EV_READ; -+ break; -+ case CURL_POLL_OUT: -+ events |= EV_WRITE; -+ break; -+ case CURL_POLL_INOUT: -+ events |= EV_READ|EV_WRITE; -+ break; -+ -+ case CURL_POLL_REMOVE: -+ efree(ev); -+ case CURL_POLL_NONE: -+ return 0; -+ -+ default: -+ http_error_ex(HE_WARNING, HTTP_E_SOCKET, "Unknown socket action %d", action); -+ return -1; -+ } -+ -+ event_set(&ev->evnt, sock, events, http_request_pool_event_callback, ev); -+ event_add(&ev->evnt, NULL); -+ } -+ -+ return 0; -+} -+/* }}} */ -+ -+/* {{{ static void http_request_pool_timer_callback(CURLM *, long, void*) */ -+static void http_request_pool_timer_callback(CURLM *multi, long timeout_ms, void *timer_data) -+{ -+ http_request_pool *pool = timer_data; -+ -+ if (pool->useevents) { -+ TSRMLS_FETCH_FROM_CTX(pool->tsrm_ls); -+ struct timeval timeout; -+ -+ if (!event_initialized(pool->timeout)) { -+ event_set(pool->timeout, -1, 0, http_request_pool_timeout_callback, pool); -+ event_base_set(HTTP_G->request.pool.event.base, pool->timeout); -+ } else if (event_pending(pool->timeout, EV_TIMEOUT, NULL)) { -+ event_del(pool->timeout); -+ } -+ -+ if (timeout_ms > 0) { -+ timeout.tv_sec = timeout_ms / 1000; -+ timeout.tv_usec = (timeout_ms % 1000) * 1000; -+ } else { -+ http_request_pool_timeout(pool, &timeout); -+ } -+ -+ event_add(pool->timeout, &timeout); -+ -+#if HTTP_DEBUG_REQPOOLS -+ fprintf(stderr, "Updating timeout %lu (%lu, %lu) of pool %p\n", (ulong) timeout_ms, (ulong) timeout.tv_sec, (ulong) timeout.tv_usec, pool); -+#endif -+ } -+} -+/* }}} */ -+#endif /* HTTP_HAVE_EVENT */ -+ -+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */ -+ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_requestdatashare_object.c -@@ -0,0 +1,315 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_requestdatashare_object.c 300299 2010-06-09 06:23:16Z mike $ */ -+ -+#define HTTP_WANT_CURL -+#include "php_http.h" -+ -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) -+ -+#include "zend_interfaces.h" -+ -+#include "php_http_api.h" -+#include "php_http_exception_object.h" -+#include "php_http_request_api.h" -+#include "php_http_request_object.h" -+#include "php_http_request_datashare_api.h" -+#include "php_http_requestdatashare_object.h" -+ -+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpRequestDataShare, method, 0, req_args) -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpRequestDataShare, method, 0) -+#define HTTP_RSHARE_ME(method, visibility) PHP_ME(HttpRequestDataShare, method, HTTP_ARGS(HttpRequestDataShare, method), visibility) -+ -+#if defined(HAVE_SPL) && !defined(WONKY) -+/* SPL doesn't install its headers */ -+extern PHPAPI zend_class_entry *spl_ce_Countable; -+#endif -+ -+HTTP_EMPTY_ARGS(__destruct); -+HTTP_EMPTY_ARGS(count); -+ -+HTTP_BEGIN_ARGS(attach, 1) -+ HTTP_ARG_OBJ(HttpRequest, request, 0) -+HTTP_END_ARGS; -+HTTP_BEGIN_ARGS(detach, 1) -+ HTTP_ARG_OBJ(HttpRequest, request, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(reset); -+ -+HTTP_BEGIN_ARGS(factory, 0) -+ HTTP_ARG_VAL(global, 0) -+ HTTP_ARG_VAL(class_name, 0) -+HTTP_END_ARGS; -+ -+#ifndef WONKY -+HTTP_BEGIN_ARGS(singleton, 0) -+ HTTP_ARG_VAL(global, 0) -+HTTP_END_ARGS; -+#endif -+ -+ -+#define http_requestdatashare_object_read_prop _http_requestdatashare_object_read_prop -+static zval *_http_requestdatashare_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC); -+#define http_requestdatashare_object_write_prop _http_requestdatashare_object_write_prop -+static void _http_requestdatashare_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC); -+#define http_requestdatashare_instantiate(t, g) _http_requestdatashare_instantiate((t), (g) TSRMLS_CC) -+static inline zval *_http_requestdatashare_instantiate(zval *this_ptr, zend_bool global TSRMLS_DC); -+ -+#define THIS_CE http_requestdatashare_object_ce -+zend_class_entry *http_requestdatashare_object_ce; -+zend_function_entry http_requestdatashare_object_fe[] = { -+ HTTP_RSHARE_ME(__destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) -+ HTTP_RSHARE_ME(count, ZEND_ACC_PUBLIC) -+ HTTP_RSHARE_ME(attach, ZEND_ACC_PUBLIC) -+ HTTP_RSHARE_ME(detach, ZEND_ACC_PUBLIC) -+ HTTP_RSHARE_ME(reset, ZEND_ACC_PUBLIC) -+ HTTP_RSHARE_ME(factory, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+#ifndef WONKY -+ HTTP_RSHARE_ME(singleton, ZEND_ACC_PUBLIC|ZEND_ACC_STATIC) -+#endif -+ EMPTY_FUNCTION_ENTRY -+}; -+static zend_object_handlers http_requestdatashare_object_handlers; -+ -+PHP_MINIT_FUNCTION(http_requestdatashare_object) -+{ -+ HTTP_REGISTER_CLASS_EX(HttpRequestDataShare, http_requestdatashare_object, NULL, 0); -+ http_requestdatashare_object_handlers.clone_obj = NULL; -+ http_requestdatashare_object_handlers.read_property = http_requestdatashare_object_read_prop; -+ http_requestdatashare_object_handlers.write_property = http_requestdatashare_object_write_prop; -+ -+#if defined(HAVE_SPL) && !defined(WONKY) -+ zend_class_implements(http_requestdatashare_object_ce TSRMLS_CC, 1, spl_ce_Countable); -+#endif -+ -+ zend_declare_property_null(THIS_CE, ZEND_STRS("instance")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); -+ zend_declare_property_bool(THIS_CE, ZEND_STRS("cookie")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); -+ zend_declare_property_bool(THIS_CE, ZEND_STRS("dns")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); -+ zend_declare_property_bool(THIS_CE, ZEND_STRS("ssl")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); -+ zend_declare_property_bool(THIS_CE, ZEND_STRS("connect")-1, 0, ZEND_ACC_PUBLIC TSRMLS_CC); -+ -+ return SUCCESS; -+} -+ -+zend_object_value _http_requestdatashare_object_new(zend_class_entry *ce TSRMLS_DC) -+{ -+ return http_requestdatashare_object_new_ex(ce, NULL, NULL); -+} -+ -+zend_object_value _http_requestdatashare_object_new_ex(zend_class_entry *ce, http_request_datashare *share, http_requestdatashare_object **ptr TSRMLS_DC) -+{ -+ zend_object_value ov; -+ http_requestdatashare_object *o; -+ -+ o = ecalloc(1, sizeof(http_requestdatashare_object)); -+ o->zo.ce = ce; -+ -+ if (share) { -+ o->share = share; -+ } else { -+ o->share = http_request_datashare_new(); -+ } -+ -+ if (ptr) { -+ *ptr = o; -+ } -+ -+ ALLOC_HASHTABLE(OBJ_PROP(o)); -+ zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ -+ ov.handle = putObject(http_requestdatashare_object, o); -+ ov.handlers = &http_requestdatashare_object_handlers; -+ -+ return ov; -+} -+ -+void _http_requestdatashare_object_free(zend_object *object TSRMLS_DC) -+{ -+ http_requestdatashare_object *o = (http_requestdatashare_object *) object; -+ -+ if (!o->share->persistent) { -+ http_request_datashare_free(&o->share); -+ } -+ freeObject(o); -+} -+ -+static zval *_http_requestdatashare_object_read_prop(zval *object, zval *member, int type ZEND_LITERAL_KEY_DC TSRMLS_DC) -+{ -+ if (type == BP_VAR_W && zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)) { -+ zend_error(E_ERROR, "Cannot access HttpRequestDataShare default properties by reference or array key/index"); -+ return NULL; -+ } -+ -+ return zend_get_std_object_handlers()->read_property(object, member, type ZEND_LITERAL_KEY_CC TSRMLS_CC); -+} -+ -+static void _http_requestdatashare_object_write_prop(zval *object, zval *member, zval *value ZEND_LITERAL_KEY_DC TSRMLS_DC) -+{ -+ if (zend_hash_exists(&THIS_CE->default_properties, Z_STRVAL_P(member), Z_STRLEN_P(member)+1)) { -+ int status; -+ getObjectEx(http_requestdatashare_object, obj, object); -+ -+ status = http_request_datashare_set(obj->share, Z_STRVAL_P(member), Z_STRLEN_P(member), (zend_bool) i_zend_is_true(value)); -+ if (SUCCESS != status) { -+ return; -+ } -+ } -+ -+ zend_get_std_object_handlers()->write_property(object, member, value ZEND_LITERAL_KEY_CC TSRMLS_CC); -+} -+ -+/* {{{ proto void HttpRequestDataShare::__destruct() -+ Clean up HttpRequestDataShare object. */ -+PHP_METHOD(HttpRequestDataShare, __destruct) -+{ -+ NO_ARGS { -+ getObject(http_requestdatashare_object, obj); -+ http_request_datashare_detach_all(obj->share); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto int HttpRequestDataShare::count() -+ Implements Countable::count(). */ -+PHP_METHOD(HttpRequestDataShare, count) -+{ -+ getObject(http_requestdatashare_object, obj); -+ -+ NO_ARGS; -+ -+ RETURN_LONG(zend_llist_count(HTTP_RSHARE_HANDLES(obj->share))); -+} -+/* }}} */ -+ -+PHP_METHOD(HttpRequestDataShare, attach) -+{ -+ zval *request; -+ getObject(http_requestdatashare_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, http_request_object_ce)) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(http_request_datashare_attach(obj->share, request)); -+} -+ -+PHP_METHOD(HttpRequestDataShare, detach) -+{ -+ zval *request; -+ getObject(http_requestdatashare_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, http_request_object_ce)) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(http_request_datashare_detach(obj->share, request)); -+} -+ -+PHP_METHOD(HttpRequestDataShare, reset) -+{ -+ NO_ARGS { -+ getObject(http_requestdatashare_object, obj); -+ http_request_datashare_detach_all(obj->share); -+ } -+} -+ -+PHP_METHOD(HttpRequestDataShare, factory) -+{ -+ zend_bool global = 0; -+ char *cn = NULL; -+ int cl = 0; -+ zend_object_value ov; -+ -+ SET_EH_THROW_HTTP(); -+ if ( SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|bs", &global, &cn, &cl) && -+ SUCCESS == http_object_new(&ov, cn, cl, _http_requestdatashare_object_new_ex, http_requestdatashare_object_ce, NULL, NULL)) { -+ RETVAL_OBJVAL(ov, 0); -+ http_requestdatashare_instantiate(return_value, global); -+ } -+ SET_EH_NORMAL(); -+} -+ -+#ifndef WONKY -+/* {{{ proto static HttpRequestDataShare HttpRequestDataShare::singleton([bool global = false]) -+ Get a single instance (differentiates between the global setting). */ -+PHP_METHOD(HttpRequestDataShare, singleton) -+{ -+ zend_bool global = 0; -+ zval *instance = *zend_std_get_static_property(THIS_CE, ZEND_STRS("instance")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &global)) { -+ zval **zobj_ptr = NULL, *zobj = NULL; -+ -+ if (Z_TYPE_P(instance) == IS_ARRAY) { -+ if (SUCCESS == zend_hash_index_find(Z_ARRVAL_P(instance), global, (void *) &zobj_ptr)) { -+ RETVAL_ZVAL(*zobj_ptr, 1, 0); -+ } else { -+ zobj = http_requestdatashare_instantiate(NULL, global); -+ add_index_zval(instance, global, zobj); -+ RETVAL_OBJECT(zobj, 1); -+ } -+ } else { -+ MAKE_STD_ZVAL(instance); -+ array_init(instance); -+ -+ zobj = http_requestdatashare_instantiate(NULL, global); -+ add_index_zval(instance, global, zobj); -+ RETVAL_OBJECT(zobj, 1); -+ -+ zend_update_static_property(THIS_CE, ZEND_STRS("instance")-1, instance TSRMLS_CC); -+ zval_ptr_dtor(&instance); -+ } -+ } -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+#endif /* !WONKY */ -+ -+static inline zval *_http_requestdatashare_instantiate(zval *this_ptr, zend_bool global TSRMLS_DC) -+{ -+ if (!this_ptr) { -+ MAKE_STD_ZVAL(this_ptr); -+ Z_TYPE_P(this_ptr) = IS_OBJECT; -+ this_ptr->value.obj = http_requestdatashare_object_new_ex(http_requestdatashare_object_ce, global ? http_request_datashare_global_get() : NULL, NULL); -+ } -+ if (global) { -+ if (HTTP_G->request.datashare.cookie) { -+ zend_update_property_bool(THIS_CE, getThis(), ZEND_STRS("cookie")-1, HTTP_G->request.datashare.cookie TSRMLS_CC); -+ } -+ if (HTTP_G->request.datashare.dns) { -+ zend_update_property_bool(THIS_CE, getThis(), ZEND_STRS("dns")-1, HTTP_G->request.datashare.dns TSRMLS_CC); -+ } -+ if (HTTP_G->request.datashare.ssl) { -+ zend_update_property_bool(THIS_CE, getThis(), ZEND_STRS("ssl")-1, HTTP_G->request.datashare.ssl TSRMLS_CC); -+ } -+ if (HTTP_G->request.datashare.connect) { -+ zend_update_property_bool(THIS_CE, getThis(), ZEND_STRS("connect")-1, HTTP_G->request.datashare.connect TSRMLS_CC); -+ } -+ } -+ return this_ptr; -+} -+ -+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_requestpool_object.c -@@ -0,0 +1,466 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_requestpool_object.c 300299 2010-06-09 06:23:16Z mike $ */ -+ -+#define HTTP_WANT_CURL -+#include "php_http.h" -+ -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) -+ -+#include "zend_interfaces.h" -+ -+#include "php_http_api.h" -+#include "php_http_exception_object.h" -+#include "php_http_request_api.h" -+#include "php_http_request_object.h" -+#include "php_http_request_pool_api.h" -+#include "php_http_requestpool_object.h" -+ -+#if defined(HAVE_SPL) && !defined(WONKY) -+/* SPL doesn't install its headers */ -+extern PHPAPI zend_class_entry *spl_ce_Countable; -+#endif -+ -+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpRequestPool, method, 0, req_args) -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpRequestPool, method, 0) -+#define HTTP_REQPOOL_ME(method, visibility) PHP_ME(HttpRequestPool, method, HTTP_ARGS(HttpRequestPool, method), visibility) -+ -+HTTP_EMPTY_ARGS(__construct); -+ -+HTTP_EMPTY_ARGS(__destruct); -+HTTP_EMPTY_ARGS(reset); -+ -+HTTP_BEGIN_ARGS(attach, 1) -+ HTTP_ARG_OBJ(HttpRequest, request, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(detach, 1) -+ HTTP_ARG_OBJ(HttpRequest, request, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(send); -+HTTP_EMPTY_ARGS(socketPerform); -+HTTP_BEGIN_ARGS(socketSelect, 0) -+ HTTP_ARG_VAL(timeout, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(valid); -+HTTP_EMPTY_ARGS(current); -+HTTP_EMPTY_ARGS(key); -+HTTP_EMPTY_ARGS(next); -+HTTP_EMPTY_ARGS(rewind); -+ -+HTTP_EMPTY_ARGS(count); -+ -+HTTP_EMPTY_ARGS(getAttachedRequests); -+HTTP_EMPTY_ARGS(getFinishedRequests); -+ -+HTTP_BEGIN_ARGS(enablePipelining, 0) -+ HTTP_ARG_VAL(enable, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(enableEvents, 0) -+ HTTP_ARG_VAL(enable, 0) -+HTTP_END_ARGS; -+ -+zend_class_entry *http_requestpool_object_ce; -+zend_function_entry http_requestpool_object_fe[] = { -+ HTTP_REQPOOL_ME(__construct, ZEND_ACC_PUBLIC|ZEND_ACC_CTOR) -+ HTTP_REQPOOL_ME(__destruct, ZEND_ACC_PUBLIC|ZEND_ACC_DTOR) -+ HTTP_REQPOOL_ME(attach, ZEND_ACC_PUBLIC) -+ HTTP_REQPOOL_ME(detach, ZEND_ACC_PUBLIC) -+ HTTP_REQPOOL_ME(send, ZEND_ACC_PUBLIC) -+ HTTP_REQPOOL_ME(reset, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQPOOL_ME(socketPerform, ZEND_ACC_PROTECTED) -+ HTTP_REQPOOL_ME(socketSelect, ZEND_ACC_PROTECTED) -+ -+ /* implements Iterator */ -+ HTTP_REQPOOL_ME(valid, ZEND_ACC_PUBLIC) -+ HTTP_REQPOOL_ME(current, ZEND_ACC_PUBLIC) -+ HTTP_REQPOOL_ME(key, ZEND_ACC_PUBLIC) -+ HTTP_REQPOOL_ME(next, ZEND_ACC_PUBLIC) -+ HTTP_REQPOOL_ME(rewind, ZEND_ACC_PUBLIC) -+ -+ /* implmenents Countable */ -+ HTTP_REQPOOL_ME(count, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQPOOL_ME(getAttachedRequests, ZEND_ACC_PUBLIC) -+ HTTP_REQPOOL_ME(getFinishedRequests, ZEND_ACC_PUBLIC) -+ -+ HTTP_REQPOOL_ME(enablePipelining, ZEND_ACC_PUBLIC) -+ HTTP_REQPOOL_ME(enableEvents, ZEND_ACC_PUBLIC) -+ -+ EMPTY_FUNCTION_ENTRY -+}; -+static zend_object_handlers http_requestpool_object_handlers; -+ -+PHP_MINIT_FUNCTION(http_requestpool_object) -+{ -+ HTTP_REGISTER_CLASS_EX(HttpRequestPool, http_requestpool_object, NULL, 0); -+ http_requestpool_object_handlers.clone_obj = NULL; -+ -+#if defined(HAVE_SPL) && !defined(WONKY) -+ zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 2, spl_ce_Countable, zend_ce_iterator); -+#else -+ zend_class_implements(http_requestpool_object_ce TSRMLS_CC, 1, zend_ce_iterator); -+#endif -+ -+ return SUCCESS; -+} -+ -+zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC) -+{ -+ zend_object_value ov; -+ http_requestpool_object *o; -+ -+ o = ecalloc(1, sizeof(http_requestpool_object)); -+ o->zo.ce = ce; -+ -+ http_request_pool_init(&o->pool); -+ -+ ALLOC_HASHTABLE(OBJ_PROP(o)); -+ zend_hash_init(OBJ_PROP(o), zend_hash_num_elements(&ce->default_properties), NULL, ZVAL_PTR_DTOR, 0); -+ zend_hash_copy(OBJ_PROP(o), &ce->default_properties, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)); -+ -+ ov.handle = putObject(http_requestpool_object, o); -+ ov.handlers = &http_requestpool_object_handlers; -+ -+ return ov; -+} -+ -+void _http_requestpool_object_free(zend_object *object TSRMLS_DC) -+{ -+ http_requestpool_object *o = (http_requestpool_object *) object; -+ -+ http_request_pool_dtor(&o->pool); -+ freeObject(o); -+} -+ -+#define http_requestpool_object_llist2array _http_requestpool_object_llist2array -+static void _http_requestpool_object_llist2array(zval **req, zval *array TSRMLS_DC) -+{ -+ ZVAL_ADDREF(*req); -+ add_next_index_zval(array, *req); -+} -+ -+/* ### USERLAND ### */ -+ -+/* {{{ proto void HttpRequestPool::__construct([HttpRequest request[, ...]]) -+ Creates a new HttpRequestPool object instance. */ -+PHP_METHOD(HttpRequestPool, __construct) -+{ -+ int argc = ZEND_NUM_ARGS(); -+ zval ***argv = safe_emalloc(argc, sizeof(zval *), 0); -+ getObject(http_requestpool_object, obj); -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_get_parameters_array_ex(argc, argv)) { -+ int i; -+ -+ for (i = 0; i < argc; ++i) { -+ if (Z_TYPE_PP(argv[i]) == IS_OBJECT && instanceof_function(Z_OBJCE_PP(argv[i]), http_request_object_ce TSRMLS_CC)) { -+ http_request_pool_attach(&obj->pool, *(argv[i])); -+ } -+ } -+ } -+ efree(argv); -+ http_final(HTTP_EX_CE(request_pool)); -+ SET_EH_NORMAL(); -+} -+/* }}} */ -+ -+/* {{{ proto void HttpRequestPool::__destruct() -+ Clean up HttpRequestPool object. */ -+PHP_METHOD(HttpRequestPool, __destruct) -+{ -+ getObject(http_requestpool_object, obj); -+ -+ NO_ARGS; -+ -+ http_request_pool_detach_all(&obj->pool); -+} -+/* }}} */ -+ -+/* {{{ proto void HttpRequestPool::reset() -+ Detach all attached HttpRequest objects. */ -+PHP_METHOD(HttpRequestPool, reset) -+{ -+ getObject(http_requestpool_object, obj); -+ -+ NO_ARGS; -+ -+ obj->iterator.pos = 0; -+ http_request_pool_detach_all(&obj->pool); -+} -+ -+/* {{{ proto bool HttpRequestPool::attach(HttpRequest request) -+ Attach an HttpRequest object to this HttpRequestPool. WARNING: set all options prior attaching! */ -+PHP_METHOD(HttpRequestPool, attach) -+{ -+ zval *request; -+ STATUS status = FAILURE; -+ getObject(http_requestpool_object, obj); -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, http_request_object_ce)) { -+ if (obj->iterator.pos > 0 && obj->iterator.pos < zend_llist_count(&obj->pool.handles)) { -+ http_error(HE_THROW, HTTP_E_REQUEST_POOL, "Cannot attach to the HttpRequestPool while the iterator is active"); -+ } else { -+ status = http_request_pool_attach(&obj->pool, request); -+ } -+ } -+ SET_EH_NORMAL(); -+ RETURN_SUCCESS(status); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequestPool::detach(HttpRequest request) -+ Detach an HttpRequest object from this HttpRequestPool. */ -+PHP_METHOD(HttpRequestPool, detach) -+{ -+ zval *request; -+ STATUS status = FAILURE; -+ getObject(http_requestpool_object, obj); -+ -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "O", &request, http_request_object_ce)) { -+ obj->iterator.pos = -1; -+ status = http_request_pool_detach(&obj->pool, request); -+ } -+ SET_EH_NORMAL(); -+ RETURN_SUCCESS(status); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequestPool::send() -+ Send all attached HttpRequest objects in parallel. */ -+PHP_METHOD(HttpRequestPool, send) -+{ -+ STATUS status; -+ getObject(http_requestpool_object, obj); -+ -+ NO_ARGS; -+ -+ SET_EH_THROW_HTTP(); -+ status = http_request_pool_send(&obj->pool); -+ SET_EH_NORMAL(); -+ -+ /* rethrow as HttpRequestPoolException */ -+ http_final(HTTP_EX_CE(request_pool)); -+ -+ RETURN_SUCCESS(status); -+} -+/* }}} */ -+ -+/* {{{ proto protected bool HttpRequestPool::socketPerform() -+ Returns TRUE until each request has finished its transaction. */ -+PHP_METHOD(HttpRequestPool, socketPerform) -+{ -+ getObject(http_requestpool_object, obj); -+ -+ NO_ARGS; -+ -+ if (0 < http_request_pool_perform(&obj->pool)) { -+ RETURN_TRUE; -+ } else { -+ RETURN_FALSE; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto protected bool HttpRequestPool::socketSelect([double timeout]) */ -+PHP_METHOD(HttpRequestPool, socketSelect) -+{ -+ double timeout = 0; -+ struct timeval custom_timeout, *custom_timeout_ptr = NULL; -+ getObject(http_requestpool_object, obj); -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|d", &timeout)) { -+ RETURN_FALSE; -+ } -+ if (ZEND_NUM_ARGS() && timeout > 0) { -+ custom_timeout.tv_sec = (time_t) timeout; -+ custom_timeout.tv_usec = HTTP_USEC(timeout) % HTTP_MCROSEC; -+ custom_timeout_ptr = &custom_timeout; -+ } -+ -+ RETURN_SUCCESS(http_request_pool_select_ex(&obj->pool, custom_timeout_ptr)); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequestPool::valid() -+ Implements Iterator::valid(). */ -+PHP_METHOD(HttpRequestPool, valid) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_requestpool_object, obj); -+ RETURN_BOOL(obj->iterator.pos >= 0 && obj->iterator.pos < zend_llist_count(&obj->pool.handles)); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto HttpRequest HttpRequestPool::current() -+ Implements Iterator::current(). */ -+PHP_METHOD(HttpRequestPool, current) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ long pos = 0; -+ zval **current = NULL; -+ zend_llist_position lpos; -+ getObject(http_requestpool_object, obj); -+ -+ if (obj->iterator.pos < zend_llist_count(&obj->pool.handles)) { -+ for ( current = zend_llist_get_first_ex(&obj->pool.handles, &lpos); -+ current && obj->iterator.pos != pos++; -+ current = zend_llist_get_next_ex(&obj->pool.handles, &lpos)); -+ if (current) { -+ RETURN_OBJECT(*current, 1); -+ } -+ } -+ RETURN_NULL(); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto int HttpRequestPool::key() -+ Implements Iterator::key(). */ -+PHP_METHOD(HttpRequestPool, key) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ getObject(http_requestpool_object, obj); -+ RETURN_LONG(obj->iterator.pos); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpRequestPool::next() -+ Implements Iterator::next(). */ -+PHP_METHOD(HttpRequestPool, next) -+{ -+ NO_ARGS { -+ getObject(http_requestpool_object, obj); -+ ++(obj->iterator.pos); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto void HttpRequestPool::rewind() -+ Implements Iterator::rewind(). */ -+PHP_METHOD(HttpRequestPool, rewind) -+{ -+ NO_ARGS { -+ getObject(http_requestpool_object, obj); -+ obj->iterator.pos = 0; -+ } -+} -+/* }}} */ -+ -+/* {{{ proto int HttpRequestPool::count() -+ Implements Countable::count(). */ -+PHP_METHOD(HttpRequestPool, count) -+{ -+ NO_ARGS { -+ getObject(http_requestpool_object, obj); -+ RETURN_LONG((long) zend_llist_count(&obj->pool.handles)); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto array HttpRequestPool::getAttachedRequests() -+ Get attached HttpRequest objects. */ -+PHP_METHOD(HttpRequestPool, getAttachedRequests) -+{ -+ getObject(http_requestpool_object, obj); -+ -+ NO_ARGS; -+ -+ array_init(return_value); -+ zend_llist_apply_with_argument(&obj->pool.handles, -+ (llist_apply_with_arg_func_t) http_requestpool_object_llist2array, -+ return_value TSRMLS_CC); -+} -+/* }}} */ -+ -+/* {{{ proto array HttpRequestPool::getFinishedRequests() -+ Get attached HttpRequest objects that already have finished their work. */ -+PHP_METHOD(HttpRequestPool, getFinishedRequests) -+{ -+ getObject(http_requestpool_object, obj); -+ -+ NO_ARGS; -+ -+ array_init(return_value); -+ zend_llist_apply_with_argument(&obj->pool.finished, -+ (llist_apply_with_arg_func_t) http_requestpool_object_llist2array, -+ return_value TSRMLS_CC); -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequestPool::enablePipelining([bool enable = true]) -+ Enables pipelining support for all attached requests if support in libcurl is given. */ -+PHP_METHOD(HttpRequestPool, enablePipelining) -+{ -+ zend_bool enable = 1; -+#if defined(HAVE_CURL_MULTI_SETOPT) && HTTP_CURL_VERSION(7,16,0) -+ getObject(http_requestpool_object, obj); -+#endif -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable)) { -+ RETURN_FALSE; -+ } -+#if defined(HAVE_CURL_MULTI_SETOPT) && HTTP_CURL_VERSION(7,16,0) -+ if (CURLM_OK == curl_multi_setopt(obj->pool.ch, CURLMOPT_PIPELINING, (long) enable)) { -+ RETURN_TRUE; -+ } -+#endif -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+/* {{{ proto bool HttpRequestPool::enableEvents([bool enable = true]) -+ Enables event-driven I/O if support in libcurl is given. */ -+PHP_METHOD(HttpRequestPool, enableEvents) -+{ -+ zend_bool enable = 1; -+#if defined(HTTP_HAVE_EVENT) -+ getObject(http_requestpool_object, obj); -+#endif -+ -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &enable)) { -+#if defined(HTTP_HAVE_EVENT) -+ obj->pool.useevents = enable; -+ RETURN_TRUE; -+#endif -+ } -+ RETURN_FALSE; -+} -+/* }}} */ -+ -+#endif /* ZEND_ENGINE_2 && HTTP_HAVE_CURL */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_response_object.c -@@ -0,0 +1,915 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_response_object.c 298891 2010-05-03 08:26:38Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#define HTTP_WANT_MAGIC -+#include "php_http.h" -+ -+/* broken static properties in PHP 5.0 */ -+#if defined(ZEND_ENGINE_2) && !defined(WONKY) -+ -+#include "php_ini.h" -+ -+#include "php_http_api.h" -+#include "php_http_cache_api.h" -+#include "php_http_exception_object.h" -+#include "php_http_headers_api.h" -+#include "php_http_response_object.h" -+#include "php_http_send_api.h" -+ -+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpResponse, method, 0, req_args) -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpResponse, method, 0) -+#define HTTP_RESPONSE_ME(method, visibility) PHP_ME(HttpResponse, method, HTTP_ARGS(HttpResponse, method), visibility|ZEND_ACC_STATIC) -+#define HTTP_RESPONSE_ALIAS(method, func) HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpResponse, method)) -+ -+HTTP_BEGIN_ARGS(setHeader, 1) -+ HTTP_ARG_VAL(name, 0) -+ HTTP_ARG_VAL(value, 0) -+ HTTP_ARG_VAL(replace, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(getHeader, 0) -+ HTTP_ARG_VAL(name, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getETag); -+HTTP_BEGIN_ARGS(setETag, 1) -+ HTTP_ARG_VAL(etag, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getLastModified); -+HTTP_BEGIN_ARGS(setLastModified, 1) -+ HTTP_ARG_VAL(timestamp, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getCache); -+HTTP_BEGIN_ARGS(setCache, 1) -+ HTTP_ARG_VAL(cache, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getGzip); -+HTTP_BEGIN_ARGS(setGzip, 1) -+ HTTP_ARG_VAL(gzip, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getCacheControl); -+HTTP_BEGIN_ARGS(setCacheControl, 1) -+ HTTP_ARG_VAL(cache_control, 0) -+ HTTP_ARG_VAL(max_age, 0) -+ HTTP_ARG_VAL(must_revalidate, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getContentType); -+HTTP_BEGIN_ARGS(setContentType, 1) -+ HTTP_ARG_VAL(content_type, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(guessContentType, 1) -+ HTTP_ARG_VAL(magic_file, 0) -+ HTTP_ARG_VAL(magic_mode, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getContentDisposition); -+HTTP_BEGIN_ARGS(setContentDisposition, 1) -+ HTTP_ARG_VAL(filename, 0) -+ HTTP_ARG_VAL(send_inline, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getThrottleDelay); -+HTTP_BEGIN_ARGS(setThrottleDelay, 1) -+ HTTP_ARG_VAL(seconds, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getBufferSize); -+HTTP_BEGIN_ARGS(setBufferSize, 1) -+ HTTP_ARG_VAL(bytes, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getData); -+HTTP_BEGIN_ARGS(setData, 1) -+ HTTP_ARG_VAL(data, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getStream); -+HTTP_BEGIN_ARGS(setStream, 1) -+ HTTP_ARG_VAL(stream, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getFile); -+HTTP_BEGIN_ARGS(setFile, 1) -+ HTTP_ARG_VAL(filepath, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(send, 0) -+ HTTP_ARG_VAL(clean_ob, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(capture); -+ -+HTTP_BEGIN_ARGS(redirect, 0) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(params, 0) -+ HTTP_ARG_VAL(session, 0) -+ HTTP_ARG_VAL(permanent, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(status, 1) -+ HTTP_ARG_VAL(code, 0) -+HTTP_END_ARGS; -+ -+HTTP_EMPTY_ARGS(getRequestHeaders); -+HTTP_EMPTY_ARGS(getRequestBody); -+HTTP_EMPTY_ARGS(getRequestBodyStream); -+ -+#define THIS_CE http_response_object_ce -+zend_class_entry *http_response_object_ce; -+zend_function_entry http_response_object_fe[] = { -+ -+ HTTP_RESPONSE_ME(setHeader, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getHeader, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setETag, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getETag, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setLastModified, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getLastModified, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setContentDisposition, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getContentDisposition, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setContentType, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getContentType, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(guessContentType, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setCache, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getCache, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setCacheControl, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getCacheControl, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setGzip, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getGzip, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setThrottleDelay, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getThrottleDelay, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setBufferSize, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getBufferSize, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setData, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getData, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setFile, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getFile, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(setStream, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(getStream, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ME(send, ZEND_ACC_PUBLIC) -+ HTTP_RESPONSE_ME(capture, ZEND_ACC_PUBLIC) -+ -+ HTTP_RESPONSE_ALIAS(redirect, http_redirect) -+ HTTP_RESPONSE_ALIAS(status, http_send_status) -+ HTTP_RESPONSE_ALIAS(getRequestHeaders, http_get_request_headers) -+ HTTP_RESPONSE_ALIAS(getRequestBody, http_get_request_body) -+ HTTP_RESPONSE_ALIAS(getRequestBodyStream, http_get_request_body_stream) -+ -+ EMPTY_FUNCTION_ENTRY -+}; -+ -+PHP_MINIT_FUNCTION(http_response_object) -+{ -+ HTTP_REGISTER_CLASS(HttpResponse, http_response_object, NULL, 0); -+ -+ zend_declare_property_bool(THIS_CE, ZEND_STRS("sent")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); -+ zend_declare_property_bool(THIS_CE, ZEND_STRS("catch")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); -+ zend_declare_property_long(THIS_CE, ZEND_STRS("mode")-1, -1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); -+ zend_declare_property_long(THIS_CE, ZEND_STRS("stream")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("file")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("data")-1, (ZEND_ACC_STATIC|ZEND_ACC_PRIVATE) TSRMLS_CC); -+ zend_declare_property_bool(THIS_CE, ZEND_STRS("cache")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); -+ zend_declare_property_bool(THIS_CE, ZEND_STRS("gzip")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("eTag")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); -+ zend_declare_property_long(THIS_CE, ZEND_STRS("lastModified")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("cacheControl")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("contentType")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); -+ zend_declare_property_null(THIS_CE, ZEND_STRS("contentDisposition")-1, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); -+ zend_declare_property_long(THIS_CE, ZEND_STRS("bufferSize")-1, 0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); -+ zend_declare_property_double(THIS_CE, ZEND_STRS("throttleDelay")-1, 0.0, (ZEND_ACC_STATIC|ZEND_ACC_PROTECTED) TSRMLS_CC); -+ -+#ifndef WONKY -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT")-1, HTTP_REDIRECT TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_PERM")-1, HTTP_REDIRECT_PERM TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_FOUND")-1, HTTP_REDIRECT_FOUND TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_POST")-1, HTTP_REDIRECT_POST TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_PROXY")-1, HTTP_REDIRECT_PROXY TSRMLS_CC); -+ zend_declare_class_constant_long(THIS_CE, ZEND_STRS("REDIRECT_TEMP")-1, HTTP_REDIRECT_TEMP TSRMLS_CC); -+#endif /* WONKY */ -+ -+ return SUCCESS; -+} -+ -+/* ### USERLAND ### */ -+ -+/* {{{ proto static bool HttpResponse::setHeader(string name[, mixed value[, bool replace = true]]) -+ Send an HTTP header. */ -+PHP_METHOD(HttpResponse, setHeader) -+{ -+ zend_bool replace = 1; -+ char *name; -+ int name_len = 0; -+ zval *value = NULL; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|z/!b", &name, &name_len, &value, &replace)) { -+ RETURN_FALSE; -+ } -+ if (SG(headers_sent)) { -+ http_error(HE_WARNING, HTTP_E_HEADER, "Cannot add another header when headers have already been sent"); -+ RETURN_FALSE; -+ } -+ if (!name_len) { -+ http_error(HE_WARNING, HTTP_E_HEADER, "Cannot send anonymous headers"); -+ RETURN_FALSE; -+ } -+ http_send_header_zval_ex(name, name_len, &value, replace); -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto static mixed HttpResponse::getHeader([string name]) -+ Get header(s) about to be sent. */ -+PHP_METHOD(HttpResponse, getHeader) -+{ -+ char *name = NULL; -+ int name_len = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|s", &name, &name_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (name && name_len) { -+ zval **header; -+ HashTable headers_ht; -+ -+ zend_hash_init(&headers_ht, sizeof(zval *), NULL, ZVAL_PTR_DTOR, 0); -+ if ( (SUCCESS == http_get_response_headers(&headers_ht)) && -+ (SUCCESS == zend_hash_find(&headers_ht, name, name_len + 1, (void *) &header))) { -+ RETVAL_ZVAL(*header, 1, 0); -+ } else { -+ RETVAL_NULL(); -+ } -+ zend_hash_destroy(&headers_ht); -+ } else { -+ array_init(return_value); -+ http_get_response_headers(Z_ARRVAL_P(return_value)); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setCache(bool cache) -+ Whether it should be attempted to cache the entity. */ -+PHP_METHOD(HttpResponse, setCache) -+{ -+ zend_bool do_cache = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &do_cache)) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(zend_update_static_property_bool(THIS_CE, ZEND_STRS("cache")-1, do_cache TSRMLS_CC)); -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::getCache() -+ Get current caching setting. */ -+PHP_METHOD(HttpResponse, getCache) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *cache = http_zsep(IS_BOOL, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("cache")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(cache, 1, 1); -+ } -+} -+/* }}}*/ -+ -+/* {{{ proto static bool HttpResponse::setGzip(bool gzip) -+ Enable on-thy-fly gzipping of the sent entity. */ -+PHP_METHOD(HttpResponse, setGzip) -+{ -+ zend_bool do_gzip = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "b", &do_gzip)) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(zend_update_static_property_bool(THIS_CE, ZEND_STRS("gzip")-1, do_gzip TSRMLS_CC)); -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::getGzip() -+ Get current gzipping setting. */ -+PHP_METHOD(HttpResponse, getGzip) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *gzip = http_zsep(IS_BOOL, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("gzip")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(gzip, 1, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setCacheControl(string control[, int max_age = 0[, bool must_revalidate = true]]) -+ Set a custom cache-control header, usually being "private" or "public"; The max_age parameter controls how long the cache entry is valid on the client side. */ -+PHP_METHOD(HttpResponse, setCacheControl) -+{ -+ char *ccontrol, *cctl; -+ int cc_len; -+ long max_age = 0; -+ zend_bool must_revalidate = 1; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|lb", &ccontrol, &cc_len, &max_age, &must_revalidate)) { -+ RETURN_FALSE; -+ } -+ -+ if (strcmp(ccontrol, "public") && strcmp(ccontrol, "private") && strcmp(ccontrol, "no-cache")) { -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Cache-Control '%s' doesn't match public, private or no-cache", ccontrol); -+ RETURN_FALSE; -+ } else { -+ size_t cctl_len = spprintf(&cctl, 0, "%s,%s max-age=%ld", ccontrol, must_revalidate?" must-revalidate,":"", max_age); -+ RETVAL_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("cacheControl")-1, cctl, cctl_len TSRMLS_CC)); -+ efree(cctl); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static string HttpResponse::getCacheControl() -+ Get current Cache-Control header setting. */ -+PHP_METHOD(HttpResponse, getCacheControl) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *cctl = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("cacheControl")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(cctl, 1, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setContentType(string content_type) -+ Set the content-type of the sent entity. */ -+PHP_METHOD(HttpResponse, setContentType) -+{ -+ char *ctype; -+ int ctype_len; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &ctype, &ctype_len)) { -+ RETURN_FALSE; -+ } -+ -+ HTTP_CHECK_CONTENT_TYPE(ctype, RETURN_FALSE); -+ RETURN_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("contentType")-1, ctype, ctype_len TSRMLS_CC)); -+} -+/* }}} */ -+ -+/* {{{ proto static string HttpResponse::getContentType() -+ Get current Content-Type header setting. */ -+PHP_METHOD(HttpResponse, getContentType) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *ctype = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentType")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(ctype, 1, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static string HttpResponse::guessContentType(string magic_file[, int magic_mode = MAGIC_MIME]) -+ Attempts to guess the content type of supplied payload through libmagic. */ -+PHP_METHOD(HttpResponse, guessContentType) -+{ -+#ifdef HTTP_HAVE_MAGIC -+ char *magic_file, *ct = NULL; -+ int magic_file_len; -+ long magic_mode = MAGIC_MIME; -+ -+ RETVAL_FALSE; -+ SET_EH_THROW_HTTP(); -+ if (SUCCESS == zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &magic_file, &magic_file_len, &magic_mode)) { -+ switch (Z_LVAL_P(*zend_std_get_static_property(THIS_CE, ZEND_STRS("mode")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { -+ case SEND_DATA: -+ { -+ zval *data = *zend_std_get_static_property(THIS_CE, ZEND_STRS("data")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); -+ ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(data), Z_STRLEN_P(data), SEND_DATA); -+ break; -+ } -+ -+ case SEND_RSRC: -+ { -+ php_stream *s; -+ zval *z = *zend_std_get_static_property(THIS_CE, ZEND_STRS("stream")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); -+ z->type = IS_RESOURCE; -+ php_stream_from_zval(s, &z); -+ ct = http_guess_content_type(magic_file, magic_mode, s, 0, SEND_RSRC); -+ break; -+ } -+ -+ default: -+ ct = http_guess_content_type(magic_file, magic_mode, Z_STRVAL_P(*zend_std_get_static_property(THIS_CE, ZEND_STRS("file")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC)), 0, -1); -+ break; -+ } -+ if (ct) { -+ zend_update_static_property_string(THIS_CE, ZEND_STRS("contentType")-1, ct TSRMLS_CC); -+ RETVAL_STRING(ct, 0); -+ } -+ } -+ SET_EH_NORMAL(); -+#else -+ http_error(HE_THROW, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available"); -+ RETURN_FALSE; -+#endif -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setContentDisposition(string filename[, bool inline = false]) -+ Set the Content-Disposition. */ -+PHP_METHOD(HttpResponse, setContentDisposition) -+{ -+ char *file, *cd; -+ int file_len; -+ size_t cd_len; -+ zend_bool send_inline = 0; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b", &file, &file_len, &send_inline)) { -+ RETURN_FALSE; -+ } -+ -+ cd_len = spprintf(&cd, 0, "%s; filename=\"%s\"", send_inline ? "inline" : "attachment", file); -+ RETVAL_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("contentDisposition")-1, cd, cd_len TSRMLS_CC)); -+ efree(cd); -+} -+/* }}} */ -+ -+/* {{{ proto static string HttpResponse::getContentDisposition() -+ Get current Content-Disposition setting. */ -+PHP_METHOD(HttpResponse, getContentDisposition) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *cdisp = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentDisposition")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(cdisp, 1, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setETag(string etag) -+ Set a custom ETag. Use this only if you know what you're doing. */ -+PHP_METHOD(HttpResponse, setETag) -+{ -+ char *etag; -+ int etag_len; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &etag, &etag_len)) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(zend_update_static_property_stringl(THIS_CE, ZEND_STRS("eTag")-1, etag, etag_len TSRMLS_CC)); -+} -+/* }}} */ -+ -+/* {{{ proto static string HttpResponse::getETag() -+ Get calculated or previously set custom ETag. */ -+PHP_METHOD(HttpResponse, getETag) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *etag = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("eTag")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(etag, 1, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setLastModified(int timestamp) -+ Set a custom Last-Modified date. */ -+PHP_METHOD(HttpResponse, setLastModified) -+{ -+ long lm; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &lm)) { -+ RETURN_FALSE; -+ } -+ -+ RETURN_SUCCESS(zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, lm TSRMLS_CC)); -+} -+/* }}} */ -+ -+/* {{{ proto static int HttpResponse::getLastModified() -+ Get calculated or previously set custom Last-Modified date. */ -+PHP_METHOD(HttpResponse, getLastModified) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *lmod = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("lastModified")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(lmod, 1, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setThrottleDelay(double seconds) -+ Sets the throttle delay for use with HttpResponse::setBufferSize(). */ -+PHP_METHOD(HttpResponse, setThrottleDelay) -+{ -+ double seconds; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "d", &seconds)) { -+ RETURN_FALSE; -+ } -+ RETURN_SUCCESS(zend_update_static_property_double(THIS_CE, ZEND_STRS("throttleDelay")-1, seconds TSRMLS_CC)); -+} -+/* }}} */ -+ -+/* {{{ proto static double HttpResponse::getThrottleDelay() -+ Get the current throttle delay. */ -+PHP_METHOD(HttpResponse, getThrottleDelay) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *tdel = http_zsep(IS_DOUBLE, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("throttleDelay")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(tdel, 1, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setBufferSize(int bytes) -+ Sets the send buffer size for use with HttpResponse::setThrottleDelay(). */ -+PHP_METHOD(HttpResponse, setBufferSize) -+{ -+ long bytes; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &bytes)) { -+ RETURN_FALSE; -+ } -+ RETURN_SUCCESS(zend_update_static_property_long(THIS_CE, ZEND_STRS("bufferSize")-1, bytes TSRMLS_CC)); -+} -+/* }}} */ -+ -+/* {{{ proto static int HttpResponse::getBufferSize() -+ Get current buffer size. */ -+PHP_METHOD(HttpResponse, getBufferSize) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *bsize = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("bufferSize")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(bsize, 1, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setData(mixed data) -+ Set the data to be sent. */ -+PHP_METHOD(HttpResponse, setData) -+{ -+ char *etag; -+ zval *the_data; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "z/", &the_data)) { -+ RETURN_FALSE; -+ } -+ if (Z_TYPE_P(the_data) != IS_STRING) { -+ convert_to_string(the_data); -+ } -+ -+ if ( (SUCCESS != zend_update_static_property(THIS_CE, ZEND_STRS("data")-1, the_data TSRMLS_CC)) || -+ (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("mode")-1, SEND_DATA TSRMLS_CC))) { -+ RETURN_FALSE; -+ } -+ -+ zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, http_last_modified(the_data, SEND_DATA) TSRMLS_CC); -+ if ((etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA))) { -+ zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); -+ efree(etag); -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto static string HttpResponse::getData() -+ Get the previously set data to be sent. */ -+PHP_METHOD(HttpResponse, getData) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *the_data = *zend_std_get_static_property(THIS_CE, ZEND_STRS("data")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); -+ -+ RETURN_ZVAL(the_data, 1, 0); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setStream(resource stream) -+ Set the resource to be sent. */ -+PHP_METHOD(HttpResponse, setStream) -+{ -+ char *etag; -+ zval *the_stream; -+ php_stream *the_real_stream; -+ php_stream_statbuf ssb; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "r", &the_stream)) { -+ RETURN_FALSE; -+ } -+ -+ php_stream_from_zval(the_real_stream, &the_stream); -+ if (php_stream_stat(the_real_stream, &ssb)) { -+ RETURN_FALSE; -+ } -+ -+ if ( (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("stream")-1, Z_LVAL_P(the_stream) TSRMLS_CC)) || -+ (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("mode")-1, SEND_RSRC TSRMLS_CC))) { -+ RETURN_FALSE; -+ } -+ zend_list_addref(Z_LVAL_P(the_stream)); -+ -+ zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, http_last_modified(the_real_stream, SEND_RSRC) TSRMLS_CC); -+ if ((etag = http_etag(the_real_stream, 0, SEND_RSRC))) { -+ zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); -+ efree(etag); -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto static resource HttpResponse::getStream() -+ Get the previously set resource to be sent. */ -+PHP_METHOD(HttpResponse, getStream) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *stream = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("stream")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_RESOURCE(Z_LVAL_P(stream)); -+ zval_ptr_dtor(&stream); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::setFile(string file) -+ Set the file to be sent. */ -+PHP_METHOD(HttpResponse, setFile) -+{ -+ char *the_file, *etag; -+ int file_len; -+ php_stream_statbuf ssb; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &the_file, &file_len)) { -+ RETURN_FALSE; -+ } -+ -+ if (php_stream_stat_path(the_file, &ssb)) { -+ RETURN_FALSE; -+ } -+ -+ if ( (SUCCESS != zend_update_static_property_stringl(THIS_CE, ZEND_STRS("file")-1, the_file, file_len TSRMLS_CC)) || -+ (SUCCESS != zend_update_static_property_long(THIS_CE, ZEND_STRS("mode")-1, -1 TSRMLS_CC))) { -+ RETURN_FALSE; -+ } -+ -+ zend_update_static_property_long(THIS_CE, ZEND_STRS("lastModified")-1, http_last_modified(the_file, -1) TSRMLS_CC); -+ if ((etag = http_etag(the_file, 0, -1))) { -+ zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); -+ efree(etag); -+ } -+ -+ RETURN_TRUE; -+} -+/* }}} */ -+ -+/* {{{ proto static string HttpResponse::getFile() -+ Get the previously set file to be sent. */ -+PHP_METHOD(HttpResponse, getFile) -+{ -+ NO_ARGS; -+ -+ if (return_value_used) { -+ zval *file = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("file")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_ZVAL(file, 1, 1); -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static bool HttpResponse::send([bool clean_ob = true]) -+ Finally send the entity. */ -+PHP_METHOD(HttpResponse, send) -+{ -+ zval *sent; -+ zend_bool clean_ob = 1; -+ -+ if (SUCCESS != zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "|b", &clean_ob)) { -+ RETURN_FALSE; -+ } -+ -+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); -+ -+ sent = *zend_std_get_static_property(THIS_CE, ZEND_STRS("sent")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC); -+ if (Z_LVAL_P(sent)) { -+ http_error(HE_WARNING, HTTP_E_RESPONSE, "Cannot send HttpResponse, response has already been sent"); -+ RETURN_FALSE; -+ } else { -+ Z_LVAL_P(sent) = 1; -+ } -+ -+ /* capture mode */ -+ if (i_zend_is_true(*zend_std_get_static_property(THIS_CE, ZEND_STRS("catch")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { -+ zval *zetag, *the_data; -+ -+ MAKE_STD_ZVAL(the_data); -+ php_ob_get_buffer(the_data TSRMLS_CC); -+ zend_update_static_property(THIS_CE, ZEND_STRS("data")-1, the_data TSRMLS_CC); -+ ZVAL_LONG(*zend_std_get_static_property(THIS_CE, ZEND_STRS("mode")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC), SEND_DATA); -+ -+ zetag = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("eTag")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ if (!Z_STRLEN_P(zetag)) { -+ char *etag = http_etag(Z_STRVAL_P(the_data), Z_STRLEN_P(the_data), SEND_DATA); -+ if (etag) { -+ zend_update_static_property_string(THIS_CE, ZEND_STRS("eTag")-1, etag TSRMLS_CC); -+ efree(etag); -+ } -+ } -+ zval_ptr_dtor(&the_data); -+ zval_ptr_dtor(&zetag); -+ -+ clean_ob = 1; -+ } -+ -+ if (clean_ob) { -+ /* interrupt on-the-fly etag generation */ -+ HTTP_G->etag.started = 0; -+ /* discard previous output buffers */ -+ php_end_ob_buffers(0 TSRMLS_CC); -+ } -+ -+ /* caching */ -+ if (i_zend_is_true(*zend_std_get_static_property(THIS_CE, ZEND_STRS("cache")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { -+ zval *cctl, *etag, *lmod; -+ -+ lmod = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("lastModified")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ etag = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("eTag")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ cctl = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("cacheControl")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ -+ if (Z_LVAL_P(lmod) || Z_STRLEN_P(etag)) { -+ if (Z_STRLEN_P(cctl)) { -+ http_send_cache_control(Z_STRVAL_P(cctl), Z_STRLEN_P(cctl)); -+ } else { -+ http_send_cache_control(HTTP_DEFAULT_CACHECONTROL, lenof(HTTP_DEFAULT_CACHECONTROL)); -+ } -+ if (Z_STRLEN_P(etag)) { -+ http_send_etag(Z_STRVAL_P(etag), Z_STRLEN_P(etag)); -+ } -+ if (Z_LVAL_P(lmod)) { -+ http_send_last_modified(Z_LVAL_P(lmod)); -+ } -+ } -+ -+ zval_ptr_dtor(&etag); -+ zval_ptr_dtor(&lmod); -+ zval_ptr_dtor(&cctl); -+ } -+ -+ /* content type */ -+ { -+ zval *ctype = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentType")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ if (Z_STRLEN_P(ctype)) { -+ http_send_content_type(Z_STRVAL_P(ctype), Z_STRLEN_P(ctype)); -+ } else { -+ char *ctypes = INI_STR("default_mimetype"); -+ size_t ctlen = ctypes ? strlen(ctypes) : 0; -+ -+ if (ctlen) { -+ http_send_content_type(ctypes, ctlen); -+ } else { -+ http_send_content_type("application/x-octetstream", lenof("application/x-octetstream")); -+ } -+ } -+ zval_ptr_dtor(&ctype); -+ } -+ -+ /* content disposition */ -+ { -+ zval *cd = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("contentDisposition")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ if (Z_STRLEN_P(cd)) { -+ http_send_header_ex("Content-Disposition", lenof("Content-Disposition"), Z_STRVAL_P(cd), Z_STRLEN_P(cd), 1, NULL); -+ } -+ zval_ptr_dtor(&cd); -+ } -+ -+ /* throttling */ -+ { -+ zval *bsize = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("bufferSize")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ zval *delay = http_zsep(IS_DOUBLE, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("throttleDelay")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ HTTP_G->send.buffer_size = Z_LVAL_P(bsize); -+ HTTP_G->send.throttle_delay = Z_DVAL_P(delay); -+ zval_ptr_dtor(&bsize); -+ zval_ptr_dtor(&delay); -+ } -+ -+ /* gzip */ -+ HTTP_G->send.deflate.response = i_zend_is_true(*zend_std_get_static_property(THIS_CE, ZEND_STRS("gzip")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC)); -+ -+ /* send */ -+ switch (Z_LVAL_P(*zend_std_get_static_property(THIS_CE, ZEND_STRS("mode")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))) { -+ case SEND_DATA: -+ { -+ zval *zdata = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("data")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_SUCCESS(http_send_data(Z_STRVAL_P(zdata), Z_STRLEN_P(zdata))); -+ zval_ptr_dtor(&zdata); -+ return; -+ } -+ -+ case SEND_RSRC: -+ { -+ php_stream *the_real_stream; -+ zval *the_stream = http_zsep(IS_LONG, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("stream")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ the_stream->type = IS_RESOURCE; -+ php_stream_from_zval(the_real_stream, &the_stream); -+ RETVAL_SUCCESS(http_send_stream(the_real_stream)); -+ zval_ptr_dtor(&the_stream); -+ return; -+ } -+ -+ default: -+ { -+ zval *file = http_zsep(IS_STRING, *(zend_std_get_static_property(THIS_CE, ZEND_STRS("file")-1, 0 ZEND_LITERAL_NIL_CC TSRMLS_CC))); -+ RETVAL_SUCCESS(http_send_file(Z_STRVAL_P(file))); -+ zval_ptr_dtor(&file); -+ return; -+ } -+ } -+} -+/* }}} */ -+ -+/* {{{ proto static void HttpResponse::capture() -+ Capture script output. -+ */ -+PHP_METHOD(HttpResponse, capture) -+{ -+ NO_ARGS; -+ -+ HTTP_CHECK_HEADERS_SENT(RETURN_FALSE); -+ -+ zend_update_static_property_long(THIS_CE, ZEND_STRS("catch")-1, 1 TSRMLS_CC); -+ -+ php_end_ob_buffers(0 TSRMLS_CC); -+ php_start_ob_buffer(NULL, 0, 0 TSRMLS_CC); -+ -+ /* register shutdown function */ -+ { -+ zval func, retval, arg, *argp[1]; -+ -+ INIT_PZVAL(&arg); -+ INIT_PZVAL(&func); -+ INIT_PZVAL(&retval); -+ ZVAL_STRINGL(&func, "register_shutdown_function", lenof("register_shutdown_function"), 0); -+ -+ array_init(&arg); -+ add_next_index_stringl(&arg, "HttpResponse", lenof("HttpResponse"), 1); -+ add_next_index_stringl(&arg, "send", lenof("send"), 1); -+ argp[0] = &arg; -+ call_user_function(EG(function_table), NULL, &func, &retval, 1, argp TSRMLS_CC); -+ zval_dtor(&arg); -+ } -+} -+/* }}} */ -+ -+#endif /* ZEND_ENGINE_2 && !WONKY */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_send_api.c -@@ -0,0 +1,607 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_send_api.c 300299 2010-06-09 06:23:16Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#define HTTP_WANT_ZLIB -+#define HTTP_WANT_MAGIC -+#include "php_http.h" -+ -+#include "php_streams.h" -+ -+#include "php_http_api.h" -+#include "php_http_cache_api.h" -+#include "php_http_date_api.h" -+#include "php_http_encoding_api.h" -+#include "php_http_headers_api.h" -+#include "php_http_send_api.h" -+ -+/* {{{ http_flush() */ -+#define http_flush(d, l) _http_flush(NULL, (d), (l) TSRMLS_CC) -+static inline void _http_flush(void *nothing, const char *data, size_t data_len TSRMLS_DC) -+{ -+ PHPWRITE(data, data_len); -+ /* we really only need to flush when throttling is enabled, -+ because we push the data as fast as possible anyway if not */ -+ if (HTTP_G->send.throttle_delay >= HTTP_DIFFSEC) { -+ if (OG(ob_nesting_level)) { -+ php_end_ob_buffer(1, 1 TSRMLS_CC); -+ } -+ if (!OG(implicit_flush)) { -+ sapi_flush(TSRMLS_C); -+ } -+ http_sleep(HTTP_G->send.throttle_delay); -+ } -+} -+/* }}} */ -+ -+/* {{{ http_send_response_start */ -+#define http_send_response_start(b, cl) _http_send_response_start((b), (cl) TSRMLS_CC) -+static inline void _http_send_response_start(void **buffer, size_t content_length TSRMLS_DC) -+{ -+ int encoding; -+ -+ if ((encoding = http_encoding_response_start(content_length, 0))) { -+#ifdef HTTP_HAVE_ZLIB -+ *((http_encoding_stream **) buffer) = http_encoding_deflate_stream_init(NULL, -+ (encoding == HTTP_ENCODING_GZIP) ? -+ HTTP_DEFLATE_TYPE_GZIP : HTTP_DEFLATE_TYPE_ZLIB); -+#endif -+ } -+ /* flush headers */ -+ sapi_flush(TSRMLS_C); -+} -+/* }}} */ -+ -+/* {{{ http_send_response_data_plain */ -+#define http_send_response_data_plain(b, d, dl) _http_send_response_data_plain((b), (d), (dl) TSRMLS_CC) -+static inline void _http_send_response_data_plain(void **buffer, const char *data, size_t data_len TSRMLS_DC) -+{ -+ if (HTTP_G->send.deflate.response && HTTP_G->send.deflate.encoding) { -+#ifdef HTTP_HAVE_ZLIB -+ char *encoded; -+ size_t encoded_len; -+ http_encoding_stream *s = *((http_encoding_stream **) buffer); -+ -+ http_encoding_deflate_stream_update(s, data, data_len, &encoded, &encoded_len); -+ if (HTTP_G->send.buffer_size) { -+ phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC); -+ } else { -+ http_flush(encoded, encoded_len); -+ } -+ efree(encoded); -+#else -+ http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug"); -+#endif -+ } else if (HTTP_G->send.buffer_size) { -+ phpstr_chunked_output((phpstr **) buffer, data, data_len, HTTP_G->send.buffer_size, _http_flush, NULL TSRMLS_CC); -+ } else { -+ http_flush(data, data_len); -+ } -+} -+/* }}} */ -+ -+/* {{{ http_send_response_data_fetch */ -+#define http_send_response_data_fetch(b, d, l, m, s, e) _http_send_response_data_fetch((b), (d), (l), (m), (s), (e) TSRMLS_CC) -+static inline void _http_send_response_data_fetch(void **buffer, const void *data, size_t data_len, http_send_mode mode, size_t begin, size_t end TSRMLS_DC) -+{ -+ long bsz, got, len = end - begin; -+ -+ if (!(bsz = HTTP_G->send.buffer_size)) { -+ bsz = HTTP_SENDBUF_SIZE; -+ } -+ -+ switch (mode) { -+ case SEND_RSRC: { -+ php_stream *s = (php_stream *) data; -+ if (SUCCESS == php_stream_seek(s, begin, SEEK_SET)) { -+ char *buf = emalloc(bsz); -+ -+ while (len > 0) { -+ got = php_stream_read(s, buf, MIN(len, bsz)); -+ http_send_response_data_plain(buffer, buf, got); -+ len -= got; -+ } -+ -+ efree(buf); -+ } -+ break; -+ } -+ case SEND_DATA: { -+ const char *buf = ((const char *) data) + begin; -+ while (len > 0) { -+ got = MIN(len, bsz); -+ http_send_response_data_plain(buffer, buf, got); -+ len -= got; -+ buf += got; -+ } -+ break; -+ } -+ EMPTY_SWITCH_DEFAULT_CASE(); -+ } -+} -+/* }}} */ -+ -+/* {{{ http_send_response_finish */ -+#define http_send_response_finish(b) _http_send_response_finish((b) TSRMLS_CC) -+static inline void _http_send_response_finish(void **buffer TSRMLS_DC) -+{ -+ if (HTTP_G->send.deflate.response && HTTP_G->send.deflate.encoding) { -+#ifdef HTTP_HAVE_ZLIB -+ char *encoded = NULL; -+ size_t encoded_len = 0; -+ http_encoding_stream *s = *((http_encoding_stream **) buffer); -+ -+ http_encoding_deflate_stream_finish(s, &encoded, &encoded_len); -+ if (HTTP_G->send.buffer_size) { -+ phpstr_chunked_output((phpstr **) &s->storage, encoded, encoded_len, 0, _http_flush, NULL TSRMLS_CC); -+ } else { -+ http_flush(encoded, encoded_len); -+ } -+ http_encoding_deflate_stream_free(&s); -+ STR_FREE(encoded); -+#else -+ http_error(HE_ERROR, HTTP_E_RESPONSE, "Attempt to send GZIP response despite being able to do so; please report this bug"); -+#endif -+ } else if (HTTP_G->send.buffer_size) { -+ phpstr_chunked_output((phpstr **) buffer, NULL, 0, 0, _http_flush, NULL TSRMLS_CC); -+ } -+} -+/* }}} */ -+ -+/* {{{ */ -+PHP_MINIT_FUNCTION(http_send) -+{ -+ HTTP_LONG_CONSTANT("HTTP_REDIRECT", HTTP_REDIRECT); -+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_PERM", HTTP_REDIRECT_PERM); -+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_FOUND", HTTP_REDIRECT_FOUND); -+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_POST", HTTP_REDIRECT_POST); -+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_PROXY", HTTP_REDIRECT_PROXY); -+ HTTP_LONG_CONSTANT("HTTP_REDIRECT_TEMP", HTTP_REDIRECT_TEMP); -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ http_find_header */ -+typedef struct { -+ const char *h; -+ size_t l; -+} http_response_header_t; -+ -+static int http_find_header(void *data, void *arg) -+{ -+ http_response_header_t *h = arg; -+ sapi_header_struct *s = data; -+ -+ return (!strncasecmp(s->header, h->h, h->l)) && s->header[h->l] == ':'; -+} -+/* }}} */ -+ -+/* {{{ void http_hide_header(char *) */ -+PHP_HTTP_API void _http_hide_header_ex(const char *name, size_t name_len TSRMLS_DC) -+{ -+ http_response_header_t h = {name, name_len}; -+ zend_llist_del_element(&SG(sapi_headers).headers, (void *) &h, http_find_header); -+} -+/* }}} */ -+ -+/* {{{ void http_send_header_zval(char*, zval **, zend_bool) */ -+PHP_HTTP_API void _http_send_header_zval_ex(const char *name, size_t name_len, zval **val, zend_bool replace TSRMLS_DC) -+{ -+ if (!val || !*val || Z_TYPE_PP(val) == IS_NULL || (Z_TYPE_PP(val) == IS_STRING && !Z_STRLEN_PP(val))) { -+ http_hide_header_ex(name, name_len); -+ } else if (Z_TYPE_PP(val) == IS_ARRAY || Z_TYPE_PP(val) == IS_OBJECT) { -+ zend_bool first = replace; -+ zval **data_ptr; -+ HashPosition pos; -+ -+ FOREACH_HASH_VAL(pos, HASH_OF(*val), data_ptr) { -+ zval *data = http_zsep(IS_STRING, *data_ptr); -+ -+ http_send_header_ex(name, name_len, Z_STRVAL_P(data), Z_STRLEN_P(data), first, NULL); -+ zval_ptr_dtor(&data); -+ first = 0; -+ } -+ } else { -+ zval *data = http_zsep(IS_STRING, *val); -+ -+ http_send_header_ex(name, name_len, Z_STRVAL_P(data), Z_STRLEN_P(data), replace, NULL); -+ zval_ptr_dtor(&data); -+ } -+} -+/* }}} */ -+ -+/* {{{ STATUS http_send_header(char *, char *, zend_bool) */ -+PHP_HTTP_API STATUS _http_send_header_ex(const char *name, size_t name_len, const char *value, size_t value_len, zend_bool replace, char **sent_header TSRMLS_DC) -+{ -+ STATUS ret; -+ -+ if (value && value_len) { -+ size_t header_len = sizeof(": ") + name_len + value_len + 1; -+ char *header = emalloc(header_len + 1); -+ -+ header[header_len] = '\0'; -+ header_len = snprintf(header, header_len, "%s: %s", name, value); -+ ret = http_send_header_string_ex(header, header_len, replace); -+ if (sent_header) { -+ *sent_header = header; -+ } else { -+ efree(header); -+ } -+ } else { -+ http_hide_header_ex(name, name_len); -+ ret = SUCCESS; -+ } -+ return ret; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_send_status_header(int, char *) */ -+PHP_HTTP_API STATUS _http_send_status_header_ex(int status, const char *header, size_t header_len, zend_bool replace TSRMLS_DC) -+{ -+ STATUS ret; -+ sapi_header_line h = {(char *) header, header_len, status}; -+ if (SUCCESS != (ret = sapi_header_op(replace ? SAPI_HEADER_REPLACE : SAPI_HEADER_ADD, &h TSRMLS_CC))) { -+ http_error_ex(HE_WARNING, HTTP_E_HEADER, "Could not send header: %s (%d)", header, status); -+ } -+ return ret; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_send_last_modified(int) */ -+PHP_HTTP_API STATUS _http_send_last_modified_ex(time_t t, char **sent_header TSRMLS_DC) -+{ -+ STATUS ret; -+ char *date = http_date(t); -+ -+ if (!date) { -+ return FAILURE; -+ } -+ -+ ret = http_send_header_ex("Last-Modified", lenof("Last-Modified"), date, strlen(date), 1, sent_header); -+ efree(date); -+ -+ /* remember */ -+ HTTP_G->send.last_modified = t; -+ -+ return ret; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_send_etag(char *, size_t) */ -+PHP_HTTP_API STATUS _http_send_etag_ex(const char *etag, size_t etag_len, char **sent_header TSRMLS_DC) -+{ -+ STATUS status; -+ char *etag_header; -+ size_t etag_header_len; -+ -+ if (!etag_len){ -+ http_error_ex(HE_WARNING, HTTP_E_HEADER, "Attempt to send empty ETag (previous: %s)\n", HTTP_G->send.unquoted_etag); -+ return FAILURE; -+ } -+ -+ etag_header_len = spprintf(&etag_header, 0, "ETag: \"%s\"", etag); -+ status = http_send_header_string_ex(etag_header, etag_header_len, 1); -+ -+ /* remember */ -+ STR_SET(HTTP_G->send.unquoted_etag, estrndup(etag, etag_len)); -+ -+ if (sent_header) { -+ *sent_header = etag_header; -+ } else { -+ efree(etag_header); -+ } -+ -+ return status; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_send_content_type(char *, size_t) */ -+PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_len TSRMLS_DC) -+{ -+ HTTP_CHECK_CONTENT_TYPE(content_type, return FAILURE); -+ -+ /* remember for multiple ranges */ -+ STR_FREE(HTTP_G->send.content_type); -+ HTTP_G->send.content_type = estrndup(content_type, ct_len); -+ -+ return http_send_header_ex("Content-Type", lenof("Content-Type"), content_type, ct_len, 1, NULL); -+} -+/* }}} */ -+ -+/* {{{ STATUS http_send_content_disposition(char *, size_t, zend_bool) */ -+PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t f_len, zend_bool send_inline TSRMLS_DC) -+{ -+ STATUS status; -+ char *cd_header; -+ -+ if (send_inline) { -+ cd_header = ecalloc(1, sizeof("Content-Disposition: inline; filename=\"\"") + f_len); -+ sprintf(cd_header, "Content-Disposition: inline; filename=\"%s\"", filename); -+ } else { -+ cd_header = ecalloc(1, sizeof("Content-Disposition: attachment; filename=\"\"") + f_len); -+ sprintf(cd_header, "Content-Disposition: attachment; filename=\"%s\"", filename); -+ } -+ -+ status = http_send_header_string(cd_header); -+ efree(cd_header); -+ return status; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_send(void *, size_t, http_send_mode) */ -+PHP_HTTP_API STATUS _http_send_ex(const void *data_ptr, size_t data_size, http_send_mode data_mode, zend_bool no_cache TSRMLS_DC) -+{ -+ void *s = NULL; -+ HashTable ranges; -+ http_range_status range_status; -+ -+ if (!data_ptr) { -+ return FAILURE; -+ } -+ if (!data_size) { -+ return SUCCESS; -+ } -+ -+ /* enable partial dl and resume */ -+ http_send_header_string("Accept-Ranges: bytes"); -+ -+ zend_hash_init(&ranges, 0, NULL, ZVAL_PTR_DTOR, 0); -+ range_status = http_get_request_ranges(&ranges, data_size); -+ -+ switch (range_status) { -+ case RANGE_ERR: -+ { -+ zend_hash_destroy(&ranges); -+ http_send_status(416); -+ return FAILURE; -+ } -+ case RANGE_OK: -+ { -+ /* Range Request - only send ranges if entity hasn't changed */ -+ if ( http_got_server_var("HTTP_IF_RANGE") && -+ !http_match_etag("HTTP_IF_RANGE", HTTP_G->send.unquoted_etag) && -+ !http_match_last_modified("HTTP_IF_RANGE", HTTP_G->send.last_modified)) { -+ /* fallthrough to send full entity with 200 Ok */ -+ no_cache = 1; -+ } else if ( !http_match_etag_ex("HTTP_IF_MATCH", HTTP_G->send.unquoted_etag, 0) || -+ !http_match_last_modified_ex("HTTP_IF_UNMODIFIED_SINCE", HTTP_G->send.last_modified, 0) || -+ !http_match_last_modified_ex("HTTP_UNLESS_MODIFIED_SINCE", HTTP_G->send.last_modified, 0)) { -+ /* 412 Precondition failed */ -+ zend_hash_destroy(&ranges); -+ http_send_status(412); -+ return FAILURE; -+ } else if (zend_hash_num_elements(&ranges) == 1) { -+ /* single range */ -+ zval **range, **begin, **end; -+ -+ if ( SUCCESS != zend_hash_index_find(&ranges, 0, (void *) &range) || -+ SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) || -+ SUCCESS != zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) { -+ /* this should never happen */ -+ zend_hash_destroy(&ranges); -+ http_send_status(500); -+ return FAILURE; -+ } else { -+ phpstr header; -+ -+ phpstr_init(&header); -+ phpstr_appendf(&header, "Content-Range: bytes %ld-%ld/%zu", Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); -+ phpstr_fix(&header); -+ http_send_status_header_ex(206, PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1); -+ phpstr_dtor(&header); -+ http_send_response_start(&s, Z_LVAL_PP(end)-Z_LVAL_PP(begin)+1); -+ http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1); -+ http_send_response_finish(&s); -+ zend_hash_destroy(&ranges); -+ return SUCCESS; -+ } -+ } else { -+ /* multi range */ -+ HashPosition pos; -+ zval **range, **begin, **end; -+ const char *content_type = HTTP_G->send.content_type; -+ char boundary_str[32]; -+ size_t boundary_len; -+ phpstr header, preface; -+ -+ boundary_len = http_boundary(boundary_str, sizeof(boundary_str)); -+ phpstr_init(&header); -+ phpstr_appendf(&header, "Content-Type: multipart/byteranges; boundary=%s", boundary_str); -+ phpstr_fix(&header); -+ http_send_status_header_ex(206, PHPSTR_VAL(&header), PHPSTR_LEN(&header), 1); -+ phpstr_dtor(&header); -+ http_send_response_start(&s, 0); -+ -+ if (!content_type) { -+ content_type = "application/x-octetstream"; -+ } -+ -+ phpstr_init(&preface); -+ FOREACH_HASH_VAL(pos, &ranges, range) { -+ if ( SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 0, (void *) &begin) && -+ SUCCESS == zend_hash_index_find(Z_ARRVAL_PP(range), 1, (void *) &end)) { -+ -+#define HTTP_RANGE_PREFACE \ -+ HTTP_CRLF "--%s" \ -+ HTTP_CRLF "Content-Type: %s" \ -+ HTTP_CRLF "Content-Range: bytes %ld-%ld/%zu" \ -+ HTTP_CRLF HTTP_CRLF -+ -+ phpstr_appendf(&preface, HTTP_RANGE_PREFACE, boundary_str, content_type, Z_LVAL_PP(begin), Z_LVAL_PP(end), data_size); -+ phpstr_fix(&preface); -+ http_send_response_data_plain(&s, PHPSTR_VAL(&preface), PHPSTR_LEN(&preface)); -+ phpstr_reset(&preface); -+ http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, Z_LVAL_PP(begin), Z_LVAL_PP(end) + 1); -+ } -+ } -+ phpstr_dtor(&preface); -+ -+ http_send_response_data_plain(&s, HTTP_CRLF "--", lenof(HTTP_CRLF "--")); -+ http_send_response_data_plain(&s, boundary_str, boundary_len); -+ http_send_response_data_plain(&s, "--", lenof("--")); -+ -+ http_send_response_finish(&s); -+ zend_hash_destroy(&ranges); -+ return SUCCESS; -+ } -+ } -+ case RANGE_NO: -+ { -+ zend_hash_destroy(&ranges); -+ -+ /* send 304 Not Modified if etag matches - DON'T return on ETag generation failure */ -+ if (!no_cache && (http_interrupt_ob_etaghandler() || (HTTP_G->send.unquoted_etag != NULL))) { -+ char *etag = NULL; -+ -+ if (HTTP_G->send.unquoted_etag) { -+ etag = estrdup(HTTP_G->send.unquoted_etag); -+ } -+ -+ if (etag || (etag = http_etag(data_ptr, data_size, data_mode))) { -+ char *sent_header = NULL; -+ -+ http_send_etag_ex(etag, strlen(etag), &sent_header); -+ if (http_match_etag("HTTP_IF_NONE_MATCH", etag)) { -+ return http_exit_ex(304, sent_header, NULL, 0); -+ } else { -+ STR_FREE(sent_header); -+ /* no caching for Last-Modified if ETags really don't match */ -+ no_cache = http_got_server_var("HTTP_IF_NONE_MATCH"); -+ } -+ efree(etag); -+ } -+ } -+ -+ /* send 304 Not Modified if last modified matches */ -+ if (!no_cache && HTTP_G->send.last_modified && http_match_last_modified("HTTP_IF_MODIFIED_SINCE", HTTP_G->send.last_modified)) { -+ char *sent_header = NULL; -+ http_send_last_modified_ex(HTTP_G->send.last_modified, &sent_header); -+ return http_exit_ex(304, sent_header, NULL, 0); -+ } -+ -+ /* send full response */ -+ http_send_response_start(&s, data_size); -+ http_send_response_data_fetch(&s, data_ptr, data_size, data_mode, 0, data_size); -+ http_send_response_finish(&s); -+ return SUCCESS; -+ } -+ } -+ return FAILURE; -+} -+/* }}} */ -+ -+/* {{{ STATUS http_send_stream(php_stream *) */ -+PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *file, zend_bool close_stream, zend_bool no_cache TSRMLS_DC) -+{ -+ STATUS status; -+ php_stream_statbuf ssb; -+ int orig_flags; -+ -+ if ((!file) || php_stream_stat(file, &ssb)) { -+ char *defct = sapi_get_default_content_type(TSRMLS_C); -+ -+ http_hide_header("Content-Disposition"); -+ http_send_content_type(defct, strlen(defct)); -+ http_error(HE_WARNING, HTTP_E_RESPONSE, "File not found; stat failed"); -+ STR_FREE(defct); -+ -+ if (HTTP_G->send.not_found_404) { -+ http_exit_ex(404, NULL, estrdup("File not found\n"), 0); -+ } -+ return FAILURE; -+ } -+ -+ orig_flags = file->flags; -+ file->flags |= PHP_STREAM_FLAG_NO_BUFFER; -+ status = http_send_ex(file, ssb.sb.st_size, SEND_RSRC, no_cache); -+ file->flags = orig_flags; -+ -+ if (close_stream) { -+ php_stream_close(file); -+ } -+ -+ return status; -+} -+/* }}} */ -+ -+/* {{{ char *http_guess_content_type(char *magic_file, long magic_mode, void *data, size_t size, http_send_mode mode) */ -+PHP_HTTP_API char *_http_guess_content_type(const char *magicfile, long magicmode, void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC) -+{ -+ char *ct = NULL; -+ -+#ifdef HTTP_HAVE_MAGIC -+ struct magic_set *magic = NULL; -+ -+ HTTP_CHECK_OPEN_BASEDIR(magicfile, return NULL); -+ -+ if (!data_ptr) { -+ http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Supplied payload is empty"); -+ } else if (!(magic = magic_open(magicmode &~ MAGIC_MIME))) { -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid magic mode: %ld", magicmode); -+ } else if (-1 == magic_load(magic, magicfile)) { -+ http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to load magic database '%s' (%s)", magicfile, magic_error(magic)); -+ } else { -+ const char *ctype = NULL; -+ -+ magic_setflags(magic, magicmode); -+ -+ switch (data_mode) { -+ case SEND_RSRC: -+ { -+ char *buffer; -+ size_t b_len; -+ -+ b_len = php_stream_copy_to_mem(data_ptr, &buffer, 65536, 0); -+ ctype = magic_buffer(magic, buffer, b_len); -+ efree(buffer); -+ break; -+ } -+ -+ case SEND_DATA: -+ ctype = magic_buffer(magic, data_ptr, data_len); -+ break; -+ -+ default: -+ HTTP_CHECK_OPEN_BASEDIR(data_ptr, magic_close(magic); return NULL); -+ ctype = magic_file(magic, data_ptr); -+ break; -+ } -+ -+ if (ctype) { -+ ct = estrdup(ctype); -+ } else { -+ http_error_ex(HE_WARNING, HTTP_E_RUNTIME, "Failed to guess Content-Type: %s", magic_error(magic)); -+ } -+ } -+ if (magic) { -+ magic_close(magic); -+ } -+#else -+ http_error(HE_WARNING, HTTP_E_RUNTIME, "Cannot guess Content-Type; libmagic not available"); -+#endif -+ -+ return ct; -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: sw=4 ts=4 fdm=marker -+ * vim<600: sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_url_api.c -@@ -0,0 +1,482 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_url_api.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#define HTTP_WANT_SAPI -+#define HTTP_WANT_NETDB -+#include "php_http.h" -+ -+#include "zend_ini.h" -+#include "php_output.h" -+#include "ext/standard/php_string.h" -+ -+#include "php_http_api.h" -+#include "php_http_querystring_api.h" -+#include "php_http_url_api.h" -+ -+static inline char *localhostname(void) -+{ -+ char hostname[1024] = {0}; -+ -+#ifdef PHP_WIN32 -+ if (SUCCESS == gethostname(hostname, lenof(hostname))) { -+ return estrdup(hostname); -+ } -+#elif defined(HAVE_GETHOSTNAME) -+ if (SUCCESS == gethostname(hostname, lenof(hostname))) { -+# if defined(HAVE_GETDOMAINNAME) -+ size_t hlen = strlen(hostname); -+ if (hlen <= lenof(hostname) - lenof("(none)")) { -+ hostname[hlen++] = '.'; -+ if (SUCCESS == getdomainname(&hostname[hlen], lenof(hostname) - hlen)) { -+ if (!strcmp(&hostname[hlen], "(none)")) { -+ hostname[hlen - 1] = '\0'; -+ } -+ return estrdup(hostname); -+ } -+ } -+# endif -+ if (strcmp(hostname, "(none)")) { -+ return estrdup(hostname); -+ } -+ } -+#endif -+ return estrndup("localhost", lenof("localhost")); -+} -+ -+PHP_MINIT_FUNCTION(http_url) -+{ -+ HTTP_LONG_CONSTANT("HTTP_URL_REPLACE", HTTP_URL_REPLACE); -+ HTTP_LONG_CONSTANT("HTTP_URL_JOIN_PATH", HTTP_URL_JOIN_PATH); -+ HTTP_LONG_CONSTANT("HTTP_URL_JOIN_QUERY", HTTP_URL_JOIN_QUERY); -+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_USER", HTTP_URL_STRIP_USER); -+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_PASS", HTTP_URL_STRIP_PASS); -+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_AUTH", HTTP_URL_STRIP_AUTH); -+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_PORT", HTTP_URL_STRIP_PORT); -+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_PATH", HTTP_URL_STRIP_PATH); -+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_QUERY", HTTP_URL_STRIP_QUERY); -+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_FRAGMENT", HTTP_URL_STRIP_FRAGMENT); -+ HTTP_LONG_CONSTANT("HTTP_URL_STRIP_ALL", HTTP_URL_STRIP_ALL); -+ HTTP_LONG_CONSTANT("HTTP_URL_FROM_ENV", HTTP_URL_FROM_ENV); -+ return SUCCESS; -+} -+ -+PHP_HTTP_API char *_http_absolute_url_ex(const char *url, int flags TSRMLS_DC) -+{ -+ char *abs = NULL; -+ php_url *purl = NULL; -+ -+ if (url) { -+ purl = php_url_parse(abs = estrdup(url)); -+ STR_SET(abs, NULL); -+ if (!purl) { -+ http_error_ex(HE_WARNING, HTTP_E_URL, "Could not parse URL (%s)", url); -+ return NULL; -+ } -+ } -+ -+ http_build_url(flags, purl, NULL, NULL, &abs, NULL); -+ -+ if (purl) { -+ php_url_free(purl); -+ } -+ -+ return abs; -+} -+ -+/* {{{ void http_build_url(int flags, const php_url *, const php_url *, php_url **, char **, size_t *) */ -+PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC) -+{ -+#if defined(HAVE_GETSERVBYPORT) || defined(HAVE_GETSERVBYNAME) -+ struct servent *se; -+#endif -+ php_url *url = ecalloc(1, sizeof(php_url)); -+ -+#define __URLSET(u,n) \ -+ ((u)&&(u)->n) -+#define __URLCPY(n) \ -+ url->n = __URLSET(new_url,n) ? estrdup(new_url->n) : (__URLSET(old_url,n) ? estrdup(old_url->n) : NULL) -+ -+ if (!(flags & HTTP_URL_STRIP_PORT)) { -+ url->port = __URLSET(new_url, port) ? new_url->port : ((old_url) ? old_url->port : 0); -+ } -+ if (!(flags & HTTP_URL_STRIP_USER)) { -+ __URLCPY(user); -+ } -+ if (!(flags & HTTP_URL_STRIP_PASS)) { -+ __URLCPY(pass); -+ } -+ -+ __URLCPY(scheme); -+ __URLCPY(host); -+ -+ if (!(flags & HTTP_URL_STRIP_PATH)) { -+ if ((flags & HTTP_URL_JOIN_PATH) && __URLSET(old_url, path) && __URLSET(new_url, path) && *new_url->path != '/') { -+ size_t old_path_len = strlen(old_url->path), new_path_len = strlen(new_url->path); -+ -+ url->path = ecalloc(1, old_path_len + new_path_len + 1 + 1); -+ -+ strcat(url->path, old_url->path); -+ if (url->path[old_path_len - 1] != '/') { -+ php_dirname(url->path, old_path_len); -+ strcat(url->path, "/"); -+ } -+ strcat(url->path, new_url->path); -+ } else { -+ __URLCPY(path); -+ } -+ } -+ if (!(flags & HTTP_URL_STRIP_QUERY)) { -+ if ((flags & HTTP_URL_JOIN_QUERY) && __URLSET(new_url, query) && __URLSET(old_url, query)) { -+ zval qarr, qstr; -+ -+ INIT_PZVAL(&qstr); -+ INIT_PZVAL(&qarr); -+ array_init(&qarr); -+ -+ ZVAL_STRING(&qstr, old_url->query, 0); -+ http_querystring_modify(&qarr, &qstr); -+ ZVAL_STRING(&qstr, new_url->query, 0); -+ http_querystring_modify(&qarr, &qstr); -+ -+ ZVAL_NULL(&qstr); -+ http_querystring_update(&qarr, &qstr); -+ url->query = Z_STRVAL(qstr); -+ zval_dtor(&qarr); -+ } else { -+ __URLCPY(query); -+ } -+ } -+ if (!(flags & HTTP_URL_STRIP_FRAGMENT)) { -+ __URLCPY(fragment); -+ } -+ -+ if (!url->scheme) { -+ if (flags & HTTP_URL_FROM_ENV) { -+ zval *https = http_get_server_var("HTTPS", 1); -+ if (https && !strcasecmp(Z_STRVAL_P(https), "ON")) { -+ url->scheme = estrndup("https", lenof("https")); -+ } else switch (url->port) { -+ case 443: -+ url->scheme = estrndup("https", lenof("https")); -+ break; -+ -+#ifndef HAVE_GETSERVBYPORT -+ default: -+#endif -+ case 80: -+ case 0: -+ url->scheme = estrndup("http", lenof("http")); -+ break; -+ -+#ifdef HAVE_GETSERVBYPORT -+ default: -+ if ((se = getservbyport(htons(url->port), "tcp")) && se->s_name) { -+ url->scheme = estrdup(se->s_name); -+ } else { -+ url->scheme = estrndup("http", lenof("http")); -+ } -+ break; -+#endif -+ } -+ } else { -+ url->scheme = estrndup("http", lenof("http")); -+ } -+ } -+ -+ if (!url->host) { -+ if (flags & HTTP_URL_FROM_ENV) { -+ zval *zhost; -+ -+ if ((((zhost = http_get_server_var("HTTP_HOST", 1)) || -+ (zhost = http_get_server_var("SERVER_NAME", 1)))) && Z_STRLEN_P(zhost)) { -+ url->host = estrndup(Z_STRVAL_P(zhost), Z_STRLEN_P(zhost)); -+ } else { -+ url->host = localhostname(); -+ } -+ } else { -+ url->host = estrndup("localhost", lenof("localhost")); -+ } -+ } -+ -+ if (!url->path) { -+ if ((flags & HTTP_URL_FROM_ENV) && SG(request_info).request_uri && SG(request_info).request_uri[0]) { -+ const char *q = strchr(SG(request_info).request_uri, '?'); -+ -+ if (q) { -+ url->path = estrndup(SG(request_info).request_uri, q - SG(request_info).request_uri); -+ } else { -+ url->path = estrdup(SG(request_info).request_uri); -+ } -+ } else { -+ url->path = estrndup("/", 1); -+ } -+ } else if (url->path[0] != '/') { -+ if ((flags & HTTP_URL_FROM_ENV) && SG(request_info).request_uri && SG(request_info).request_uri[0]) { -+ size_t ulen = strlen(SG(request_info).request_uri); -+ size_t plen = strlen(url->path); -+ char *path; -+ -+ if (SG(request_info).request_uri[ulen-1] != '/') { -+ for (--ulen; ulen && SG(request_info).request_uri[ulen - 1] != '/'; --ulen); -+ } -+ -+ path = emalloc(ulen + plen + 1); -+ memcpy(path, SG(request_info).request_uri, ulen); -+ memcpy(path + ulen, url->path, plen); -+ path[ulen + plen] = '\0'; -+ STR_SET(url->path, path); -+ } else { -+ size_t plen = strlen(url->path); -+ char *path = emalloc(plen + 1 + 1); -+ -+ path[0] = '/'; -+ memcpy(&path[1], url->path, plen + 1); -+ STR_SET(url->path, path); -+ } -+ } -+ /* replace directory references if path is not a single slash */ -+ if (url->path[0] && (url->path[0] != '/' || url->path[1])) { -+ char *ptr, *end = url->path + strlen(url->path) + 1; -+ -+ for (ptr = strstr(url->path, "/."); ptr; ptr = strstr(ptr, "/.")) { -+ switch (ptr[2]) { -+ case '\0': -+ ptr[1] = '\0'; -+ break; -+ -+ case '/': -+ memmove(&ptr[1], &ptr[3], end - &ptr[3]); -+ break; -+ -+ case '.': -+ if (ptr[3] == '/') { -+ char *pos = &ptr[4]; -+ while (ptr != url->path) { -+ if (*--ptr == '/') { -+ break; -+ } -+ } -+ memmove(&ptr[1], pos, end - pos); -+ break; -+ } else if (!ptr[3]) { -+ /* .. at the end */ -+ ptr[1] = '\0'; -+ } -+ /* fallthrough */ -+ -+ default: -+ /* something else */ -+ ++ptr; -+ break; -+ } -+ } -+ } -+ -+ if (url->port) { -+ if ( ((url->port == 80) && !strcmp(url->scheme, "http")) -+ || ((url->port ==443) && !strcmp(url->scheme, "https")) -+#ifdef HAVE_GETSERVBYNAME -+ || ((se = getservbyname(url->scheme, "tcp")) && se->s_port && -+ (url->port == ntohs(se->s_port))) -+#endif -+ ) { -+ url->port = 0; -+ } -+ } -+ -+ if (url_str) { -+ size_t len; -+ -+ *url_str = emalloc(HTTP_URL_MAXLEN + 1); -+ -+ **url_str = '\0'; -+ strlcat(*url_str, url->scheme, HTTP_URL_MAXLEN); -+ strlcat(*url_str, "://", HTTP_URL_MAXLEN); -+ -+ if (url->user && *url->user) { -+ strlcat(*url_str, url->user, HTTP_URL_MAXLEN); -+ if (url->pass && *url->pass) { -+ strlcat(*url_str, ":", HTTP_URL_MAXLEN); -+ strlcat(*url_str, url->pass, HTTP_URL_MAXLEN); -+ } -+ strlcat(*url_str, "@", HTTP_URL_MAXLEN); -+ } -+ -+ strlcat(*url_str, url->host, HTTP_URL_MAXLEN); -+ -+ if (url->port) { -+ char port_str[8]; -+ -+ snprintf(port_str, sizeof(port_str), "%d", (int) url->port); -+ strlcat(*url_str, ":", HTTP_URL_MAXLEN); -+ strlcat(*url_str, port_str, HTTP_URL_MAXLEN); -+ } -+ -+ strlcat(*url_str, url->path, HTTP_URL_MAXLEN); -+ -+ if (url->query && *url->query) { -+ strlcat(*url_str, "?", HTTP_URL_MAXLEN); -+ strlcat(*url_str, url->query, HTTP_URL_MAXLEN); -+ } -+ -+ if (url->fragment && *url->fragment) { -+ strlcat(*url_str, "#", HTTP_URL_MAXLEN); -+ strlcat(*url_str, url->fragment, HTTP_URL_MAXLEN); -+ } -+ -+ if (HTTP_URL_MAXLEN == (len = strlen(*url_str))) { -+ http_error(HE_NOTICE, HTTP_E_URL, "Length of URL exceeds HTTP_URL_MAXLEN"); -+ } -+ if (url_len) { -+ *url_len = len; -+ } -+ } -+ -+ if (url_ptr) { -+ *url_ptr = url; -+ } else { -+ php_url_free(url); -+ } -+} -+/* }}} */ -+ -+/* {{{ STATUS http_urlencode_hash_ex(HashTable *, zend_bool, char *, size_t, char **, size_t *) */ -+PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_argsep, -+ char *pre_encoded_data, size_t pre_encoded_len, -+ char **encoded_data, size_t *encoded_len TSRMLS_DC) -+{ -+ char *arg_sep; -+ size_t arg_sep_len; -+ phpstr *qstr = phpstr_new(); -+ -+ if (override_argsep || !(arg_sep_len = strlen(arg_sep = INI_STR("arg_separator.output")))) { -+ arg_sep = HTTP_URL_ARGSEP; -+ arg_sep_len = lenof(HTTP_URL_ARGSEP); -+ } -+ -+ if (pre_encoded_len && pre_encoded_data) { -+ phpstr_append(qstr, pre_encoded_data, pre_encoded_len); -+ } -+ -+ if (SUCCESS != http_urlencode_hash_recursive(hash, qstr, arg_sep, arg_sep_len, NULL, 0)) { -+ phpstr_free(&qstr); -+ return FAILURE; -+ } -+ -+ phpstr_data(qstr, encoded_data, encoded_len); -+ phpstr_free(&qstr); -+ -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* {{{ http_urlencode_hash_recursive */ -+PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC) -+{ -+ HashKey key = initHashKey(0); -+ zval **data = NULL; -+ HashPosition pos; -+ -+ if (!ht || !str) { -+ http_error(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid parameters"); -+ return FAILURE; -+ } -+ if (ht->nApplyCount > 0) { -+ return SUCCESS; -+ } -+ -+ FOREACH_HASH_KEYVAL(pos, ht, key, data) { -+ char *encoded_key; -+ int encoded_len; -+ phpstr new_prefix; -+ -+ if (!data || !*data) { -+ phpstr_dtor(str); -+ return FAILURE; -+ } -+ -+ if (key.type == HASH_KEY_IS_STRING) { -+ if (!*key.str) { -+ /* only public properties */ -+ continue; -+ } -+ if (key.len && key.str[key.len - 1] == '\0') { -+ --key.len; -+ } -+ encoded_key = php_url_encode(key.str, key.len, &encoded_len); -+ } else { -+ encoded_len = spprintf(&encoded_key, 0, "%ld", key.num); -+ } -+ -+ { -+ phpstr_init(&new_prefix); -+ if (prefix && prefix_len) { -+ phpstr_append(&new_prefix, prefix, prefix_len); -+ phpstr_appends(&new_prefix, "%5B"); -+ } -+ -+ phpstr_append(&new_prefix, encoded_key, encoded_len); -+ efree(encoded_key); -+ -+ if (prefix && prefix_len) { -+ phpstr_appends(&new_prefix, "%5D"); -+ } -+ phpstr_fix(&new_prefix); -+ } -+ -+ if (Z_TYPE_PP(data) == IS_ARRAY || Z_TYPE_PP(data) == IS_OBJECT) { -+ STATUS status; -+ ++ht->nApplyCount; -+ status = http_urlencode_hash_recursive(HASH_OF(*data), str, arg_sep, arg_sep_len, PHPSTR_VAL(&new_prefix), PHPSTR_LEN(&new_prefix)); -+ --ht->nApplyCount; -+ if (SUCCESS != status) { -+ phpstr_dtor(&new_prefix); -+ phpstr_dtor(str); -+ return FAILURE; -+ } -+ } else { -+ zval *val = http_zsep(IS_STRING, *data); -+ -+ if (PHPSTR_LEN(str)) { -+ phpstr_append(str, arg_sep, arg_sep_len); -+ } -+ phpstr_append(str, PHPSTR_VAL(&new_prefix), PHPSTR_LEN(&new_prefix)); -+ phpstr_appends(str, "="); -+ -+ if (Z_STRLEN_P(val) && Z_STRVAL_P(val)) { -+ char *encoded_val; -+ int encoded_len; -+ -+ encoded_val = php_url_encode(Z_STRVAL_P(val), Z_STRLEN_P(val), &encoded_len); -+ phpstr_append(str, encoded_val, encoded_len); -+ efree(encoded_val); -+ } -+ -+ zval_ptr_dtor(&val); -+ } -+ phpstr_dtor(&new_prefix); -+ } -+ return SUCCESS; -+} -+/* }}} */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/http_util_object.c -@@ -0,0 +1,158 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: http_util_object.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#include "php_http.h" -+ -+#ifdef ZEND_ENGINE_2 -+ -+#include "ext/standard/php_http.h" -+ -+#include "php_http_util_object.h" -+ -+#define HTTP_BEGIN_ARGS(method, req_args) HTTP_BEGIN_ARGS_EX(HttpUtil, method, 0, req_args) -+#define HTTP_EMPTY_ARGS(method) HTTP_EMPTY_ARGS_EX(HttpUtil, method, 0) -+ -+#define HTTP_UTIL_ALIAS(method, func) HTTP_STATIC_ME_ALIAS(method, func, HTTP_ARGS(HttpUtil, method)) -+ -+HTTP_BEGIN_ARGS(date, 0) -+ HTTP_ARG_VAL(timestamp, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(buildStr, 1) -+ HTTP_ARG_VAL(query, 0) -+ HTTP_ARG_VAL(prefix, 0) -+ HTTP_ARG_VAL(arg_sep, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(buildUrl, 1) -+ HTTP_ARG_VAL(url, 0) -+ HTTP_ARG_VAL(parts, 0) -+ HTTP_ARG_VAL(flags, 0) -+ HTTP_ARG_VAL(composed, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(negotiateLanguage, 1) -+ HTTP_ARG_VAL(supported, 0) -+ HTTP_ARG_VAL(result, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(negotiateCharset, 1) -+ HTTP_ARG_VAL(supported, 0) -+ HTTP_ARG_VAL(result, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(negotiateContentType, 1) -+ HTTP_ARG_VAL(supported, 0) -+ HTTP_ARG_VAL(result, 1) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(matchModified, 1) -+ HTTP_ARG_VAL(last_modified, 0) -+ HTTP_ARG_VAL(for_range, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(matchEtag, 1) -+ HTTP_ARG_VAL(plain_etag, 0) -+ HTTP_ARG_VAL(for_range, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(matchRequestHeader, 2) -+ HTTP_ARG_VAL(header_name, 0) -+ HTTP_ARG_VAL(header_value, 0) -+ HTTP_ARG_VAL(case_sensitive, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(parseMessage, 1) -+ HTTP_ARG_VAL(message_string, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(parseHeaders, 1) -+ HTTP_ARG_VAL(headers_string, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(parseCookie, 1) -+ HTTP_ARG_VAL(cookie_string, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(buildCookie, 1) -+ HTTP_ARG_VAL(cookie_array, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(parseParams, 1) -+ HTTP_ARG_VAL(param_string, 0) -+ HTTP_ARG_VAL(flags, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(chunkedDecode, 1) -+ HTTP_ARG_VAL(encoded_string, 0) -+HTTP_END_ARGS; -+ -+#ifdef HTTP_HAVE_ZLIB -+HTTP_BEGIN_ARGS(deflate, 1) -+ HTTP_ARG_VAL(plain, 0) -+ HTTP_ARG_VAL(flags, 0) -+HTTP_END_ARGS; -+ -+HTTP_BEGIN_ARGS(inflate, 1) -+ HTTP_ARG_VAL(encoded, 0) -+HTTP_END_ARGS; -+#endif -+ -+HTTP_BEGIN_ARGS(support, 0) -+ HTTP_ARG_VAL(feature, 0) -+HTTP_END_ARGS; -+ -+zend_class_entry *http_util_object_ce; -+zend_function_entry http_util_object_fe[] = { -+ HTTP_UTIL_ALIAS(date, http_date) -+ HTTP_UTIL_ALIAS(buildUrl, http_build_url) -+ HTTP_UTIL_ALIAS(buildStr, http_build_str) -+ HTTP_UTIL_ALIAS(negotiateLanguage, http_negotiate_language) -+ HTTP_UTIL_ALIAS(negotiateCharset, http_negotiate_charset) -+ HTTP_UTIL_ALIAS(negotiateContentType, http_negotiate_content_type) -+ HTTP_UTIL_ALIAS(matchModified, http_match_modified) -+ HTTP_UTIL_ALIAS(matchEtag, http_match_etag) -+ HTTP_UTIL_ALIAS(matchRequestHeader, http_match_request_header) -+ HTTP_UTIL_ALIAS(parseMessage, http_parse_message) -+ HTTP_UTIL_ALIAS(parseHeaders, http_parse_headers) -+ HTTP_UTIL_ALIAS(parseCookie, http_parse_cookie) -+ HTTP_UTIL_ALIAS(buildCookie, http_build_cookie) -+ HTTP_UTIL_ALIAS(parseParams, http_parse_params) -+ HTTP_UTIL_ALIAS(chunkedDecode, http_chunked_decode) -+#ifdef HTTP_HAVE_ZLIB -+ HTTP_UTIL_ALIAS(deflate, http_deflate) -+ HTTP_UTIL_ALIAS(inflate, http_inflate) -+#endif /* HTTP_HAVE_ZLIB */ -+ HTTP_UTIL_ALIAS(support, http_support) -+ -+ EMPTY_FUNCTION_ENTRY -+}; -+ -+PHP_MINIT_FUNCTION(http_util_object) -+{ -+ HTTP_REGISTER_CLASS(HttpUtil, http_util_object, NULL, 0); -+ return SUCCESS; -+} -+ -+#endif /* ZEND_ENGINE_2 */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/lib/BigGet.php -@@ -0,0 +1,213 @@ -+ -+ * @license BSD, revised -+ * @version $Revision: 220502 $ -+ */ -+class BigGet extends HttpRequestPool -+{ -+ /** -+ * File split size -+ */ -+ const SIZE = 1048576; -+ -+ /** -+ * Parallel Request count -+ */ -+ const RMAX = 5; -+ -+ /** -+ * Whether to output debug messages -+ * -+ * @var bool -+ */ -+ public $dbg = false; -+ -+ /** -+ * URL -+ * -+ * @var string -+ */ -+ private $url; -+ -+ /** -+ * Temp file prefix -+ * -+ * @var string -+ */ -+ private $tmp; -+ -+ /** -+ * Size of requested resource -+ * -+ * @var int -+ */ -+ private $size; -+ -+ /** -+ * Whether the requests have been sent -+ * -+ * @var bool -+ */ -+ private $sent = false; -+ -+ /** -+ * Request counter -+ * -+ * @var int -+ */ -+ private $count = 0; -+ -+ /** -+ * Static constructor -+ * -+ * @param string $url -+ * @param string $tmp -+ * @return BigGet -+ * @throws Exception -+ */ -+ public static function url($url, $tmp = '/tmp') -+ { -+ $head = new HttpRequest($url, HttpRequest::METH_HEAD); -+ $headers = $head->send()->getHeaders(); -+ -+ if (200 != $head->getResponseCode()) { -+ throw new HttpException("Did not receive '200 Ok' from HEAD $url"); -+ } -+ if (!isset($headers['Accept-Ranges'])) { -+ throw new HttpException("Did not receive an Accept-Ranges header from HEAD $url"); -+ } -+ if (!isset($headers['Content-Length'])) { -+ throw new HttpException("Did not receive a Content-Length header from HEAD $url"); -+ } -+ -+ $bigget = new BigGet; -+ $bigget->url = $url; -+ $bigget->tmp = tempnam($tmp, 'BigGet.'); -+ $bigget->size = $headers['Content-Length']; -+ return $bigget; -+ } -+ -+ /** -+ * Save the resource to a file -+ * -+ * @param string $file -+ * @return bool -+ * @throws Exception -+ */ -+ public function saveTo($file) -+ { -+ $this->sent or $this->send(); -+ -+ if ($w = fopen($this->tmp, 'wb')) { -+ -+ $this->dbg && print "\nCopying temp files to $file ...\n"; -+ -+ foreach (glob($this->tmp .".????") as $tmp) { -+ -+ $this->dbg && print "\t$tmp\n"; -+ -+ if ($r = fopen($tmp, 'rb')) { -+ stream_copy_to_stream($r, $w); -+ fclose($r); -+ } -+ unlink($tmp); -+ } -+ fclose($w); -+ rename($this->tmp, $file); -+ -+ $this->dbg && print "\nDone.\n"; -+ -+ return true; -+ } -+ return false; -+ } -+ -+ /** -+ * Overrides HttpRequestPool::send() -+ * -+ * @return void -+ * @throws Exception -+ */ -+ public function send() -+ { -+ $this->sent = true; -+ -+ // use max RMAX simultanous requests with a req size of SIZE -+ while ($this->count < self::RMAX && -1 != $offset = $this->getRangeOffset()) { -+ $this->attachNew($offset); -+ } -+ -+ while ($this->socketPerform()) { -+ if (!$this->socketSelect()) { -+ throw new HttpSocketException; -+ } -+ } -+ } -+ -+ /** -+ * Overrides HttpRequestPool::socketPerform() -+ * -+ * @return bool -+ */ -+ protected function socketPerform() -+ { -+ $rs = parent::socketPerform(); -+ -+ foreach ($this->getFinishedRequests() as $r) { -+ $this->detach($r); -+ -+ if (206 != $rc = $r->getResponseCode()) { -+ throw new HttpException("Unexpected response code: $rc"); -+ } -+ -+ file_put_contents(sprintf("%s.%04d", $this->tmp, $r->id), $r->getResponseBody()); -+ -+ if (-1 != $offset = $this->getRangeOffset()) { -+ $this->attachNew($offset); -+ } -+ } -+ -+ return $rs; -+ } -+ -+ private function attachNew($offset) -+ { -+ $stop = min($this->count * self::SIZE + self::SIZE, $this->size) - 1; -+ -+ $this->dbg && print "Attaching new request to get range: $offset-$stop\n"; -+ -+ $req = new BigGetRequest( -+ $this->url, -+ HttpRequest::METH_GET, -+ array( -+ 'headers' => array( -+ 'Range' => "bytes=$offset-$stop" -+ ) -+ ) -+ ); -+ $this->attach($req); -+ $req->id = $this->count++; -+ } -+ -+ private function getRangeOffset() -+ { -+ return ($this->size >= $start = $this->count * self::SIZE) ? $start : -1; -+ } -+} -+ -+ -+/** -+ * BigGet request -+ * @ignore -+ */ -+class BigGetRequest extends HttpRequest -+{ -+ public $id; -+} -+ -+?> ---- /dev/null -+++ b/ext/http/lib/FeedAggregator.php -@@ -0,0 +1,187 @@ -+ -+ * @license BSD, revised -+ * @package pecl/http -+ * @version $Revision: 208774 $ -+ */ -+class FeedAggregator -+{ -+ /** -+ * Cache directory -+ * -+ * @var string -+ */ -+ public $directory; -+ -+ /** -+ * Feeds -+ * -+ * @var array -+ */ -+ protected $feeds = array(); -+ -+ /** -+ * Constructor -+ * -+ * @param string $directory -+ */ -+ public function __construct($directory = 'feeds') -+ { -+ $this->setDirectory($directory); -+ } -+ -+ /** -+ * Set cache directory -+ * -+ * @param string $directory -+ */ -+ public function setDirectory($directory) -+ { -+ $this->directory = $directory; -+ foreach (glob($this->directory .'/*.xml') as $feed) { -+ $this->feeds[basename($feed, '.xml')] = filemtime($feed); -+ } -+ } -+ -+ /** -+ * Strips all special chars -+ * -+ * @param string $url -+ * @return string -+ */ -+ public function url2name($url) -+ { -+ return preg_replace('/[^\w\.-]+/', '_', $url); -+ } -+ -+ /** -+ * Checks if $url is a known feed -+ * -+ * @param string $url -+ * @return bool -+ */ -+ public function hasFeed($url) -+ { -+ return isset($this->feeds[$this->url2name($url)]); -+ } -+ -+ /** -+ * Add an URL as feed -+ * -+ * @param string $url -+ * @return void -+ * @throws Exception -+ */ -+ public function addFeed($url) -+ { -+ $r = $this->setupRequest($url); -+ $r->send(); -+ $this->handleResponse($r); -+ } -+ -+ /** -+ * Add several URLs as feeds -+ * -+ * @param array $urls -+ * @return void -+ * @throws Exception -+ */ -+ public function addFeeds(array $urls) -+ { -+ $pool = new HttpRequestPool; -+ foreach ($urls as $url) { -+ $pool->attach($r = $this->setupRequest($url)); -+ } -+ $pool->send(); -+ -+ foreach ($pool as $request) { -+ $this->handleResponse($request); -+ } -+ } -+ -+ /** -+ * Load a feed (from cache) -+ * -+ * @param string $url -+ * @return string -+ * @throws Exception -+ */ -+ public function getFeed($url) -+ { -+ $this->addFeed($url); -+ return $this->loadFeed($this->url2name($url)); -+ } -+ -+ /** -+ * Load several feeds (from cache) -+ * -+ * @param array $urls -+ * @return array -+ * @throws Exception -+ */ -+ public function getFeeds(array $urls) -+ { -+ $feeds = array(); -+ $this->addFeeds($urls); -+ foreach ($urls as $url) { -+ $feeds[] = $this->loadFeed($this->url2name($url)); -+ } -+ return $feeds; -+ } -+ -+ protected function saveFeed($file, $contents) -+ { -+ if (file_put_contents($this->directory .'/'. $file .'.xml', $contents)) { -+ $this->feeds[$file] = time(); -+ } else { -+ throw new Exception("Could not save feed contents to $file.xml"); -+ } -+ } -+ -+ protected function loadFeed($file) -+ { -+ if (isset($this->feeds[$file])) { -+ if ($data = file_get_contents($this->directory .'/'. $file .'.xml')) { -+ return $data; -+ } else { -+ throw new Exception("Could not load feed contents from $file.xml"); -+ } -+ } else { -+ throw new Exception("Unknown feed/file $file.xml"); -+ } -+ } -+ -+ protected function setupRequest($url, $escape = true) -+ { -+ $r = new HttpRequest($url); -+ $r->setOptions(array('redirect' => true)); -+ -+ $file = $escape ? $this->url2name($url) : $url; -+ -+ if (isset($this->feeds[$file])) { -+ $r->setOptions(array('lastmodified' => $this->feeds[$file])); -+ } -+ -+ return $r; -+ } -+ -+ protected function handleResponse(HttpRequest $r) -+ { -+ if ($r->getResponseCode() != 304) { -+ if ($r->getResponseCode() != 200) { -+ throw new Exception("Unexpected response code ". $r->getResponseCode()); -+ } -+ if (!strlen($body = $r->getResponseBody())) { -+ throw new Exception("Received empty feed from ". $r->getUrl()); -+ } -+ $this->saveFeed($this->url2name($r->getUrl()), $body); -+ } -+ } -+} -+ -+?> ---- /dev/null -+++ b/ext/http/lib/PgLobStream.php -@@ -0,0 +1,100 @@ -+ -+ * // GET /image.php?image=1234 -+ * if (PgLobStream::$loId = (int) $_GET['image']) { -+ * if ($lob = fopen('pglob://dbname=database user=mike', 'r')) { -+ * HttpResponse::setContentType('image/jpeg'); -+ * HttpResponse::setStream($lob); -+ * HttpResponse::send(); -+ * } -+ * } -+ * -+ * -+ * @copyright Michael Wallner, -+ * @license BSD, revised -+ * @package pecl/http -+ * @version $Revision: 210232 $ -+ */ -+class PgLobStream -+{ -+ private $dbh; -+ private $loh; -+ private $lon; -+ private $size = 0; -+ -+ public static $loId; -+ -+ function stream_open($path, $mode) -+ { -+ $path = trim(parse_url($path, PHP_URL_HOST)); -+ -+ if ($path) { -+ if ($this->dbh = pg_connect($path)) { -+ if (pg_query($this->dbh, 'BEGIN')) { -+ if (is_resource($this->loh = pg_lo_open($this->dbh, $this->lon = self::$loId, $mode))) { -+ pg_lo_seek($this->loh, 0, PGSQL_SEEK_END); -+ $this->size = (int) pg_lo_tell($this->loh); -+ pg_lo_seek($this->loh, 0, PGSQL_SEEK_SET); -+ return true; -+ } -+ } -+ } -+ } -+ return false; -+ } -+ -+ function stream_read($length) -+ { -+ return pg_lo_read($this->loh, $length); -+ } -+ -+ function stream_seek($offset, $whence = PGSQL_SEEK_SET) -+ { -+ return pg_lo_seek($this->loh, $offset, $whence); -+ } -+ -+ function stream_tell() -+ { -+ return pg_lo_tell($this->loh); -+ } -+ -+ function stream_eof() -+ { -+ return pg_lo_tell($this->loh) >= $this->size; -+ } -+ -+ function stream_flush() -+ { -+ return true; -+ } -+ -+ function stream_stat() -+ { -+ return array('size' => $this->size, 'ino' => $this->lon); -+ } -+ -+ function stream_write($data) -+ { -+ return pg_lo_write($this->loh, $data); -+ } -+ -+ function stream_close() -+ { -+ if (pg_lo_close($this->loh)) { -+ return pg_query($this->dbh, 'COMMIT'); -+ } else { -+ pg_query($this->dbh, 'ROLLBACK'); -+ return false; -+ } -+ } -+} -+ -+stream_register_wrapper('pglob', 'PgLobStream'); -+ -+?> ---- /dev/null -+++ b/ext/http/lib/XmlRpcClient.php -@@ -0,0 +1,119 @@ -+ -+ * __request->setOptions(array('compress' => true)); -+ * try { -+ * print_r($rpc->vpop->listdomain(array('domain' => 'example.com'))); -+ * } catch (Exception $ex) { -+ * echo $ex; -+ * } -+ * ?> -+ * -+ * -+ * @copyright Michael Wallner, -+ * @license BSD, revised -+ * @package pecl/http -+ * @version $Revision: 227268 $ -+ */ -+class XmlRpcClient -+{ -+ /** -+ * RPC namespace -+ * -+ * @var string -+ */ -+ public $__namespace; -+ -+ /** -+ * HttpRequest instance -+ * -+ * @var HttpRequest -+ */ -+ public $__request; -+ -+ /** -+ * Client charset -+ * -+ * @var string -+ */ -+ public $__encoding = "iso-8859-1"; -+ -+ /** -+ * RPC options -+ * -+ * @var array -+ */ -+ public $__options; -+ -+ /** -+ * Constructor -+ * -+ * @param string $url RPC endpoint -+ * @param string $namespace RPC namespace -+ * @param array $options HttpRequest options -+ */ -+ public function __construct($url, $namespace = '', array $options = null) -+ { -+ $this->__request = new HttpRequest($url, HttpRequest::METH_POST, (array) $options); -+ $this->__namespace = $namespace; -+ } -+ -+ /** -+ * RPC method proxy -+ * -+ * @param string $method RPC method name -+ * @param array $params RPC method arguments -+ * @return mixed decoded RPC response -+ * @throws Exception -+ */ -+ public function __call($method, array $params) -+ { -+ if (strlen($this->__namespace)) { -+ $method = $this->__namespace .'.'. $method; -+ } -+ $this->__request->setContentType("text/xml"); -+ $this->__request->setRawPostData( -+ xmlrpc_encode_request($method, $params, -+ array("encoding" => $this->__encoding) + (array) $this->__options)); -+ $response = $this->__request->send(); -+ if ($response->getResponseCode() != 200) { -+ throw new Exception( -+ $response->getResponseStatus(), -+ $response->getResponseCode() -+ ); -+ } -+ -+ $data = xmlrpc_decode($response->getBody(), $this->__encoding); -+ if (xmlrpc_is_fault($data)) { -+ throw new Exception( -+ (string) $data['faultString'], -+ (int) $data['faultCode'] -+ ); -+ } -+ -+ return $data; -+ } -+ -+ /** -+ * Returns self, where namespace is set to variable name -+ * -+ * @param string $ns -+ * @return XmlRpcRequest -+ */ -+ public function __get($ns) -+ { -+ $this->__namespace = $ns; -+ return $this; -+ } -+} -+ -+?> ---- /dev/null -+++ b/ext/http/lib/XmlRpcServer.php -@@ -0,0 +1,254 @@ -+ -+ * registerHandler(new Handler); -+ * XmlRpcServer::run(); -+ * } catch (Exception $ex) { -+ * XmlRpcServer::error($ex->getCode(), $ex->getMessage()); -+ * } -+ * -+ * -+ * @copyright Michael Wallner, -+ * @license BSD, revised -+ * @package pecl/http -+ * @version $Revision: 227268 $ -+ */ -+ -+class XmlRpcServer extends HttpResponse -+{ -+ /** -+ * Server charset -+ * -+ * @var string -+ */ -+ public static $encoding = "iso-8859-1"; -+ -+ /** -+ * RPC namespace -+ * -+ * @var string -+ */ -+ public $namespace; -+ -+ /** -+ * RPC handler attached to this server instance -+ * -+ * @var XmlRpcRequestHandler -+ */ -+ protected $handler; -+ -+ private static $xmlreq; -+ private static $xmlrpc; -+ private static $refcnt = 0; -+ private static $handle = array(); -+ -+ /** -+ * Create a new XmlRpcServer instance -+ * -+ * @param string $namespace -+ * @param string $encoding -+ */ -+ public function __construct($namespace) -+ { -+ $this->namespace = $namespace; -+ self::initialize(); -+ } -+ -+ /** -+ * Destructor -+ */ -+ public function __destruct() -+ { -+ if (self::$refcnt && !--self::$refcnt) { -+ xmlrpc_server_destroy(self::$xmlrpc); -+ } -+ } -+ -+ /** -+ * Static factory -+ * -+ * @param string $namespace -+ * @return XmlRpcServer -+ */ -+ public static function factory($namespace) -+ { -+ return new XmlRpcServer($namespace); -+ } -+ -+ /** -+ * Run all servers and send response -+ * -+ * @param array $options -+ */ -+ public static function run(array $options = null) -+ { -+ self::initialize(false, true); -+ self::setContentType("text/xml; charset=". self::$encoding); -+ echo xmlrpc_server_call_method(self::$xmlrpc, self::$xmlreq, null, -+ array("encoding" => self::$encoding) + (array) $options); -+ } -+ -+ /** -+ * Test hook; call instead of XmlRpcServer::run() -+ * -+ * @param string $method -+ * @param array $params -+ * @param array $request_options -+ * @param array $response_options -+ */ -+ public static function test($method, array $params, array $request_options = null, array $response_options = null) -+ { -+ self::$xmlreq = xmlrpc_encode_request($method, $params, $request_options); -+ self::run($response_options); -+ } -+ -+ /** -+ * Optional XMLRPC error handler -+ * -+ * @param int $code -+ * @param string $msg -+ */ -+ public static function error($code, $msg, array $options = null) -+ { -+ echo xmlrpc_encode(array("faultCode" => $code, "faultString" => $msg), -+ array("encoding" => self::$encoding) + (array) $options); -+ } -+ -+ /** -+ * Register a single method -+ * -+ * @param string $name -+ * @param mixed $callback -+ * @param mixed $dispatch -+ * @param array $spec -+ */ -+ public function registerMethod($name, $callback, $dispatch = null, array $spec = null) -+ { -+ if (!is_callable($callback, false, $cb_name)) { -+ throw new Exception("$cb_name is not a valid callback"); -+ } -+ if (isset($dispatch)) { -+ if (!is_callable($dispatch, false, $cb_name)) { -+ throw new Exception("$cb_name is not a valid callback"); -+ } -+ xmlrpc_server_register_method(self::$xmlrpc, $name, $dispatch); -+ self::$handle[$name] = $callback; -+ } else { -+ xmlrpc_server_register_method(self::$xmlrpc, $name, $callback); -+ } -+ -+ if (isset($spec)) { -+ xmlrpc_server_add_introspection_data(self::$xmlrpc, $spec); -+ } -+ } -+ -+ /** -+ * Register an XmlRpcRequestHandler for this server instance -+ * -+ * @param XmlRpcRequestHandler $handler -+ */ -+ public function registerHandler(XmlRpcRequestHandler $handler) -+ { -+ $this->handler = $handler; -+ -+ foreach (get_class_methods($handler) as $method) { -+ if (!strncmp($method, "xmlrpc", 6)) { -+ $this->registerMethod( -+ $this->method($method, $handler->getNamespace()), -+ array($handler, $method), array($this, "dispatch")); -+ } -+ } -+ -+ $handler->getIntrospectionData($spec); -+ if (is_array($spec)) { -+ xmlrpc_server_add_introspection_data(self::$xmlrpc, $spec); -+ } -+ } -+ -+ private function method($method, $namespace = null) -+ { -+ if (!strlen($namespace)) { -+ $namespace = strlen($this->namespace) ? $this->namespace : "xmlrpc"; -+ } -+ return $namespace .".". strtolower($method[6]) . substr($method, 7); -+ } -+ -+ private function dispatch($method, array $params = null) -+ { -+ if (array_key_exists($method, self::$handle)) { -+ return call_user_func(self::$handle[$method], $params); -+ } -+ throw new Exception("Unknown XMLRPC method: $method"); -+ } -+ -+ private static function initialize($server = true, $data = false) -+ { -+ if ($data) { -+ if (!self::$xmlreq && !(self::$xmlreq = http_get_request_body())) { -+ throw new Exception("Failed to fetch XMLRPC request body"); -+ } -+ } -+ if ($server) { -+ if (!self::$xmlrpc && !(self::$xmlrpc = xmlrpc_server_create())) { -+ throw new Exception("Failed to initialize XMLRPC server"); -+ } -+ ++self::$refcnt; -+ } -+ } -+} -+ -+/** -+ * XmlRpcRequestHandler -+ * -+ * Define XMLRPC methods with an "xmlrpc" prefix, eg: -+ * -+ * class IntOp implements XmlRpcRequestHandler { -+ * public function getNamespace() { -+ * return "int"; -+ * } -+ * public function getInstrospectionData(array &$spec = null) { -+ * } -+ * // XMLRPC method name: int.sumValues -+ * public function xmlrpcSumValues(array $values) { -+ * return array_sum($values); -+ * } -+ * } -+ * -+ */ -+interface XmlRpcRequestHandler -+{ -+ public function getNamespace(); -+ public function getIntrospectionData(array &$spec = null); -+} -+ -+/** -+ * XmlRpcRequestHandlerStub -+ */ -+abstract class XmlRpcRequestHandlerStub implements XmlRpcRequestHandler -+{ -+ public function getNamespace() -+ { -+ } -+ public function getIntrospectionData(array &$spec = null) -+ { -+ } -+} -+ -+?> ---- /dev/null -+++ b/ext/http/missing.c -@@ -0,0 +1,74 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: missing.c 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ -+#include "php.h" -+#include "missing.h" -+ -+#ifdef WONKY -+int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC) -+{ -+ zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS); -+ INIT_PZVAL(property); -+ ZVAL_DOUBLE(property, value); -+ return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); -+} -+ -+void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC) -+{ -+ zval *tmp = ecalloc(1, sizeof(zval)); -+ ZVAL_DOUBLE(tmp, value); -+ zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); -+} -+ -+int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC) -+{ -+ zval *property = pemalloc(sizeof(zval), ce->type & ZEND_INTERNAL_CLASS); -+ INIT_PZVAL(property); -+ ZVAL_BOOL(property, value); -+ return zend_declare_property(ce, name, name_length, property, access_type TSRMLS_CC); -+} -+ -+void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC) -+{ -+ zval *tmp = ecalloc(1, sizeof(zval)); -+ ZVAL_BOOL(tmp, value); -+ zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); -+} -+ -+void zend_update_property_stringl(zend_class_entry *scope, zval *object, char *name, int name_length, char *value, int value_len TSRMLS_DC) -+{ -+ zval *tmp; -+ -+ ALLOC_ZVAL(tmp); -+ tmp->is_ref = 0; -+ tmp->refcount = 0; -+ ZVAL_STRINGL(tmp, value, value_len, 1); -+ zend_update_property(scope, object, name, name_length, tmp TSRMLS_CC); -+} -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/missing.h -@@ -0,0 +1,180 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: missing.h 298892 2010-05-03 08:29:31Z mike $ */ -+ -+#ifndef PHP_HTTP_MISSING -+#define PHP_HTTP_MISSING -+ -+#include "php_version.h" -+ -+#if defined(PHP_VERSION_ID) && (PHP_VERSION_ID >= 50399) -+# define ZEND_LITERAL_KEY_DC , const zend_literal *_zend_literal_key -+# define ZEND_LITERAL_KEY_CC , _zend_literal_key -+# define ZEND_LITERAL_NIL_CC , NULL -+# define HTTP_CHECK_OPEN_BASEDIR(file, act) \ -+ if ((PG(open_basedir) && *PG(open_basedir))) \ -+ { \ -+ const char *tmp = file; \ -+ \ -+ if (!strncasecmp(tmp, "file:", lenof("file:"))) { \ -+ tmp += lenof("file:"); \ -+ while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \ -+ } \ -+ \ -+ if ( (tmp != file || !strstr(file, "://")) && \ -+ (!*tmp || php_check_open_basedir(tmp TSRMLS_CC))) { \ -+ act; \ -+ } \ -+ } -+ -+#else -+# define ZEND_LITERAL_KEY_DC -+# define ZEND_LITERAL_KEY_CC -+# define ZEND_LITERAL_NIL_CC -+# define HTTP_CHECK_OPEN_BASEDIR(file, act) \ -+ if ((PG(open_basedir) && *PG(open_basedir)) || PG(safe_mode)) \ -+ { \ -+ const char *tmp = file; \ -+ \ -+ if (!strncasecmp(tmp, "file:", lenof("file:"))) { \ -+ tmp += lenof("file:"); \ -+ while ((tmp - (const char *)file < 7) && (*tmp == '/' || *tmp == '\\')) ++tmp; \ -+ } \ -+ \ -+ if ( (tmp != file || !strstr(file, "://")) && \ -+ (!*tmp || php_check_open_basedir(tmp TSRMLS_CC) || \ -+ (PG(safe_mode) && !php_checkuid(tmp, "rb+", CHECKUID_CHECK_MODE_PARAM)))) { \ -+ act; \ -+ } \ -+ } -+ -+#endif -+ -+#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION >= 3) -+# define HTTP_ZAPI_HASH_TSRMLS_CC TSRMLS_CC -+# define HTTP_ZAPI_HASH_TSRMLS_DC TSRMLS_DC -+# define HTTP_ZAPI_CONST_CAST(t) (const t) -+# define GLOBAL_ERROR_HANDLING EG(error_handling) -+# define GLOBAL_EXCEPTION_CLASS EG(exception_class) -+# define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp) TSRMLS_CC) -+# define HTTP_STATIC_ARG_INFO -+#else -+# define HTTP_ZAPI_HASH_TSRMLS_CC -+# define HTTP_ZAPI_HASH_TSRMLS_DC -+# define HTTP_ZAPI_CONST_CAST(t) (t) -+# define GLOBAL_ERROR_HANDLING PG(error_handling) -+# define GLOBAL_EXCEPTION_CLASS PG(exception_class) -+# define IS_CALLABLE(cb_zv, flags, cb_sp) zend_is_callable((cb_zv), (flags), (cb_sp)) -+# define HTTP_STATIC_ARG_INFO static -+#endif -+ -+#if (PHP_MAJOR_VERSION == 5) && (PHP_MINOR_VERSION == 0) -+# define WONKY -+#endif -+ -+#ifndef pemalloc_rel -+# define pemalloc_rel(size, persistent) ((persistent)?malloc(size):emalloc_rel(size)) -+#endif -+ -+#ifndef ZEND_ACC_DEPRECATED -+# define ZEND_ACC_DEPRECATED 0 -+#endif -+ -+#if PHP_MAJOR_VERSION == 4 && PHP_MINOR_VERSION == 3 && PHP_RELEASE_VERSION < 10 -+# define php_url_parse_ex(u, l) php_url_parse(u) -+#endif -+ -+#ifndef TSRMLS_FETCH_FROM_CTX -+# ifdef ZTS -+# define TSRMLS_FETCH_FROM_CTX(ctx) void ***tsrm_ls = (void ***) ctx -+# else -+# define TSRMLS_FETCH_FROM_CTX(ctx) -+# endif -+#endif -+ -+#ifndef TSRMLS_SET_CTX -+# ifdef ZTS -+# define TSRMLS_SET_CTX(ctx) ctx = (void ***) tsrm_ls -+# else -+# define TSRMLS_SET_CTX(ctx) -+# endif -+#endif -+ -+#ifndef ZVAL_ADDREF -+# define ZVAL_ADDREF Z_ADDREF_P -+#endif -+ -+#ifndef SEPARATE_ARG_IF_REF -+#define SEPARATE_ARG_IF_REF(zv) \ -+ if (PZVAL_IS_REF(zv)) { \ -+ zval *ov = zv; \ -+ ALLOC_INIT_ZVAL(zv); \ -+ Z_TYPE_P(zv) = Z_TYPE_P(ov); \ -+ zv->value = ov->value; \ -+ zval_copy_ctor(zv); \ -+ } else { \ -+ ZVAL_ADDREF(zv); \ -+ } -+#endif -+ -+#ifndef ZVAL_ZVAL -+#define ZVAL_ZVAL(z, zv, copy, dtor) { \ -+ int is_ref, refcount; \ -+ is_ref = (z)->is_ref; \ -+ refcount = (z)->refcount; \ -+ *(z) = *(zv); \ -+ if (copy) { \ -+ zval_copy_ctor(z); \ -+ } \ -+ if (dtor) { \ -+ if (!copy) { \ -+ ZVAL_NULL(zv); \ -+ } \ -+ zval_ptr_dtor(&zv); \ -+ } \ -+ (z)->is_ref = is_ref; \ -+ (z)->refcount = refcount; \ -+ } -+#endif -+#ifndef RETVAL_ZVAL -+# define RETVAL_ZVAL(zv, copy, dtor) ZVAL_ZVAL(return_value, zv, copy, dtor) -+#endif -+#ifndef RETURN_ZVAL -+# define RETURN_ZVAL(zv, copy, dtor) { RETVAL_ZVAL(zv, copy, dtor); return; } -+#endif -+ -+#ifndef ZEND_MN -+# define ZEND_MN(name) ZEND_FN(name) -+#endif -+ -+#ifdef WONKY -+extern int zend_declare_property_double(zend_class_entry *ce, char *name, int name_length, double value, int access_type TSRMLS_DC); -+extern void zend_update_property_double(zend_class_entry *scope, zval *object, char *name, int name_length, double value TSRMLS_DC); -+ -+extern int zend_declare_property_bool(zend_class_entry *ce, char *name, int name_length, long value, int access_type TSRMLS_DC); -+extern void zend_update_property_bool(zend_class_entry *scope, zval *object, char *name, int name_length, long value TSRMLS_DC); -+ -+extern void zend_update_property_stringl(zend_class_entry *scope, zval *object, char *name, int name_length, char *value, int value_len TSRMLS_DC); -+#endif -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http.h -@@ -0,0 +1,262 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http.h 310776 2011-05-05 06:35:46Z mike $ */ -+ -+#ifndef PHP_EXT_HTTP_H -+#define PHP_EXT_HTTP_H -+ -+#define PHP_HTTP_VERSION "1.7.1" -+ -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#else -+# ifndef PHP_WIN32 -+# include "php_config.h" -+# endif -+#endif -+ -+#include "php.h" -+#include "missing.h" -+#include "php_http_std_defs.h" -+#include "phpstr/phpstr.h" -+ -+#ifdef HTTP_WANT_SAPI -+# if PHP_API_VERSION > 20041225 -+# define HTTP_HAVE_SAPI_RTIME -+# endif -+# include "SAPI.h" -+#endif -+ -+#ifdef HTTP_WANT_NETDB -+# ifdef PHP_WIN32 -+# define HTTP_HAVE_NETDB -+# include -+# elif defined(HAVE_NETDB_H) -+# define HTTP_HAVE_NETDB -+# include -+# ifdef HAVE_UNISTD_H -+# include -+# endif -+# endif -+#endif -+ -+#if defined(HTTP_WANT_CURL) && defined(HTTP_HAVE_CURL) -+# ifdef PHP_WIN32 -+# include -+# define CURL_STATICLIB -+# endif -+# include -+# define HTTP_CURL_VERSION(x, y, z) (LIBCURL_VERSION_NUM >= (((x)<<16) + ((y)<<8) + (z))) -+# -+# if defined(HTTP_WANT_EVENT) && defined(HTTP_HAVE_EVENT) -+# include -+# endif -+#endif -+ -+#if defined(HTTP_WANT_MAGIC) && defined(HTTP_HAVE_MAGIC) -+# if defined(PHP_WIN32) && !defined(USE_MAGIC_DLL) && !defined(USE_MAGIC_STATIC) -+# define USE_MAGIC_STATIC -+# endif -+# include -+#endif -+ -+#if defined(HTTP_WANT_ZLIB) && defined(HTTP_HAVE_ZLIB) -+# include -+#endif -+ -+#include -+#define HTTP_IS_CTYPE(type, c) is##type((int) (unsigned char) (c)) -+#define HTTP_TO_CTYPE(type, c) to##type((int) (unsigned char) (c)) -+ -+extern zend_module_entry http_module_entry; -+#define phpext_http_ptr &http_module_entry -+ -+extern int http_module_number; -+ -+ZEND_BEGIN_MODULE_GLOBALS(http) -+ -+ struct _http_globals_etag { -+ char *mode; -+ void *ctx; -+ zend_bool started; -+ } etag; -+ -+ struct _http_globals_log { -+ char *cache; -+ char *redirect; -+ char *not_found; -+ char *allowed_methods; -+ char *composite; -+ } log; -+ -+ struct _http_globals_send { -+ double throttle_delay; -+ size_t buffer_size; -+ char *content_type; -+ char *unquoted_etag; -+ time_t last_modified; -+ struct _http_globals_send_deflate { -+ zend_bool response; -+ zend_bool start_auto; -+ long start_flags; -+ int encoding; -+ void *stream; -+ } deflate; -+ struct _http_globals_send_inflate { -+ zend_bool start_auto; -+ long start_flags; -+ void *stream; -+ } inflate; -+ zend_bool not_found_404; -+ } send; -+ -+ struct _http_globals_request { -+ time_t time; -+ HashTable *headers; -+ struct _http_globals_request_methods { -+ HashTable registered; -+ char *allowed; -+ char *custom; -+ } methods; -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_CURL) -+ struct _http_globals_request_datashare { -+ zend_llist handles; -+ zend_bool cookie; -+ zend_bool dns; -+ zend_bool ssl; -+ zend_bool connect; -+ } datashare; -+#endif -+#if defined(ZEND_ENGINE_2) && defined(HTTP_HAVE_EVENT) -+ struct _http_globals_request_pool { -+ struct _http_globals_request_pool_event { -+ void *base; -+ } event; -+ } pool; -+#endif -+ } request; -+ -+ struct _http_globals_persistent { -+ struct _http_globals_persistent_handles { -+ ulong limit; -+ struct _http_globals_persistent_handles_ident { -+ ulong h; -+ char *s; -+ size_t l; -+ } ident; -+ } handles; -+ } persistent; -+ -+#ifdef ZEND_ENGINE_2 -+ zend_bool only_exceptions; -+#endif -+ -+ zend_bool force_exit; -+ zend_bool read_post_data; -+ zval *server_var; -+ -+ZEND_END_MODULE_GLOBALS(http) -+ -+ZEND_EXTERN_MODULE_GLOBALS(http); -+ -+#ifdef ZTS -+# include "TSRM.h" -+# define HTTP_G ((zend_http_globals *) (*((void ***) tsrm_ls))[TSRM_UNSHUFFLE_RSRC_ID(http_globals_id)]) -+#else -+# define HTTP_G (&http_globals) -+#endif -+ -+#if defined(HAVE_ICONV) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_ICONV)) -+# define HTTP_HAVE_ICONV -+#endif -+ -+#if defined(HAVE_PHP_SESSION) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_SESSION)) -+# define HTTP_HAVE_SESSION -+#endif -+ -+#if defined(HAVE_HASH_EXT) && (HTTP_SHARED_DEPS || !defined(COMPILE_DL_HASH)) && defined(HTTP_HAVE_PHP_HASH_H) -+# define HTTP_HAVE_HASH -+#endif -+ -+#if defined(HAVE_SPL) -+# define HTTP_HAVE_SPL -+#endif -+ -+PHP_FUNCTION(http_date); -+PHP_FUNCTION(http_build_url); -+PHP_FUNCTION(http_build_str); -+PHP_FUNCTION(http_negotiate_language); -+PHP_FUNCTION(http_negotiate_charset); -+PHP_FUNCTION(http_negotiate_content_type); -+PHP_FUNCTION(http_negotiate); -+PHP_FUNCTION(http_redirect); -+PHP_FUNCTION(http_throttle); -+PHP_FUNCTION(http_send_status); -+PHP_FUNCTION(http_send_last_modified); -+PHP_FUNCTION(http_send_content_type); -+PHP_FUNCTION(http_send_content_disposition); -+PHP_FUNCTION(http_match_modified); -+PHP_FUNCTION(http_match_etag); -+PHP_FUNCTION(http_cache_last_modified); -+PHP_FUNCTION(http_cache_etag); -+PHP_FUNCTION(http_send_data); -+PHP_FUNCTION(http_send_file); -+PHP_FUNCTION(http_send_stream); -+PHP_FUNCTION(http_chunked_decode); -+PHP_FUNCTION(http_parse_message); -+PHP_FUNCTION(http_parse_headers); -+PHP_FUNCTION(http_parse_cookie); -+PHP_FUNCTION(http_build_cookie); -+PHP_FUNCTION(http_parse_params); -+PHP_FUNCTION(http_get_request_headers); -+PHP_FUNCTION(http_get_request_body); -+PHP_FUNCTION(http_get_request_body_stream); -+PHP_FUNCTION(http_match_request_header); -+PHP_FUNCTION(http_persistent_handles_count); -+PHP_FUNCTION(http_persistent_handles_clean); -+PHP_FUNCTION(http_persistent_handles_ident); -+#ifdef HTTP_HAVE_CURL -+PHP_FUNCTION(http_get); -+PHP_FUNCTION(http_head); -+PHP_FUNCTION(http_post_data); -+PHP_FUNCTION(http_post_fields); -+PHP_FUNCTION(http_put_data); -+PHP_FUNCTION(http_put_file); -+PHP_FUNCTION(http_put_stream); -+PHP_FUNCTION(http_request); -+PHP_FUNCTION(http_request_body_encode); -+#endif /* HTTP_HAVE_CURL */ -+PHP_FUNCTION(http_request_method_register); -+PHP_FUNCTION(http_request_method_unregister); -+PHP_FUNCTION(http_request_method_exists); -+PHP_FUNCTION(http_request_method_name); -+PHP_FUNCTION(ob_etaghandler); -+#ifdef HTTP_HAVE_ZLIB -+PHP_FUNCTION(http_deflate); -+PHP_FUNCTION(http_inflate); -+PHP_FUNCTION(ob_deflatehandler); -+PHP_FUNCTION(ob_inflatehandler); -+#endif -+PHP_FUNCTION(http_support); -+ -+#endif /* PHP_HTTP_H */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_api.h -@@ -0,0 +1,318 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_api.h 298891 2010-05-03 08:26:38Z mike $ */ -+ -+#ifndef PHP_HTTP_API_H -+#define PHP_HTTP_API_H -+ -+#define HTTP_SUPPORT 0x01L -+#define HTTP_SUPPORT_REQUESTS 0x02L -+#define HTTP_SUPPORT_MAGICMIME 0x04L -+#define HTTP_SUPPORT_ENCODINGS 0x08L -+#define HTTP_SUPPORT_SSLREQUESTS 0x20L -+#define HTTP_SUPPORT_PERSISTENCE 0x40L -+#define HTTP_SUPPORT_EVENTS 0x80L -+ -+#define HTTP_PARAMS_ALLOW_COMMA 0x01 -+#define HTTP_PARAMS_ALLOW_FAILURE 0x02 -+#define HTTP_PARAMS_RAISE_ERROR 0x04 -+#define HTTP_PARAMS_DEFAULT (HTTP_PARAMS_ALLOW_COMMA|HTTP_PARAMS_ALLOW_FAILURE|HTTP_PARAMS_RAISE_ERROR) -+#define HTTP_PARAMS_COLON_SEPARATOR 0x10 -+ -+extern PHP_MINIT_FUNCTION(http_support); -+ -+#define http_support(f) _http_support(f) -+PHP_HTTP_API long _http_support(long feature); -+ -+#define pretty_key(key, key_len, uctitle, xhyphen) _http_pretty_key(key, key_len, uctitle, xhyphen) -+extern char *_http_pretty_key(char *key, size_t key_len, zend_bool uctitle, zend_bool xhyphen); -+ -+#define http_boundary(b, l) _http_boundary((b), (l) TSRMLS_CC) -+extern size_t _http_boundary(char *buf, size_t len TSRMLS_DC); -+ -+#define http_error(type, code, string) _http_error_ex(type, code, "%s", string) -+#define http_error_ex _http_error_ex -+extern void _http_error_ex(long type TSRMLS_DC, long code, const char *format, ...); -+ -+ -+#ifdef ZEND_ENGINE_2 -+#define http_exception_wrap(o, n, ce) _http_exception_wrap((o), (n), (ce) TSRMLS_CC) -+extern zval *_http_exception_wrap(zval *old_exception, zval *new_exception, zend_class_entry *ce TSRMLS_DC); -+ -+#define http_try \ -+{ \ -+ zval *old_exception = EG(exception); \ -+ EG(exception) = NULL; -+#define http_catch(ex_ce) \ -+ if (EG(exception) && old_exception) { \ -+ EG(exception) = http_exception_wrap(old_exception, EG(exception), ex_ce); \ -+ } \ -+} -+#define http_final(ex_ce) \ -+ if (EG(exception)) { \ -+ EG(exception) = http_exception_wrap(EG(exception), NULL, ex_ce); \ -+ } -+ -+typedef zend_object_value (*http_object_new_t)(zend_class_entry *ce, void *, void ** TSRMLS_DC); -+ -+#define http_object_new(ov, cn, cl, co, ce, i, pp) _http_object_new((ov), (cn), (cl), (http_object_new_t) (co), (ce), (i), (void *) (pp) TSRMLS_CC) -+extern STATUS _http_object_new(zend_object_value *ov, const char *cname_str, uint cname_len, http_object_new_t create, zend_class_entry *parent_ce, void *intern_ptr, void **obj_ptr TSRMLS_DC); -+#endif /* ZEND_ENGINE_2 */ -+ -+ -+#define HTTP_CHECK_CURL_INIT(ch, init, action) \ -+ if ((!(ch)) && (!((ch) = init))) { \ -+ http_error(HE_WARNING, HTTP_E_REQUEST, "Could not initialize curl"); \ -+ action; \ -+ } -+#define HTTP_CHECK_CONTENT_TYPE(ct, action) \ -+ if (!strchr((ct), '/')) { \ -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, \ -+ "Content type \"%s\" does not seem to contain a primary and a secondary part", (ct)); \ -+ action; \ -+ } -+#define HTTP_CHECK_MESSAGE_TYPE_RESPONSE(msg, action) \ -+ if (!HTTP_MSG_TYPE(RESPONSE, (msg))) { \ -+ http_error(HE_NOTICE, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_RESPONSE"); \ -+ action; \ -+ } -+#define HTTP_CHECK_MESSAGE_TYPE_REQUEST(msg, action) \ -+ if (!HTTP_MSG_TYPE(REQUEST, (msg))) { \ -+ http_error(HE_NOTICE, HTTP_E_MESSAGE_TYPE, "HttpMessage is not of type HTTP_MSG_REQUEST"); \ -+ action; \ -+ } -+#define HTTP_CHECK_GZIP_LEVEL(level, action) \ -+ if (level < -1 || level > 9) { \ -+ http_error_ex(HE_WARNING, HTTP_E_INVALID_PARAM, "Invalid compression level (-1 to 9): %d", level); \ -+ action; \ -+ } -+ -+#define HTTP_CHECK_HEADERS_SENT(action) \ -+ if (SG(headers_sent) && !SG(request_info).no_headers) { \ -+ char *output_start_filename = php_get_output_start_filename(TSRMLS_C); \ -+ int output_start_lineno = php_get_output_start_lineno(TSRMLS_C); \ -+ \ -+ if (output_start_filename) { \ -+ http_error_ex(HE_WARNING, HTTP_E_HEADER, "Cannot modify header information - headers already sent by (output started at %s:%d)", \ -+ output_start_filename, output_start_lineno); \ -+ } else { \ -+ http_error(HE_WARNING, HTTP_E_HEADER, "Cannot modify header information - headers already sent"); \ -+ } \ -+ action; \ -+ } -+ -+#define http_log(f, i, m) _http_log_ex((f), (i), (m) TSRMLS_CC) -+extern void _http_log_ex(char *file, const char *ident, const char *message TSRMLS_DC); -+ -+#define http_exit(s, h) http_exit_ex((s), (h), NULL, 1) -+#define http_exit_ex(s, h, b, e) _http_exit_ex((s), (h), (b), (e) TSRMLS_CC) -+extern STATUS _http_exit_ex(int status, char *header, char *body, zend_bool send_header TSRMLS_DC); -+ -+#define http_check_method(m) http_check_method_ex((m), HTTP_KNOWN_METHODS) -+#define http_check_method_ex(m, a) _http_check_method_ex((m), (a)) -+extern STATUS _http_check_method_ex(const char *method, const char *methods); -+ -+#define http_got_server_var(v) (NULL != http_get_server_var_ex((v), strlen(v), 1)) -+#define http_get_server_var(v, c) http_get_server_var_ex((v), strlen(v), (c)) -+#define http_get_server_var_ex(v, l, c) _http_get_server_var_ex((v), (l), (c) TSRMLS_CC) -+PHP_HTTP_API zval *_http_get_server_var_ex(const char *key, size_t key_len, zend_bool check TSRMLS_DC); -+ -+#define http_get_request_body(b, l) _http_get_request_body_ex((b), (l), 1 TSRMLS_CC) -+#define http_get_request_body_ex(b, l, d) _http_get_request_body_ex((b), (l), (d) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_get_request_body_ex(char **body, size_t *length, zend_bool dup TSRMLS_DC); -+ -+#define http_get_request_body_stream() _http_get_request_body_stream(TSRMLS_C) -+PHP_HTTP_API php_stream *_http_get_request_body_stream(TSRMLS_D); -+ -+ -+typedef void (*http_parse_params_callback)(void *cb_arg, const char *key, int keylen, const char *val, int vallen TSRMLS_DC); -+ -+#define http_parse_params_default_callback _http_parse_params_default_callback -+PHP_HTTP_API void _http_parse_params_default_callback(void *ht, const char *key, int keylen, const char *val, int vallen TSRMLS_DC); -+ -+#define http_parse_params(s, f, ht) _http_parse_params_ex((s), (f), _http_parse_params_default_callback, (ht) TSRMLS_CC) -+#define http_parse_params_ex(s, f, cb, a) _http_parse_params_ex((s), (f), (cb), (a) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_parse_params_ex(const char *params, int flags, http_parse_params_callback cb, void *cb_arg TSRMLS_DC); -+ -+ -+#define http_sleep(s) _http_sleep(s) -+static inline void _http_sleep(double s) -+{ -+#define HTTP_DIFFSEC (0.001) -+#define HTTP_MLLISEC (1000) -+#define HTTP_MCROSEC (1000 * 1000) -+#define HTTP_NANOSEC (1000 * 1000 * 1000) -+#define HTTP_MSEC(s) ((long)(s * HTTP_MLLISEC)) -+#define HTTP_USEC(s) ((long)(s * HTTP_MCROSEC)) -+#define HTTP_NSEC(s) ((long)(s * HTTP_NANOSEC)) -+ -+#if defined(PHP_WIN32) -+ Sleep((DWORD) HTTP_MSEC(s)); -+#elif defined(HAVE_USLEEP) -+ usleep(HTTP_USEC(s)); -+#elif defined(HAVE_NANOSLEEP) -+ struct timespec req, rem; -+ -+ req.tv_sec = (time_t) s; -+ req.tv_nsec = HTTP_NSEC(s) % HTTP_NANOSEC; -+ -+ while (nanosleep(&req, &rem) && (errno == EINTR) && (HTTP_NSEC(rem.tv_sec) + rem.tv_nsec) > HTTP_NSEC(HTTP_DIFFSEC))) { -+ req.tv_sec = rem.tv_sec; -+ req.tv_nsec = rem.tv_nsec; -+ } -+#else -+ struct timeval timeout; -+ -+ timeout.tv.sec = (time_t) s; -+ timeout.tv_usec = HTTP_USEC(s) % HTTP_MCROSEC; -+ -+ select(0, NULL, NULL, NULL, &timeout); -+#endif -+} -+ -+#define http_locate_str _http_locate_str -+static inline const char *_http_locate_str(const char *h, size_t h_len, const char *n, size_t n_len) -+{ -+ const char *p, *e; -+ -+ if (n_len && h_len) { -+ e = h + h_len; -+ do { -+ if (*h == *n) { -+ for (p = n; *p == h[p-n]; ++p) { -+ if (p == n+n_len-1) { -+ return h; -+ } -+ } -+ } -+ } while (h++ != e); -+ } -+ -+ return NULL; -+} -+ -+#define http_locate_body _http_locate_body -+static inline const char *_http_locate_body(const char *message) -+{ -+ const char *body = NULL, *msg = message; -+ -+ while (*msg) { -+ if (*msg == '\n') { -+ if (*(msg+1) == '\n') { -+ body = msg + 2; -+ break; -+ } else if (*(msg+1) == '\r' && *(msg+2) == '\n') { -+ body = msg + 3; -+ break; -+ } -+ } -+ ++msg; -+ } -+ return body; -+} -+ -+#define http_locate_eol _http_locate_eol -+static inline const char *_http_locate_eol(const char *line, int *eol_len) -+{ -+ const char *eol = strpbrk(line, "\r\n"); -+ -+ if (eol_len) { -+ *eol_len = eol ? ((eol[0] == '\r' && eol[1] == '\n') ? 2 : 1) : 0; -+ } -+ return eol; -+} -+ -+#define http_zset(t, z) _http_zset((t), (z)) -+static inline zval *_http_zset(int type, zval *z) -+{ -+ if (Z_TYPE_P(z) != type) { -+ switch (type) { -+ case IS_NULL: convert_to_null(z); break; -+ case IS_BOOL: convert_to_boolean(z); break; -+ case IS_LONG: convert_to_long(z); break; -+ case IS_DOUBLE: convert_to_double(z); break; -+ case IS_STRING: convert_to_string(z); break; -+ case IS_ARRAY: convert_to_array(z); break; -+ case IS_OBJECT: convert_to_object(z); break; -+ } -+ } -+ return z; -+} -+#define http_zsep(t, z) _http_zsep_ex((t), (z), NULL) -+#define http_zsep_ex(t, z, p) _http_zsep_ex((t), (z), (p)) -+static inline zval *_http_zsep_ex(int type, zval *z, zval **p) { -+ SEPARATE_ARG_IF_REF(z); -+ if (Z_TYPE_P(z) != type) { -+ switch (type) { -+ case IS_NULL: convert_to_null_ex(&z); break; -+ case IS_BOOL: convert_to_boolean_ex(&z); break; -+ case IS_LONG: convert_to_long_ex(&z); break; -+ case IS_DOUBLE: convert_to_double_ex(&z); break; -+ case IS_STRING: convert_to_string_ex(&z); break; -+ case IS_ARRAY: convert_to_array_ex(&z); break; -+ case IS_OBJECT: convert_to_object_ex(&z); break; -+ } -+ } -+ if (p) { -+ *p = z; -+ } -+ return z; -+} -+ -+typedef struct _HashKey { -+ char *str; -+ uint len; -+ ulong num; -+ uint dup:1; -+ uint type:31; -+} HashKey; -+#define initHashKey(dup) {NULL, 0, 0, (dup), 0} -+ -+#define FOREACH_VAL(pos, array, val) FOREACH_HASH_VAL(pos, Z_ARRVAL_P(array), val) -+#define FOREACH_HASH_VAL(pos, hash, val) \ -+ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ -+ zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \ -+ zend_hash_move_forward_ex(hash, &pos)) -+ -+#define FOREACH_KEY(pos, array, key) FOREACH_HASH_KEY(pos, Z_ARRVAL_P(array), key) -+#define FOREACH_HASH_KEY(pos, hash, _key) \ -+ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ -+ ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (zend_bool) (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT; \ -+ zend_hash_move_forward_ex(hash, &pos)) \ -+ -+#define FOREACH_KEYVAL(pos, array, key, val) FOREACH_HASH_KEYVAL(pos, Z_ARRVAL_P(array), key, val) -+#define FOREACH_HASH_KEYVAL(pos, hash, _key, val) \ -+ for ( zend_hash_internal_pointer_reset_ex(hash, &pos); \ -+ ((_key).type = zend_hash_get_current_key_ex(hash, &(_key).str, &(_key).len, &(_key).num, (zend_bool) (_key).dup, &pos)) != HASH_KEY_NON_EXISTANT && \ -+ zend_hash_get_current_data_ex(hash, (void *) &val, &pos) == SUCCESS; \ -+ zend_hash_move_forward_ex(hash, &pos)) -+ -+#define array_copy(src, dst) zend_hash_copy(dst, src, (copy_ctor_func_t) zval_add_ref, NULL, sizeof(zval *)) -+#define ARRAY_JOIN_STRONLY 1 -+#define ARRAY_JOIN_PRETTIFY 2 -+#define array_join(src, dst, append, flags) zend_hash_apply_with_arguments(src HTTP_ZAPI_HASH_TSRMLS_CC, (append)?apply_array_append_func:apply_array_merge_func, 2, dst, (int)flags) -+ -+extern int apply_array_append_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key); -+extern int apply_array_merge_func(void *pDest HTTP_ZAPI_HASH_TSRMLS_DC, int num_args, va_list args, zend_hash_key *hash_key); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_cache_api.h -@@ -0,0 +1,162 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_cache_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_CACHE_API_H -+#define PHP_HTTP_CACHE_API_H -+ -+#include "php_http_send_api.h" -+ -+#include "ext/standard/crc32.h" -+#include "ext/standard/sha1.h" -+#include "ext/standard/md5.h" -+ -+#ifdef HTTP_HAVE_HASH -+# include "php_hash.h" -+#endif -+ -+#define http_etag_digest(d, l) _http_etag_digest((d), (l)) -+static inline char *_http_etag_digest(const unsigned char *digest, int len) -+{ -+ static const char hexdigits[17] = "0123456789abcdef"; -+ int i; -+ char *hex = emalloc(len * 2 + 1); -+ char *ptr = hex; -+ -+ for (i = 0; i < len; ++i) { -+ *ptr++ = hexdigits[digest[i] >> 4]; -+ *ptr++ = hexdigits[digest[i] & 0xF]; -+ } -+ *ptr = '\0'; -+ -+ return hex; -+} -+ -+#define http_etag_init() _http_etag_init(TSRMLS_C) -+static inline void *_http_etag_init(TSRMLS_D) -+{ -+ void *ctx = NULL; -+ char *mode = HTTP_G->etag.mode; -+ -+#ifdef HTTP_HAVE_HASH -+ const php_hash_ops *eho = NULL; -+ -+ if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) { -+ ctx = emalloc(eho->context_size); -+ eho->hash_init(ctx); -+ } else -+#endif -+ if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) { -+ ctx = emalloc(sizeof(uint)); -+ *((uint *) ctx) = ~0; -+ } else if (mode && !strcasecmp(mode, "sha1")) { -+ PHP_SHA1Init(ctx = emalloc(sizeof(PHP_SHA1_CTX))); -+ } else { -+ PHP_MD5Init(ctx = emalloc(sizeof(PHP_MD5_CTX))); -+ } -+ -+ return ctx; -+} -+ -+#define http_etag_finish(c) _http_etag_finish((c) TSRMLS_CC) -+static inline char *_http_etag_finish(void *ctx TSRMLS_DC) -+{ -+ unsigned char digest[128] = {0}; -+ char *etag = NULL, *mode = HTTP_G->etag.mode; -+ -+#ifdef HTTP_HAVE_HASH -+ const php_hash_ops *eho = NULL; -+ -+ if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) { -+ eho->hash_final(digest, ctx); -+ etag = http_etag_digest(digest, eho->digest_size); -+ } else -+#endif -+ if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) { -+ *((uint *) ctx) = ~*((uint *) ctx); -+ etag = http_etag_digest((const unsigned char *) ctx, sizeof(uint)); -+ } else if (mode && (!strcasecmp(mode, "sha1"))) { -+ PHP_SHA1Final(digest, ctx); -+ etag = http_etag_digest(digest, 20); -+ } else { -+ PHP_MD5Final(digest, ctx); -+ etag = http_etag_digest(digest, 16); -+ } -+ efree(ctx); -+ -+ return etag; -+} -+ -+#define http_etag_update(c, d, l) _http_etag_update((c), (d), (l) TSRMLS_CC) -+static inline void _http_etag_update(void *ctx, const char *data_ptr, size_t data_len TSRMLS_DC) -+{ -+ char *mode = HTTP_G->etag.mode; -+#ifdef HTTP_HAVE_HASH -+ const php_hash_ops *eho = NULL; -+ -+ if (mode && (eho = php_hash_fetch_ops(mode, strlen(mode)))) { -+ eho->hash_update(ctx, (const unsigned char *) data_ptr, data_len); -+ } else -+#endif -+ if (mode && ((!strcasecmp(mode, "crc32")) || (!strcasecmp(mode, "crc32b")))) { -+ uint i, c = *((uint *) ctx); -+ for (i = 0; i < data_len; ++i) { -+ CRC32(c, data_ptr[i]); -+ } -+ *((uint *)ctx) = c; -+ } else if (mode && (!strcasecmp(mode, "sha1"))) { -+ PHP_SHA1Update(ctx, (const unsigned char *) data_ptr, data_len); -+ } else { -+ PHP_MD5Update(ctx, (const unsigned char *) data_ptr, data_len); -+ } -+} -+ -+#define http_ob_etaghandler(o, l, ho, hl, m) _http_ob_etaghandler((o), (l), (ho), (hl), (m) TSRMLS_CC) -+extern void _http_ob_etaghandler(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC); -+ -+#define http_etag(p, l, m) _http_etag((p), (l), (m) TSRMLS_CC) -+PHP_HTTP_API char *_http_etag(const void *data_ptr, size_t data_len, http_send_mode data_mode TSRMLS_DC); -+ -+#define http_last_modified(p, m) _http_last_modified((p), (m) TSRMLS_CC) -+PHP_HTTP_API time_t _http_last_modified(const void *data_ptr, http_send_mode data_mode TSRMLS_DC); -+ -+#define http_match_last_modified(entry, modified) _http_match_last_modified_ex((entry), (modified), 1 TSRMLS_CC) -+#define http_match_last_modified_ex(entry, modified, ep) _http_match_last_modified_ex((entry), (modified), (ep) TSRMLS_CC) -+PHP_HTTP_API zend_bool _http_match_last_modified_ex(const char *entry, time_t t, zend_bool enforce_presence TSRMLS_DC); -+ -+#define http_match_etag(entry, etag) _http_match_etag_ex((entry), (etag), 1 TSRMLS_CC) -+#define http_match_etag_ex(entry, etag, ep) _http_match_etag_ex((entry), (etag), (ep) TSRMLS_CC) -+PHP_HTTP_API zend_bool _http_match_etag_ex(const char *entry, const char *etag, zend_bool enforce_presence TSRMLS_DC); -+ -+#define http_cache_last_modified(l, s, cc, ccl) _http_cache_last_modified((l), (s), (cc), (ccl) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_cache_last_modified(time_t last_modified, time_t send_modified, const char *cache_control, size_t cc_len TSRMLS_DC); -+ -+#define http_cache_etag(e, el, cc, ccl) _http_cache_etag((e), (el), (cc), (ccl) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_cache_etag(const char *etag, size_t etag_len, const char *cache_control, size_t cc_len TSRMLS_DC); -+ -+#define http_start_ob_etaghandler() _http_start_ob_etaghandler(TSRMLS_C) -+PHP_HTTP_API STATUS _http_start_ob_etaghandler(TSRMLS_D); -+#define http_interrupt_ob_etaghandler() _http_interrupt_ob_etaghandler(TSRMLS_C) -+PHP_HTTP_API zend_bool _http_interrupt_ob_etaghandler(TSRMLS_D); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_cookie_api.h -@@ -0,0 +1,86 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_cookie_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_COOKIE_API_H -+#define PHP_HTTP_COOKIE_API_H -+ -+#define HTTP_COOKIE_SECURE 0x10L -+#define HTTP_COOKIE_HTTPONLY 0x20L -+ -+#define HTTP_COOKIE_PARSE_RAW 0x01L -+ -+extern PHP_MINIT_FUNCTION(http_cookie); -+ -+/* -+ generally a netscape cookie compliant struct, recognizing httpOnly attribute, too; -+ cookie params like those from rfc2109 and rfc2965 are just put into extras, if -+ one specifies them in allowed extras, else they're treated like cookies themself -+*/ -+typedef struct _http_cookie_list_t { -+ HashTable cookies; -+ HashTable extras; -+ long flags; -+ char *path; -+ char *domain; -+ time_t expires; -+} http_cookie_list; -+ -+#define http_cookie_list_new() _http_cookie_list_init(NULL ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+#define http_cookie_list_init(l) _http_cookie_list_init((l) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API http_cookie_list *_http_cookie_list_init(http_cookie_list *list ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+ -+#define http_cookie_list_dtor(l) _http_cookie_list_dtor((l) TSRMLS_CC) -+PHP_HTTP_API void _http_cookie_list_dtor(http_cookie_list *list TSRMLS_DC); -+ -+#define http_cookie_list_free(l) _http_cookie_list_free((l) TSRMLS_CC) -+PHP_HTTP_API void _http_cookie_list_free(http_cookie_list **list TSRMLS_DC); -+ -+#define http_cookie_list_has_cookie(list, name, name_len) zend_hash_exists(&(list)->cookies, (name), (name_len)+1) -+#define http_cookie_list_has_extra(list, name, name_len) zend_hash_exists(&(list)->extras, (name), (name_len)+1) -+ -+#define http_cookie_list_add_cookie(l, n, nl, v, vl) _http_cookie_list_add_cookie((l), (n), (nl), (v), (vl) TSRMLS_CC) -+PHP_HTTP_API void _http_cookie_list_add_cookie(http_cookie_list *list, const char *name, size_t name_len, const char *value, size_t value_len TSRMLS_DC); -+ -+#define http_cookie_list_add_extra(l, n , nl, v, vl) _http_cookie_list_add_extra((l), (n), (nl), (v), (vl) TSRMLS_CC) -+PHP_HTTP_API void _http_cookie_list_add_extra(http_cookie_list *list, const char *name, size_t name_len, const char *value, size_t value_len TSRMLS_DC); -+ -+#define http_cookie_list_get_cookie(l, n, nl) _http_cookie_list_get_cookie((l), (n), (nl) TSRMLS_CC) -+PHP_HTTP_API const char *_http_cookie_list_get_cookie(http_cookie_list *list, const char *name, size_t name_len TSRMLS_DC); -+ -+#define http_cookie_list_get_extra(l, n, nl) _http_cookie_list_get_extra((l), (n), (nl) TSRMLS_CC) -+PHP_HTTP_API const char *_http_cookie_list_get_extra(http_cookie_list *list, const char *name, size_t name_len TSRMLS_DC); -+ -+#define http_parse_cookie(s) _http_parse_cookie_ex(NULL, (s), 0, NULL TSRMLS_CC) -+#define http_parse_cookie_ex(l, s, f, a) _http_parse_cookie_ex((l), (s), (f), (a) TSRMLS_CC) -+PHP_HTTP_API http_cookie_list *_http_parse_cookie_ex(http_cookie_list * list, const char *string, long flags, char **allowed_extras TSRMLS_DC); -+ -+#define http_cookie_list_tostruct(l, s) _http_cookie_list_tostruct((l), (s) TSRMLS_CC) -+PHP_HTTP_API void _http_cookie_list_tostruct(http_cookie_list *list, zval *strct TSRMLS_DC); -+ -+#define http_cookie_list_fromstruct(l, s) _http_cookie_list_fromstruct((l), (s) TSRMLS_CC) -+PHP_HTTP_API http_cookie_list *_http_cookie_list_fromstruct(http_cookie_list *list, zval *strct TSRMLS_DC); -+ -+#define http_cookie_list_tostring(l, str, len) _http_cookie_list_tostring((l), (str), (len) TSRMLS_CC) -+PHP_HTTP_API void _http_cookie_list_tostring(http_cookie_list *list, char **str, size_t *len TSRMLS_DC); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/php_http_date_api.h -@@ -0,0 +1,35 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_date_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_DATE_API_H -+#define PHP_HTTP_DATE_API_H -+ -+#define http_date(t) _http_date((t) TSRMLS_CC) -+PHP_HTTP_API char *_http_date(time_t t TSRMLS_DC); -+ -+#define http_parse_date(d) _http_parse_date_ex((d), 0 TSRMLS_CC) -+#define http_parse_date_ex(d, s) _http_parse_date_ex((d), (s) TSRMLS_CC) -+PHP_HTTP_API time_t _http_parse_date_ex(const char *date, zend_bool silent TSRMLS_DC); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_deflatestream_object.h -@@ -0,0 +1,57 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_deflatestream_object.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_DEFLATESTREAM_OBJECT_H -+#define PHP_HTTP_DEFLATESTREAM_OBJECT_H -+#ifdef HTTP_HAVE_ZLIB -+#ifdef ZEND_ENGINE_2 -+ -+typedef struct _http_deflatestream_object_t { -+ zend_object zo; -+ http_encoding_stream *stream; -+} http_deflatestream_object; -+ -+extern zend_class_entry *http_deflatestream_object_ce; -+extern zend_function_entry http_deflatestream_object_fe[]; -+ -+extern PHP_MINIT_FUNCTION(http_deflatestream_object); -+ -+#define http_deflatestream_object_new(ce) _http_deflatestream_object_new((ce) TSRMLS_CC) -+extern zend_object_value _http_deflatestream_object_new(zend_class_entry *ce TSRMLS_DC); -+#define http_deflatestream_object_new_ex(ce, s, ptr) _http_deflatestream_object_new_ex((ce), (s), (ptr) TSRMLS_CC) -+extern zend_object_value _http_deflatestream_object_new_ex(zend_class_entry *ce, http_encoding_stream *s, http_deflatestream_object **ptr TSRMLS_DC); -+#define http_deflatestream_object_clone(zobj) _http_deflatestream_object_clone_obj(zobj TSRMLS_CC) -+extern zend_object_value _http_deflatestream_object_clone_obj(zval *object TSRMLS_DC); -+#define http_deflatestream_object_free(o) _http_deflatestream_object_free((o) TSRMLS_CC) -+extern void _http_deflatestream_object_free(zend_object *object TSRMLS_DC); -+ -+PHP_METHOD(HttpDeflateStream, __construct); -+PHP_METHOD(HttpDeflateStream, factory); -+PHP_METHOD(HttpDeflateStream, update); -+PHP_METHOD(HttpDeflateStream, flush); -+PHP_METHOD(HttpDeflateStream, finish); -+ -+#endif -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_encoding_api.h -@@ -0,0 +1,192 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_encoding_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_ENCODING_API_H -+#define PHP_HTTP_ENCODING_API_H -+ -+#define http_encoding_dechunk(e, el, d, dl) _http_encoding_dechunk((e), (el), (d), (dl) TSRMLS_CC) -+PHP_HTTP_API const char *_http_encoding_dechunk(const char *encoded, size_t encoded_len, char **decoded, size_t *decoded_len TSRMLS_DC); -+ -+#define http_encoding_response_start(cl, i) _http_encoding_response_start((cl), (i) TSRMLS_CC) -+PHP_HTTP_API int _http_encoding_response_start(size_t content_length, zend_bool ignore_http_ohandler TSRMLS_DC); -+ -+#ifdef HTTP_HAVE_ZLIB -+ -+extern PHP_MINIT_FUNCTION(http_encoding); -+extern PHP_RINIT_FUNCTION(http_encoding); -+extern PHP_RSHUTDOWN_FUNCTION(http_encoding); -+ -+typedef enum _http_encoding_type_t { -+ HTTP_ENCODING_NONE, -+ HTTP_ENCODING_GZIP, -+ HTTP_ENCODING_DEFLATE, -+} http_encoding_type; -+ -+#define HTTP_INFLATE_ROUNDS 100 -+ -+#define HTTP_DEFLATE_BUFFER_SIZE_GUESS(S) \ -+ (((size_t) ((double) S * (double) 1.015)) + 10 + 8 + 4 + 1) -+#define HTTP_INFLATE_BUFFER_SIZE_GUESS(S) \ -+ (((S) + 1) << 3) -+#define HTTP_INFLATE_BUFFER_SIZE_ALIGN(S) \ -+ ((S) += (S) >> (3)) -+ -+#define HTTP_DEFLATE_BUFFER_SIZE 0x8000 -+#define HTTP_INFLATE_BUFFER_SIZE 0x1000 -+ -+#define HTTP_DEFLATE_LEVEL_DEF 0x00000000 -+#define HTTP_DEFLATE_LEVEL_MIN 0x00000001 -+#define HTTP_DEFLATE_LEVEL_MAX 0x00000009 -+#define HTTP_DEFLATE_TYPE_ZLIB 0x00000000 -+#define HTTP_DEFLATE_TYPE_GZIP 0x00000010 -+#define HTTP_DEFLATE_TYPE_RAW 0x00000020 -+#define HTTP_DEFLATE_STRATEGY_DEF 0x00000000 -+#define HTTP_DEFLATE_STRATEGY_FILT 0x00000100 -+#define HTTP_DEFLATE_STRATEGY_HUFF 0x00000200 -+#define HTTP_DEFLATE_STRATEGY_RLE 0x00000300 -+#define HTTP_DEFLATE_STRATEGY_FIXED 0x00000400 -+ -+#define HTTP_DEFLATE_LEVEL_SET(flags, level) \ -+ switch (flags & 0xf) \ -+ { \ -+ default: \ -+ if ((flags & 0xf) < 10) { \ -+ level = flags & 0xf; \ -+ break; \ -+ } \ -+ case HTTP_DEFLATE_LEVEL_DEF: \ -+ level = Z_DEFAULT_COMPRESSION; \ -+ break; \ -+ } -+ -+#define HTTP_DEFLATE_WBITS_SET(flags, wbits) \ -+ switch (flags & 0xf0) \ -+ { \ -+ case HTTP_DEFLATE_TYPE_GZIP: \ -+ wbits = HTTP_WINDOW_BITS_GZIP; \ -+ break; \ -+ case HTTP_DEFLATE_TYPE_RAW: \ -+ wbits = HTTP_WINDOW_BITS_RAW; \ -+ break; \ -+ default: \ -+ wbits = HTTP_WINDOW_BITS_ZLIB; \ -+ break; \ -+ } -+ -+#define HTTP_INFLATE_WBITS_SET(flags, wbits) \ -+ if (flags & HTTP_INFLATE_TYPE_RAW) { \ -+ wbits = HTTP_WINDOW_BITS_RAW; \ -+} else { \ -+ wbits = HTTP_WINDOW_BITS_ANY; \ -+} -+ -+#define HTTP_DEFLATE_STRATEGY_SET(flags, strategy) \ -+ switch (flags & 0xf00) \ -+ { \ -+ case HTTP_DEFLATE_STRATEGY_FILT: \ -+ strategy = Z_FILTERED; \ -+ break; \ -+ case HTTP_DEFLATE_STRATEGY_HUFF: \ -+ strategy = Z_HUFFMAN_ONLY; \ -+ break; \ -+ case HTTP_DEFLATE_STRATEGY_RLE: \ -+ strategy = Z_RLE; \ -+ break; \ -+ case HTTP_DEFLATE_STRATEGY_FIXED: \ -+ strategy = Z_FIXED; \ -+ break; \ -+ default: \ -+ strategy = Z_DEFAULT_STRATEGY; \ -+ break; \ -+ } -+ -+#define HTTP_WINDOW_BITS_ZLIB 0x0000000f -+#define HTTP_WINDOW_BITS_GZIP 0x0000001f -+#define HTTP_WINDOW_BITS_ANY 0x0000002f -+#define HTTP_WINDOW_BITS_RAW -0x000000f -+ -+#ifndef Z_FIXED -+/* Z_FIXED does not exist prior 1.2.2.2 */ -+# define Z_FIXED 0 -+#endif -+ -+#define HTTP_INFLATE_TYPE_ZLIB 0x00000000 -+#define HTTP_INFLATE_TYPE_GZIP 0x00000000 -+#define HTTP_INFLATE_TYPE_RAW 0x00000001 -+ -+#define HTTP_ENCODING_STREAM_FLUSH_NONE 0x00000000 -+#define HTTP_ENCODING_STREAM_FLUSH_SYNC 0x00100000 -+#define HTTP_ENCODING_STREAM_FLUSH_FULL 0x00200000 -+ -+#define HTTP_ENCODING_STREAM_FLUSH_FLAG(f) \ -+ (((f) & HTTP_ENCODING_STREAM_FLUSH_FULL) ? Z_FULL_FLUSH : \ -+ (((f) & HTTP_ENCODING_STREAM_FLUSH_SYNC) ? Z_SYNC_FLUSH : Z_NO_FLUSH)) -+ -+#define HTTP_ENCODING_STREAM_PERSISTENT 0x01000000 -+ -+typedef struct _http_encoding_stream_t { -+ z_stream stream; -+ int flags; -+ void *storage; -+} http_encoding_stream; -+ -+#define http_encoding_deflate(f, d, dl, r, rl) _http_encoding_deflate((f), (d), (dl), (r), (rl) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API STATUS _http_encoding_deflate(int flags, const char *data, size_t data_len, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+#define http_encoding_inflate(d, dl, r, rl) _http_encoding_inflate((d), (dl), (r), (rl) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API STATUS _http_encoding_inflate(const char *data, size_t data_len, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+ -+#define http_encoding_deflate_stream_init(s, f) _http_encoding_deflate_stream_init((s), (f) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API http_encoding_stream *_http_encoding_deflate_stream_init(http_encoding_stream *s, int flags ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+#define http_encoding_deflate_stream_update(s, d, dl, e, el) _http_encoding_deflate_stream_update((s), (d), (dl), (e), (el) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API STATUS _http_encoding_deflate_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+#define http_encoding_deflate_stream_flush(s, e, el) _http_encoding_deflate_stream_flush((s), (e), (el) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API STATUS _http_encoding_deflate_stream_flush(http_encoding_stream *s, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+#define http_encoding_deflate_stream_finish(s, e, el) _http_encoding_deflate_stream_finish((s), (e), (el) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API STATUS _http_encoding_deflate_stream_finish(http_encoding_stream *s, char **encoded, size_t *encoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+#define http_encoding_deflate_stream_dtor(s) _http_encoding_deflate_stream_dtor((s) TSRMLS_CC) -+PHP_HTTP_API void _http_encoding_deflate_stream_dtor(http_encoding_stream *s TSRMLS_DC); -+#define http_encoding_deflate_stream_free(s) _http_encoding_deflate_stream_free((s) TSRMLS_CC) -+PHP_HTTP_API void _http_encoding_deflate_stream_free(http_encoding_stream **s TSRMLS_DC); -+ -+#define http_encoding_inflate_stream_init(s, f) _http_encoding_inflate_stream_init((s), (f) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API http_encoding_stream *_http_encoding_inflate_stream_init(http_encoding_stream *s, int flags ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+#define http_encoding_inflate_stream_update(s, d, dl, e, el) _http_encoding_inflate_stream_update((s), (d), (dl), (e), (el) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API STATUS _http_encoding_inflate_stream_update(http_encoding_stream *s, const char *data, size_t data_len, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+#define http_encoding_inflate_stream_flush(s, d, dl) _http_encoding_inflate_stream_flush((s), (d), (dl) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API STATUS _http_encoding_inflate_stream_flush(http_encoding_stream *s, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+#define http_encoding_inflate_stream_finish(s, e, el) _http_encoding_inflate_stream_finish((s), (e), (el) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API STATUS _http_encoding_inflate_stream_finish(http_encoding_stream *s, char **decoded, size_t *decoded_len ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+#define http_encoding_inflate_stream_dtor(s) _http_encoding_inflate_stream_dtor((s) TSRMLS_CC) -+PHP_HTTP_API void _http_encoding_inflate_stream_dtor(http_encoding_stream *s TSRMLS_DC); -+#define http_encoding_inflate_stream_free(s) _http_encoding_inflate_stream_free((s) TSRMLS_CC) -+PHP_HTTP_API void _http_encoding_inflate_stream_free(http_encoding_stream **s TSRMLS_DC); -+ -+#define http_ob_deflatehandler(o, ol, h, hl, m) _http_ob_deflatehandler((o), (ol), (h), (hl), (m) TSRMLS_CC) -+extern void _http_ob_deflatehandler(char *, uint, char **, uint *, int TSRMLS_DC); -+ -+#define http_ob_inflatehandler(o, ol, h, hl, m) _http_ob_inflatehandler((o), (ol), (h), (hl), (m) TSRMLS_CC) -+extern void _http_ob_inflatehandler(char *, uint, char **, uint *, int TSRMLS_DC); -+ -+#endif /* HTTP_HAVE_ZLIB */ -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/php_http_exception_object.h -@@ -0,0 +1,60 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_exception_object.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_EXCEPTION_OBJECT_H -+#define PHP_HTTP_EXCEPTION_OBJECT_H -+#ifdef ZEND_ENGINE_2 -+ -+#include "zend_exceptions.h" -+ -+PHP_MINIT_FUNCTION(http_exception_object); -+ -+#define HTTP_EX_DEF_CE http_exception_object_ce -+#define HTTP_EX_CE(name) http_ ##name## _exception_object_ce -+ -+extern zend_class_entry *http_exception_object_ce; -+extern zend_class_entry *HTTP_EX_CE(runtime); -+extern zend_class_entry *HTTP_EX_CE(header); -+extern zend_class_entry *HTTP_EX_CE(malformed_headers); -+extern zend_class_entry *HTTP_EX_CE(request_method); -+extern zend_class_entry *HTTP_EX_CE(message_type); -+extern zend_class_entry *HTTP_EX_CE(invalid_param); -+extern zend_class_entry *HTTP_EX_CE(encoding); -+extern zend_class_entry *HTTP_EX_CE(request); -+extern zend_class_entry *HTTP_EX_CE(request_pool); -+extern zend_class_entry *HTTP_EX_CE(socket); -+extern zend_class_entry *HTTP_EX_CE(response); -+extern zend_class_entry *HTTP_EX_CE(url); -+extern zend_function_entry http_exception_object_fe[]; -+ -+#define http_exception_get_default _http_exception_get_default -+extern zend_class_entry *_http_exception_get_default(); -+ -+#define http_exception_get_for_code(c) _http_exception_get_for_code(c) -+extern zend_class_entry *_http_exception_get_for_code(long code); -+ -+PHP_METHOD(HttpException, __toString); -+ -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_filter_api.h -@@ -0,0 +1,33 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_filter_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_FILTER_API_H -+#define PHP_HTTP_FILTER_API_H -+#ifdef ZEND_ENGINE_2 -+ -+extern php_stream_filter_factory http_filter_factory; -+PHP_MINIT_FUNCTION(http_filter); -+ -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_headers_api.h -@@ -0,0 +1,77 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_headers_api.h 300300 2010-06-09 07:29:35Z mike $ */ -+ -+#ifndef PHP_HTTP_HEADERS_API_H -+#define PHP_HTTP_HEADERS_API_H -+ -+#include "php_http_info_api.h" -+ -+typedef enum http_range_status_t { -+ RANGE_OK, -+ RANGE_NO, -+ RANGE_ERR -+} http_range_status; -+ -+#define http_parse_headers(h, a) _http_parse_headers_ex((h), Z_ARRVAL_P(a), 1, http_info_default_callback, NULL TSRMLS_CC) -+#define http_parse_headers_ex(h, ht, p) _http_parse_headers_ex((h), (ht), (p), http_info_default_callback, NULL TSRMLS_CC) -+#define http_parse_headers_cb(h, ht, p, f, d) _http_parse_headers_ex((h), (ht), (p), (f), (d) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_parse_headers_ex(const char *header, HashTable *headers, zend_bool prettify, http_info_callback callback_func, void **callback_data TSRMLS_DC); -+ -+typedef char *(*negotiate_func_t)(const char *test, double *quality, HashTable *supported TSRMLS_DC); -+ -+#define http_negotiate_language_func _http_negotiate_language_func -+extern char *_http_negotiate_language_func(const char *test, double *quality, HashTable *supported TSRMLS_DC); -+#define http_negotiate_content_type_func _http_negotiate_default_func -+#define http_negotiate_encoding_func _http_negotiate_default_func -+#define http_negotiate_charset_func _http_negotiate_default_func -+#define http_negotiate_default_func _http_negotiate_default_func -+extern char *_http_negotiate_default_func(const char *test, double *quality, HashTable *supported TSRMLS_DC); -+ -+#define http_negotiate_language(zsupported) http_negotiate_language_ex(Z_ARRVAL_P(zsupported)) -+#define http_negotiate_language_ex(supported) http_negotiate_q("HTTP_ACCEPT_LANGUAGE", (supported), http_negotiate_language_func) -+#define http_negotiate_charset(zsupported) http_negotiate_charset_ex(Z_ARRVAL_P(zsupported)) -+#define http_negotiate_charset_ex(supported) http_negotiate_q("HTTP_ACCEPT_CHARSET", (supported), http_negotiate_charset_func) -+#define http_negotiate_encoding(zsupported) http_negotiate_encoding_ex(Z_ARRVAL_P(zsupported)) -+#define http_negotiate_encoding_ex(supported) http_negotiate_q("HTTP_ACCEPT_ENCODING", (supported), http_negotiate_encoding_func) -+#define http_negotiate_content_type(zsupported) http_negotiate_content_type_ex(Z_ARRVAL_P(zsupported)) -+#define http_negotiate_content_type_ex(supported) http_negotiate_q("HTTP_ACCEPT", (supported), http_negotiate_content_type_func) -+#define http_negotiate_q(e, s, n) _http_negotiate_q((e), (s), (n) TSRMLS_CC) -+PHP_HTTP_API HashTable *_http_negotiate_q(const char *header, HashTable *supported, negotiate_func_t neg TSRMLS_DC); -+#define http_negotiate_z(z, s, n) _http_negotiate_z((z), (s), (n) TSRMLS_CC) -+PHP_HTTP_API HashTable *_http_negotiate_z(zval *value, HashTable *supported, negotiate_func_t neg TSRMLS_DC); -+ -+#define http_get_request_ranges(r, l) _http_get_request_ranges((r), (l) TSRMLS_CC) -+PHP_HTTP_API http_range_status _http_get_request_ranges(HashTable *ranges, size_t length TSRMLS_DC); -+ -+#define http_get_request_headers(h) _http_get_request_headers((h) TSRMLS_CC) -+PHP_HTTP_API void _http_get_request_headers(HashTable *headers TSRMLS_DC); -+ -+#define http_get_response_headers(h) _http_get_response_headers((h) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_get_response_headers(HashTable *headers_ht TSRMLS_DC); -+ -+#define http_match_request_header(h, v) http_match_request_header_ex((h), (v), 0) -+#define http_match_request_header_ex(h, v, c) _http_match_request_header_ex((h), (v), (c) TSRMLS_CC) -+PHP_HTTP_API zend_bool _http_match_request_header_ex(const char *header, const char *value, zend_bool match_case TSRMLS_DC); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_inflatestream_object.h -@@ -0,0 +1,57 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_inflatestream_object.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_INFLATESTREAM_OBJECT_H -+#define PHP_HTTP_INFLATESTREAM_OBJECT_H -+#ifdef HTTP_HAVE_ZLIB -+#ifdef ZEND_ENGINE_2 -+ -+typedef struct _http_inflatestream_object_t { -+ zend_object zo; -+ http_encoding_stream *stream; -+} http_inflatestream_object; -+ -+extern zend_class_entry *http_inflatestream_object_ce; -+extern zend_function_entry http_inflatestream_object_fe[]; -+ -+extern PHP_MINIT_FUNCTION(http_inflatestream_object); -+ -+#define http_inflatestream_object_new(ce) _http_inflatestream_object_new((ce) TSRMLS_CC) -+extern zend_object_value _http_inflatestream_object_new(zend_class_entry *ce TSRMLS_DC); -+#define http_inflatestream_object_new_ex(ce, s, ptr) _http_inflatestream_object_new_ex((ce), (s), (ptr) TSRMLS_CC) -+extern zend_object_value _http_inflatestream_object_new_ex(zend_class_entry *ce, http_encoding_stream *s, http_inflatestream_object **ptr TSRMLS_DC); -+#define http_inflatestream_object_clone(zobj) _http_inflatestream_object_clone_obj(zobj TSRMLS_CC) -+extern zend_object_value _http_inflatestream_object_clone_obj(zval *object TSRMLS_DC); -+#define http_inflatestream_object_free(o) _http_inflatestream_object_free((o) TSRMLS_CC) -+extern void _http_inflatestream_object_free(zend_object *object TSRMLS_DC); -+ -+PHP_METHOD(HttpInflateStream, __construct); -+PHP_METHOD(HttpInflateStream, factory); -+PHP_METHOD(HttpInflateStream, update); -+PHP_METHOD(HttpInflateStream, flush); -+PHP_METHOD(HttpInflateStream, finish); -+ -+#endif -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_info_api.h -@@ -0,0 +1,79 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_info_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_INFO_API_H -+#define PHP_HTTP_INFO_API_H -+ -+#define IS_HTTP_REQUEST 1 -+#define IS_HTTP_RESPONSE 2 -+ -+#define HTTP_INFO(ptr) (ptr)->http.info -+ -+#define HTTP_INFO_REQUEST_FMT_ARGS(_http_ptr, _EOL) "%s %s HTTP/%1.1f" _EOL, \ -+ (_http_ptr)->info.request.method?(_http_ptr)->info.request.method:"UNKNOWN", \ -+ (_http_ptr)->info.request.url?(_http_ptr)->info.request.url:"/", \ -+ (_http_ptr)->version>0.0?(_http_ptr)->version:1.1 -+ -+#define HTTP_INFO_RESPONSE_FMT_ARGS(_http_ptr, _EOL) "HTTP/%1.1f %d%s%s" _EOL, \ -+ (_http_ptr)->version>0.0?(_http_ptr)->version:1.1, \ -+ (_http_ptr)->info.response.code?(_http_ptr)->info.response.code:200, \ -+ (_http_ptr)->info.response.status&&*(_http_ptr)->info.response.status ? " ":"", \ -+ STR_PTR((_http_ptr)->info.response.status) -+ -+typedef struct _http_request_info_t { -+ char *method; -+ char *url; -+} http_request_info; -+ -+typedef struct _http_response_info_t { -+ int code; -+ char *status; -+} http_response_info; -+ -+typedef union _http_info_union_t { -+ http_request_info request; -+ http_response_info response; -+} http_info_union; -+ -+struct http_info { -+ http_info_union info; -+ double version; -+}; -+ -+typedef struct _http_info_t { -+ struct http_info http; -+ int type; -+} http_info; -+ -+typedef void (*http_info_callback)(void **callback_data, HashTable **headers, http_info *info TSRMLS_DC); -+ -+#define http_info_default_callback _http_info_default_callback -+PHP_HTTP_API void _http_info_default_callback(void **nothing, HashTable **headers, http_info *info TSRMLS_DC); -+#define http_info_dtor _http_info_dtor -+PHP_HTTP_API void _http_info_dtor(http_info *info); -+#define http_info_parse(p, i) _http_info_parse_ex((p), (i), 1 TSRMLS_CC) -+#define http_info_parse_ex(p, i, s) _http_info_parse_ex((p), (i), (s) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_info_parse_ex(const char *pre_header, http_info *info , zend_bool silent TSRMLS_DC); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_message_api.h -@@ -0,0 +1,131 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_message_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_MESSAGE_API_H -+#define PHP_HTTP_MESSAGE_API_H -+ -+#include "php_http_info_api.h" -+ -+typedef enum _http_message_type_t { -+ HTTP_MSG_NONE = 0, -+ HTTP_MSG_REQUEST = IS_HTTP_REQUEST, -+ HTTP_MSG_RESPONSE = IS_HTTP_RESPONSE, -+} http_message_type; -+ -+typedef struct _http_message_t http_message; -+ -+struct _http_message_t { -+ phpstr body; -+ HashTable hdrs; -+ http_message_type type; -+ struct http_info http; -+ http_message *parent; -+}; -+ -+/* required minimum length of an HTTP message "HTTP/1.1" */ -+#define HTTP_MSG_MIN_SIZE 8 -+ -+/* shorthand for type checks */ -+#define HTTP_MSG_TYPE(TYPE, msg) ((msg) && ((msg)->type == HTTP_MSG_ ##TYPE)) -+ -+#define http_message_new() http_message_init_ex(NULL, 0) -+#define http_message_init(m) http_message_init_ex((m), 0) -+#define http_message_init_ex(m, t) _http_message_init_ex((m), (t) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) -+#define http_message_init_rel(m, t) _http_message_init_ex((m), (t) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC) -+PHP_HTTP_API http_message *_http_message_init_ex(http_message *m, http_message_type t ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); -+#define http_message_init_env(m, t) _http_message_init_env((m), (t) TSRMLS_CC ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC) -+PHP_HTTP_API http_message *_http_message_init_env(http_message *m, http_message_type t TSRMLS_DC ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC); -+ -+#define http_message_set_type(m, t) _http_message_set_type((m), (t)) -+PHP_HTTP_API void _http_message_set_type(http_message *m, http_message_type t); -+ -+#define http_message_set_info(m, i) _http_message_set_info((m), (i)) -+PHP_HTTP_API void _http_message_set_info(http_message *message, http_info *info); -+ -+#define http_message_header(m, h) _http_message_header_ex((m), (h), sizeof(h), 1) -+#define http_message_header_ex _http_message_header_ex -+static inline zval *_http_message_header_ex(http_message *msg, char *key_str, size_t key_len, int join) -+{ -+ zval **header; -+ if (SUCCESS == zend_hash_find(&msg->hdrs, key_str, key_len, (void *) &header)) { -+ if (join && Z_TYPE_PP(header) == IS_ARRAY) { -+ zval *header_str, **val; -+ HashPosition pos; -+ phpstr str; -+ -+ phpstr_init(&str); -+ MAKE_STD_ZVAL(header_str); -+ FOREACH_VAL(pos, *header, val) { -+ phpstr_appendf(&str, PHPSTR_LEN(&str) ? ", %s":"%s", Z_STRVAL_PP(val)); -+ } -+ phpstr_fix(&str); -+ ZVAL_STRINGL(header_str, PHPSTR_VAL(&str), PHPSTR_LEN(&str), 0); -+ return header_str; -+ } else { -+ ZVAL_ADDREF(*header); -+ return *header; -+ } -+ } -+ return NULL; -+} -+ -+#define http_message_count(c, m) \ -+{ \ -+ http_message *__tmp_msg = (m); \ -+ for (c = 0; __tmp_msg; __tmp_msg = __tmp_msg->parent, ++(c)); \ -+} -+ -+#define http_message_parse(m, l) http_message_parse_ex(NULL, (m), (l)) -+#define http_message_parse_ex(h, m, l) _http_message_parse_ex((h), (m), (l) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+#define http_message_parse_rel(h, m, l) _http_message_parse_ex((h), (m), (l) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC TSRMLS_CC) -+PHP_HTTP_API http_message *_http_message_parse_ex(http_message *msg, const char *message, size_t length ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+ -+#define http_message_tostring(m, s, l) _http_message_tostring((m), (s), (l)) -+PHP_HTTP_API void _http_message_tostring(http_message *msg, char **string, size_t *length); -+ -+#define http_message_serialize(m, s, l) _http_message_serialize((m), (s), (l)) -+PHP_HTTP_API void _http_message_serialize(http_message *message, char **string, size_t *length); -+ -+#define http_message_reverse(m) _http_message_reverse(m) -+PHP_HTTP_API http_message *_http_message_reverse(http_message *msg); -+ -+#define http_message_interconnect(m1, m2) _http_message_interconnect((m1), (m2)) -+PHP_HTTP_API http_message *_http_message_interconnect(http_message *m1, http_message *m2); -+ -+#define http_message_tostruct_recursive(m, s) _http_message_tostruct_recursive((m), (s) TSRMLS_CC) -+PHP_HTTP_API void _http_message_tostruct_recursive(http_message *msg, zval *strct TSRMLS_DC); -+ -+#define http_message_send(m) _http_message_send((m) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_message_send(http_message *message TSRMLS_DC); -+ -+#define http_message_dup(m) _http_message_dup((m) TSRMLS_CC) -+PHP_HTTP_API http_message *_http_message_dup(http_message *msg TSRMLS_DC); -+ -+#define http_message_dtor(m) _http_message_dtor((m)) -+PHP_HTTP_API void _http_message_dtor(http_message *message); -+ -+#define http_message_free(m) _http_message_free((m)) -+PHP_HTTP_API void _http_message_free(http_message **message); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_message_object.h -@@ -0,0 +1,115 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_message_object.h 298590 2010-04-26 11:46:35Z mike $ */ -+ -+#ifndef PHP_HTTP_MESSAGE_OBJECT_H -+#define PHP_HTTP_MESSAGE_OBJECT_H -+#ifdef ZEND_ENGINE_2 -+ -+typedef struct _http_message_object_t { -+ zend_object zo; -+ http_message *message; -+ zend_object_value parent; -+ zval *iterator; -+} http_message_object; -+ -+extern zend_class_entry *http_message_object_ce; -+extern zend_function_entry http_message_object_fe[]; -+ -+extern PHP_MINIT_FUNCTION(http_message_object); -+extern PHP_MSHUTDOWN_FUNCTION(http_message_object); -+ -+#define http_message_object_prepend(o, p) http_message_object_prepend_ex((o), (p), 1) -+#define http_message_object_prepend_ex(o, p, t) _http_message_object_prepend_ex((o), (p), (t) TSRMLS_CC) -+extern void _http_message_object_prepend_ex(zval *this_ptr, zval *prepend, zend_bool top TSRMLS_DC); -+ -+#define http_message_object_reverse(t, r) _http_message_object_reverse((t), (r) TSRMLS_CC) -+extern void _http_message_object_reverse(zval *this_ptr, zval *return_value TSRMLS_DC); -+ -+#define http_message_object_new(ce) _http_message_object_new((ce) TSRMLS_CC) -+extern zend_object_value _http_message_object_new(zend_class_entry *ce TSRMLS_DC); -+#define http_message_object_new_ex(ce, msg, ptr) _http_message_object_new_ex((ce), (msg), (ptr) TSRMLS_CC) -+extern zend_object_value _http_message_object_new_ex(zend_class_entry *ce, http_message *msg, http_message_object **ptr TSRMLS_DC); -+#define http_message_object_clone(zobj) _http_message_object_clone_obj(zobj TSRMLS_CC) -+extern zend_object_value _http_message_object_clone_obj(zval *object TSRMLS_DC); -+#define http_message_object_free(o) _http_message_object_free((o) TSRMLS_CC) -+extern void _http_message_object_free(zend_object *object TSRMLS_DC); -+ -+#define HTTP_MSG_CHECK_OBJ(obj, dofail) \ -+ if (!(obj)->message) { \ -+ http_error(E_WARNING, HTTP_E_MSG, "HttpMessage is empty"); \ -+ dofail; \ -+ } -+#define HTTP_MSG_CHECK_STD() HTTP_MSG_CHECK_OBJ(obj, RETURN_FALSE) -+ -+#define HTTP_MSG_INIT_OBJ(obj) \ -+ if (!(obj)->message) { \ -+ (obj)->message = http_message_new(); \ -+ } -+#define HTTP_MSG_INIT_STD() HTTP_MSG_INIT_OBJ(obj) -+ -+PHP_METHOD(HttpMessage, __construct); -+PHP_METHOD(HttpMessage, getBody); -+PHP_METHOD(HttpMessage, setBody); -+PHP_METHOD(HttpMessage, getHeader); -+PHP_METHOD(HttpMessage, getHeaders); -+PHP_METHOD(HttpMessage, setHeaders); -+PHP_METHOD(HttpMessage, addHeaders); -+PHP_METHOD(HttpMessage, getType); -+PHP_METHOD(HttpMessage, setType); -+PHP_METHOD(HttpMessage, getInfo); -+PHP_METHOD(HttpMessage, setInfo); -+PHP_METHOD(HttpMessage, getResponseCode); -+PHP_METHOD(HttpMessage, setResponseCode); -+PHP_METHOD(HttpMessage, getResponseStatus); -+PHP_METHOD(HttpMessage, setResponseStatus); -+PHP_METHOD(HttpMessage, getRequestMethod); -+PHP_METHOD(HttpMessage, setRequestMethod); -+PHP_METHOD(HttpMessage, getRequestUrl); -+PHP_METHOD(HttpMessage, setRequestUrl); -+PHP_METHOD(HttpMessage, getHttpVersion); -+PHP_METHOD(HttpMessage, setHttpVersion); -+PHP_METHOD(HttpMessage, guessContentType); -+PHP_METHOD(HttpMessage, getParentMessage); -+PHP_METHOD(HttpMessage, send); -+PHP_METHOD(HttpMessage, toString); -+PHP_METHOD(HttpMessage, toMessageTypeObject); -+ -+PHP_METHOD(HttpMessage, count); -+PHP_METHOD(HttpMessage, serialize); -+PHP_METHOD(HttpMessage, unserialize); -+PHP_METHOD(HttpMessage, rewind); -+PHP_METHOD(HttpMessage, valid); -+PHP_METHOD(HttpMessage, current); -+PHP_METHOD(HttpMessage, key); -+PHP_METHOD(HttpMessage, next); -+ -+PHP_METHOD(HttpMessage, factory); -+PHP_METHOD(HttpMessage, fromEnv); -+ -+PHP_METHOD(HttpMessage, detach); -+PHP_METHOD(HttpMessage, prepend); -+PHP_METHOD(HttpMessage, reverse); -+ -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_persistent_handle_api.h -@@ -0,0 +1,58 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_persistent_handle_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef HTTP_PERSISTENT_HANDLE_H -+#define HTTP_PERSISTENT_HANDLE_H -+ -+typedef void *(*http_persistent_handle_ctor)(void); -+typedef void (*http_persistent_handle_dtor)(void *handle); -+typedef void *(*http_persistent_handle_copy)(void *handle); -+ -+PHP_MINIT_FUNCTION(http_persistent_handle); -+PHP_MSHUTDOWN_FUNCTION(http_persistent_handle); -+ -+#define http_persistent_handle_provide(n, c, d, cc) _http_persistent_handle_provide_ex((n), strlen(n), (c), (d), (cc)) -+#define http_persistent_handle_provide_ex(n, l, c, d, cc) _http_persistent_handle_provide_ex((n), (l), (c), (d), (cc)) -+PHP_HTTP_API STATUS _http_persistent_handle_provide_ex(const char *name_str, size_t name_len, http_persistent_handle_ctor ctor, http_persistent_handle_dtor dtor, http_persistent_handle_copy copy); -+ -+#define http_persistent_handle_cleanup(n, c) _http_persistent_handle_cleanup_ex((n), strlen(n), (c) TSRMLS_CC) -+#define http_persistent_handle_cleanup_ex(n, l,c ) _http_persistent_handle_cleanup_ex((n), (l), (c) TSRMLS_CC) -+PHP_HTTP_API void _http_persistent_handle_cleanup_ex(const char *name_str, size_t name_len, int current_ident_only TSRMLS_DC); -+ -+#define http_persistent_handle_statall() _http_persistent_handle_statall_ex(NULL TSRMLS_CC) -+#define http_persistent_handle_statall_ex(ht) _http_persistent_handle_statall_ex((ht) TSRMLS_CC) -+PHP_HTTP_API HashTable *_http_persistent_handle_statall_ex(HashTable *ht TSRMLS_DC); -+ -+#define http_persistent_handle_acquire(n, h) _http_persistent_handle_acquire_ex((n), strlen(n), (h) TSRMLS_CC) -+#define http_persistent_handle_acquire_ex(n, l, h) _http_persistent_handle_acquire_ex((n), (l), (h) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_persistent_handle_acquire_ex(const char *name_str, size_t name_len, void **handle TSRMLS_DC); -+ -+#define http_persistent_handle_release(n, h) _http_persistent_handle_release_ex((n), strlen(n), (h) TSRMLS_CC) -+#define http_persistent_handle_release_ex(n, l, h) _http_persistent_handle_release_ex((n), (l), (h) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_persistent_handle_release_ex(const char *name_str, size_t name_len, void **handle TSRMLS_DC); -+ -+#define http_persistent_handle_accrete(n, oh, nh) _http_persistent_handle_accrete_ex((n), strlen(n), (oh), (nh) TSRMLS_CC) -+#define http_persistent_handle_accrete_ex(n, l, oh, nh) _http_persistent_handle_accrete_ex((n), (l), (oh), (nh) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_persistent_handle_accrete_ex(const char *name_str, size_t name_len, void *old_handle, void **new_handle TSRMLS_DC); -+ -+#endif /* HTTP_PERSISTENT_HANDLE_H */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/php_http_querystring_api.h -@@ -0,0 +1,38 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_querystring_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_QUERYSTRING_API_H -+#define PHP_HTTP_QUERYSTRING_API_H -+ -+#ifdef HTTP_HAVE_ICONV -+#define http_querystring_xlate(a, p, ie, oe) _http_querystring_xlate((a), (p), (ie), (oe) TSRMLS_CC) -+PHP_HTTP_API int _http_querystring_xlate(zval *array, zval *param, const char *ie, const char *oe TSRMLS_DC); -+#endif -+ -+#define http_querystring_update(qa, qs) _http_querystring_update((qa), (qs) TSRMLS_CC) -+PHP_HTTP_API void _http_querystring_update(zval *qarray, zval *qstring TSRMLS_DC); -+ -+#define http_querystring_modify(q, p) _http_querystring_modify((q), (p) TSRMLS_CC) -+PHP_HTTP_API int _http_querystring_modify(zval *qarray, zval *params TSRMLS_DC); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/php_http_querystring_object.h -@@ -0,0 +1,78 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_querystring_object.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_QUERYSTRING_OBJECT_H -+#define PHP_HTTP_QUERYSTRING_OBJECT_H -+#ifdef ZEND_ENGINE_2 -+ -+typedef struct _http_querystring_object_t { -+ zend_object zo; -+} http_querystring_object; -+ -+#define HTTP_QUERYSTRING_TYPE_BOOL IS_BOOL -+#define HTTP_QUERYSTRING_TYPE_INT IS_LONG -+#define HTTP_QUERYSTRING_TYPE_FLOAT IS_DOUBLE -+#define HTTP_QUERYSTRING_TYPE_STRING IS_STRING -+#define HTTP_QUERYSTRING_TYPE_ARRAY IS_ARRAY -+#define HTTP_QUERYSTRING_TYPE_OBJECT IS_OBJECT -+ -+extern zend_class_entry *http_querystring_object_ce; -+extern zend_function_entry http_querystring_object_fe[]; -+ -+extern PHP_MINIT_FUNCTION(http_querystring_object); -+ -+#define http_querystring_object_new(ce) _http_querystring_object_new((ce) TSRMLS_CC) -+extern zend_object_value _http_querystring_object_new(zend_class_entry *ce TSRMLS_DC); -+#define http_querystring_object_new_ex(ce, n, ptr) _http_querystring_object_new_ex((ce), (n), (ptr) TSRMLS_CC) -+extern zend_object_value _http_querystring_object_new_ex(zend_class_entry *ce, void *nothing, http_querystring_object **ptr TSRMLS_DC); -+#define http_querystring_object_free(o) _http_querystring_object_free((o) TSRMLS_CC) -+extern void _http_querystring_object_free(zend_object *object TSRMLS_DC); -+ -+PHP_METHOD(HttpQueryString, __construct); -+PHP_METHOD(HttpQueryString, toString); -+PHP_METHOD(HttpQueryString, toArray); -+PHP_METHOD(HttpQueryString, get); -+PHP_METHOD(HttpQueryString, set); -+PHP_METHOD(HttpQueryString, mod); -+PHP_METHOD(HttpQueryString, getBool); -+PHP_METHOD(HttpQueryString, getInt); -+PHP_METHOD(HttpQueryString, getFloat); -+PHP_METHOD(HttpQueryString, getString); -+PHP_METHOD(HttpQueryString, getArray); -+PHP_METHOD(HttpQueryString, getObject); -+#ifdef HTTP_HAVE_ICONV -+PHP_METHOD(HttpQueryString, xlate); -+#endif -+PHP_METHOD(HttpQueryString, factory); -+#ifndef WONKY -+PHP_METHOD(HttpQueryString, singleton); -+#endif -+PHP_METHOD(HttpQueryString, serialize); -+PHP_METHOD(HttpQueryString, unserialize); -+PHP_METHOD(HttpQueryString, offsetGet); -+PHP_METHOD(HttpQueryString, offsetSet); -+PHP_METHOD(HttpQueryString, offsetExists); -+PHP_METHOD(HttpQueryString, offsetUnset); -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_request_api.h -@@ -0,0 +1,144 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_request_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_REQUEST_API_H -+#define PHP_HTTP_REQUEST_API_H -+ -+#ifdef HTTP_HAVE_CURL -+ -+#include "php_http_request_body_api.h" -+#include "php_http_request_method_api.h" -+ -+extern PHP_MINIT_FUNCTION(http_request); -+extern PHP_MSHUTDOWN_FUNCTION(http_request); -+ -+typedef struct _http_request_t { -+ CURL *ch; -+ char *url; -+ http_request_method meth; -+ http_request_body *body; -+ -+ struct { -+ curl_infotype last_type; -+ phpstr request; -+ phpstr response; -+ } conv; -+ -+ struct { -+ phpstr cookies; -+ HashTable options; -+ struct curl_slist *headers; -+ } _cache; -+ -+ struct { -+ uint count; -+ double delay; -+ } _retry; -+ -+ char _error[CURL_ERROR_SIZE+1]; -+ zval *_progress_callback; -+ -+#ifdef ZTS -+ void ***tsrm_ls; -+#endif -+ -+ uint _in_progress_cb:1; -+ -+} http_request; -+ -+#ifndef pestrndup -+# define pestrndup(s,l,p) _pestrndup((s),(l),(p)) -+static inline void *_pestrndup(const void *s, size_t l, int p) -+{ -+ void *d = pemalloc(l+1, p); -+ memcpy(d, s, l); -+ ((char *) d)[l] = '\0'; -+ return d; -+} -+#endif -+ -+/* CURLOPT_PRIVATE storage living as long as a CURL handle */ -+typedef struct _http_request_storage_t { -+ char *url; -+ char *cookiestore; -+ char errorbuffer[CURL_ERROR_SIZE]; -+} http_request_storage; -+ -+static inline http_request_storage *http_request_storage_get(CURL *ch) -+{ -+ http_request_storage *st = NULL; -+ curl_easy_getinfo(ch, CURLINFO_PRIVATE, &st); -+ return st; -+} -+ -+#define http_curl_init(r) http_curl_init_ex(NULL, (r)) -+#define http_curl_init_ex(c, r) _http_curl_init_ex((c), (r) TSRMLS_CC) -+PHP_HTTP_API CURL *_http_curl_init_ex(CURL *ch, http_request *request TSRMLS_DC); -+ -+#define http_curl_free(c) _http_curl_free((c) TSRMLS_CC) -+PHP_HTTP_API void _http_curl_free(CURL **ch TSRMLS_DC); -+ -+#define http_curl_copy(c) _http_curl_copy((c) TSRMLS_CC) -+PHP_HTTP_API CURL *_http_curl_copy(CURL *ch TSRMLS_DC); -+ -+#define http_request_new() _http_request_init_ex(NULL, NULL, 0, NULL ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+#define http_request_init(r) _http_request_init_ex((r), NULL, 0, NULL ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+#define http_request_init_ex(r, c, m, u) _http_request_init_ex((r), (c), (m), (u) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API http_request *_http_request_init_ex(http_request *request, CURL *ch, http_request_method meth, const char *url ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+ -+#define http_request_dtor(r) _http_request_dtor((r)) -+PHP_HTTP_API void _http_request_dtor(http_request *request); -+ -+#define http_request_free(r) _http_request_free((r)) -+PHP_HTTP_API void _http_request_free(http_request **request); -+ -+#define http_request_reset(r) _http_request_reset(r) -+PHP_HTTP_API void _http_request_reset(http_request *r); -+ -+#define http_request_enable_cookies(r) _http_request_enable_cookies(r) -+PHP_HTTP_API STATUS _http_request_enable_cookies(http_request *request); -+ -+#define http_request_reset_cookies(r, s) _http_request_reset_cookies((r), (s)) -+PHP_HTTP_API STATUS _http_request_reset_cookies(http_request *request, int session_only); -+ -+#define http_request_flush_cookies(r) _http_request_flush_cookies(r) -+PHP_HTTP_API STATUS _http_request_flush_cookies(http_request *request); -+ -+#define http_request_defaults(r) _http_request_defaults(r) -+PHP_HTTP_API void _http_request_defaults(http_request *request); -+ -+#define http_request_prepare(r, o) _http_request_prepare((r), (o)) -+PHP_HTTP_API STATUS _http_request_prepare(http_request *request, HashTable *options); -+ -+#define http_request_exec(r) _http_request_exec((r)) -+PHP_HTTP_API void _http_request_exec(http_request *request); -+ -+#define http_request_info(r, i) _http_request_info((r), (i)) -+PHP_HTTP_API void _http_request_info(http_request *request, HashTable *info); -+ -+#define http_request_set_progress_callback(r, cb) _http_request_set_progress_callback((r), (cb)) -+PHP_HTTP_API void _http_request_set_progress_callback(http_request *request, zval *cb); -+ -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_request_body_api.h -@@ -0,0 +1,62 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_request_body_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_REQUEST_BODY_API_H -+#define PHP_HTTP_REQUEST_BODY_API_H -+ -+#ifdef HTTP_HAVE_CURL -+ -+#define HTTP_REQUEST_BODY_EMPTY 0 -+#define HTTP_REQUEST_BODY_CSTRING 1 -+#define HTTP_REQUEST_BODY_CURLPOST 2 -+#define HTTP_REQUEST_BODY_UPLOADFILE 3 -+typedef struct _http_request_body_t { -+ void *data; -+ size_t size; -+ uint type:3; -+ uint free:1; -+ uint priv:28; -+} http_request_body; -+ -+ -+#define http_request_body_new() http_request_body_init(NULL) -+#define http_request_body_init(b) http_request_body_init_ex((b), 0, NULL, 0, 0) -+#define http_request_body_init_ex(b, t, d, l, f) _http_request_body_init_ex((b), (t), (d), (l), (f) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+#define http_request_body_init_rel(b, t, d, l, f) _http_request_body_init_ex((b), (t), (d), (l), (f) ZEND_FILE_LINE_RELAY_CC ZEND_FILE_LINE_ORIG_RELAY_CC TSRMLS_CC) -+PHP_HTTP_API http_request_body *_http_request_body_init_ex(http_request_body *body, int type, void *data, size_t len, zend_bool free ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+ -+#define http_request_body_fill(b, fields, files) _http_request_body_fill((b), (fields), (files) ZEND_FILE_LINE_CC ZEND_FILE_LINE_EMPTY_CC TSRMLS_CC) -+PHP_HTTP_API http_request_body *_http_request_body_fill(http_request_body *body, HashTable *fields, HashTable *files ZEND_FILE_LINE_DC ZEND_FILE_LINE_ORIG_DC TSRMLS_DC); -+ -+#define http_request_body_encode(b, s, l) _http_request_body_encode((b), (s), (l) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_request_body_encode(http_request_body *body, char **buf, size_t *len TSRMLS_DC); -+ -+#define http_request_body_dtor(b) _http_request_body_dtor((b) TSRMLS_CC) -+PHP_HTTP_API void _http_request_body_dtor(http_request_body *body TSRMLS_DC); -+ -+#define http_request_body_free(b) _http_request_body_free((b) TSRMLS_CC) -+PHP_HTTP_API void _http_request_body_free(http_request_body **body TSRMLS_DC); -+ -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_request_datashare_api.h -@@ -0,0 +1,88 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_request_datashare_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_REQUEST_DATASHARE_API_H -+#define PHP_HTTP_REQUEST_DATASHARE_API_H -+#ifdef HTTP_HAVE_CURL -+#ifdef ZEND_ENGINE_2 -+ -+#ifdef ZTS -+typedef struct _http_request_datashare_lock_t { -+ CURL *ch; -+ MUTEX_T mx; -+} http_request_datashare_lock; -+ -+typedef union _http_request_datashare_handle_t { -+ zend_llist *list; -+ http_request_datashare_lock *locks; -+} http_request_datashare_handle; -+#else -+typedef struct _http_request_datashare_handle_t { -+ zend_llist *list; -+} http_request_datashare_handle; -+#endif -+ -+typedef struct _http_request_datashare_t { -+ CURLSH *ch; -+ zend_bool persistent; -+ http_request_datashare_handle handle; -+} http_request_datashare; -+ -+#define HTTP_RSHARE_HANDLES(s) ((s)->persistent ? &HTTP_G->request.datashare.handles : (s)->handle.list) -+ -+#define http_request_datashare_global_get _http_request_datashare_global_get -+extern http_request_datashare *_http_request_datashare_global_get(void); -+ -+extern PHP_MINIT_FUNCTION(http_request_datashare); -+extern PHP_MSHUTDOWN_FUNCTION(http_request_datashare); -+extern PHP_RINIT_FUNCTION(http_request_datashare); -+extern PHP_RSHUTDOWN_FUNCTION(http_request_datashare); -+ -+#define http_request_datashare_new() _http_request_datashare_init_ex(NULL, 0 TSRMLS_CC) -+#define http_request_datashare_init(s) _http_request_datashare_init_ex((s), 0 TSRMLS_CC) -+#define http_request_datashare_init_ex(s, p) _http_request_datashare_init_ex((s), (p) TSRMLS_CC) -+PHP_HTTP_API http_request_datashare *_http_request_datashare_init_ex(http_request_datashare *share, zend_bool persistent TSRMLS_DC); -+ -+#define http_request_datashare_attach(s, r) _http_request_datashare_attach((s), (r) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_request_datashare_attach(http_request_datashare *share, zval *request TSRMLS_DC); -+ -+#define http_request_datashare_detach(s, r) _http_request_datashare_detach((s), (r) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_request_datashare_detach(http_request_datashare *share, zval *request TSRMLS_DC); -+ -+#define http_request_datashare_detach_all(s) _http_request_datashare_detach_all((s) TSRMLS_CC) -+PHP_HTTP_API void _http_request_datashare_detach_all(http_request_datashare *share TSRMLS_DC); -+ -+#define http_request_datashare_dtor(s) _http_request_datashare_dtor((s) TSRMLS_CC) -+PHP_HTTP_API void _http_request_datashare_dtor(http_request_datashare *share TSRMLS_DC); -+ -+#define http_request_datashare_free(s) _http_request_datashare_free((s) TSRMLS_CC) -+PHP_HTTP_API void _http_request_datashare_free(http_request_datashare **share TSRMLS_DC); -+ -+#define http_request_datashare_set(s, o, l, e) _http_request_datashare_set((s), (o), (l), (e) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_request_datashare_set(http_request_datashare *share, const char *option, size_t option_len, zend_bool enable TSRMLS_DC); -+ -+ -+#endif -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_request_int.h -@@ -0,0 +1,72 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_request_int.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#if defined(ZTS) && defined(HTTP_HAVE_SSL) -+# ifdef PHP_WIN32 -+# define HTTP_NEED_OPENSSL_TSL -+# include -+# else /* !PHP_WIN32 */ -+# if defined(HTTP_HAVE_OPENSSL) -+# define HTTP_NEED_OPENSSL_TSL -+# include -+# elif defined(HTTP_HAVE_GNUTLS) -+# define HTTP_NEED_GNUTLS_TSL -+# include -+# else -+# warning \ -+ "libcurl was compiled with SSL support, but configure could not determine which" \ -+ "library was used; thus no SSL crypto locking callbacks will be set, which may " \ -+ "cause random crashes on SSL requests" -+# endif /* HTTP_HAVE_OPENSSL || HTTP_HAVE_GNUTLS */ -+# endif /* PHP_WIN32 */ -+#endif /* ZTS && HTTP_HAVE_SSL */ -+ -+#define HTTP_CURL_OPT(OPTION, p) curl_easy_setopt((request->ch), OPTION, (p)) -+ -+#define HTTP_CURL_OPT_STRING(OPTION, ldiff, obdc) \ -+ { \ -+ char *K = #OPTION; \ -+ HTTP_CURL_OPT_STRING_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION, obdc); \ -+ } -+#define HTTP_CURL_OPT_STRING_EX(keyname, optname, obdc) \ -+ if (!strcasecmp(key.str, keyname)) { \ -+ zval *copy = http_request_option_cache_ex(request, keyname, strlen(keyname)+1, 0, http_zsep(IS_STRING, *param)); \ -+ if (obdc) { \ -+ HTTP_CHECK_OPEN_BASEDIR(Z_STRVAL_P(copy), return FAILURE); \ -+ } \ -+ HTTP_CURL_OPT(optname, Z_STRVAL_P(copy)); \ -+ zval_ptr_dtor(©); \ -+ continue; \ -+ } -+#define HTTP_CURL_OPT_LONG(OPTION, ldiff) \ -+ { \ -+ char *K = #OPTION; \ -+ HTTP_CURL_OPT_LONG_EX(K+lenof("CURLOPT_KEY")+ldiff, OPTION); \ -+ } -+#define HTTP_CURL_OPT_LONG_EX(keyname, optname) \ -+ if (!strcasecmp(key.str, keyname)) { \ -+ zval *copy = http_zsep(IS_LONG, *param); \ -+ HTTP_CURL_OPT(optname, Z_LVAL_P(copy)); \ -+ zval_ptr_dtor(©); \ -+ continue; \ -+ } -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/php_http_request_method_api.h -@@ -0,0 +1,85 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_request_method_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_REQUEST_METHOD_API_H -+#define PHP_HTTP_REQUEST_METHOD_API_H -+ -+typedef enum _http_request_method_t { -+ /* force the enum to be signed */ -+ HTTP_NEG_REQUEST_METHOD =-1, -+ HTTP_NO_REQUEST_METHOD = 0, -+ /* HTTP/1.1 */ -+ HTTP_GET = 1, -+ HTTP_HEAD = 2, -+ HTTP_POST = 3, -+ HTTP_PUT = 4, -+ HTTP_DELETE = 5, -+ HTTP_OPTIONS = 6, -+ HTTP_TRACE = 7, -+ HTTP_CONNECT = 8, -+ /* WebDAV - RFC 2518 */ -+ HTTP_PROPFIND = 9, -+ HTTP_PROPPATCH = 10, -+ HTTP_MKCOL = 11, -+ HTTP_COPY = 12, -+ HTTP_MOVE = 13, -+ HTTP_LOCK = 14, -+ HTTP_UNLOCK = 15, -+ /* WebDAV Versioning - RFC 3253 */ -+ HTTP_VERSION_CONTROL = 16, -+ HTTP_REPORT = 17, -+ HTTP_CHECKOUT = 18, -+ HTTP_CHECKIN = 19, -+ HTTP_UNCHECKOUT = 20, -+ HTTP_MKWORKSPACE = 21, -+ HTTP_UPDATE = 22, -+ HTTP_LABEL = 23, -+ HTTP_MERGE = 24, -+ HTTP_BASELINE_CONTROL = 25, -+ HTTP_MKACTIVITY = 26, -+ /* WebDAV Access Control - RFC 3744 */ -+ HTTP_ACL = 27, -+ HTTP_MAX_REQUEST_METHOD = 28 -+} http_request_method; -+ -+#define HTTP_MIN_REQUEST_METHOD (HTTP_NO_REQUEST_METHOD + 1) -+#define HTTP_STD_REQUEST_METHOD(m) ((m > HTTP_NO_REQUEST_METHOD) && (m < HTTP_MAX_REQUEST_METHOD)) -+ -+extern PHP_MINIT_FUNCTION(http_request_method); -+extern PHP_RINIT_FUNCTION(http_request_method); -+extern PHP_RSHUTDOWN_FUNCTION(http_request_method); -+ -+#define http_request_method_name(m) _http_request_method_name((m) TSRMLS_CC) -+PHP_HTTP_API const char *_http_request_method_name(http_request_method m TSRMLS_DC); -+ -+#define http_request_method_exists(u, l, c) _http_request_method_exists((u), (l), (c) TSRMLS_CC) -+PHP_HTTP_API int _http_request_method_exists(int by_name, http_request_method id, const char *name TSRMLS_DC); -+ -+#define http_request_method_register(m, l) _http_request_method_register((m), (l) TSRMLS_CC) -+PHP_HTTP_API int _http_request_method_register(const char *method, int method_name_len TSRMLS_DC); -+ -+#define http_request_method_unregister(mn) _http_request_method_unregister((mn) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_request_method_unregister(int method TSRMLS_DC); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_request_object.h -@@ -0,0 +1,118 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_request_object.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_REQUEST_OBJECT_H -+#define PHP_HTTP_REQUEST_OBJECT_H -+#ifdef HTTP_HAVE_CURL -+#ifdef ZEND_ENGINE_2 -+ -+#include "php_http_request_api.h" -+#include "php_http_request_pool_api.h" -+#include "php_http_request_datashare_api.h" -+ -+typedef struct _http_request_object_t { -+ zend_object zo; -+ http_request *request; -+ http_request_pool *pool; -+ http_request_datashare *share; -+} http_request_object; -+ -+extern zend_class_entry *http_request_object_ce; -+extern zend_function_entry http_request_object_fe[]; -+ -+extern PHP_MINIT_FUNCTION(http_request_object); -+ -+#define http_request_object_new(ce) _http_request_object_new((ce) TSRMLS_CC) -+extern zend_object_value _http_request_object_new(zend_class_entry *ce TSRMLS_DC); -+#define http_request_object_new_ex(ce, ch, ptr) _http_request_object_new_ex((ce), (ch), (ptr) TSRMLS_CC) -+extern zend_object_value _http_request_object_new_ex(zend_class_entry *ce, CURL *ch, http_request_object **ptr TSRMLS_DC); -+#define http_request_object_clone(zv) _http_request_object_clone_obj((zv) TSRMLS_CC) -+extern zend_object_value _http_request_object_clone_obj(zval *zobject TSRMLS_DC); -+#define http_request_object_free(o) _http_request_object_free((o) TSRMLS_CC) -+extern void _http_request_object_free(zend_object *object TSRMLS_DC); -+ -+#define http_request_object_requesthandler(req, this) _http_request_object_requesthandler((req), (this) TSRMLS_CC) -+extern STATUS _http_request_object_requesthandler(http_request_object *obj, zval *this_ptr TSRMLS_DC); -+#define http_request_object_responsehandler(req, this) _http_request_object_responsehandler((req), (this) TSRMLS_CC) -+extern STATUS _http_request_object_responsehandler(http_request_object *obj, zval *this_ptr TSRMLS_DC); -+ -+PHP_METHOD(HttpRequest, __construct); -+PHP_METHOD(HttpRequest, setOptions); -+PHP_METHOD(HttpRequest, getOptions); -+PHP_METHOD(HttpRequest, addSslOptions); -+PHP_METHOD(HttpRequest, setSslOptions); -+PHP_METHOD(HttpRequest, getSslOptions); -+PHP_METHOD(HttpRequest, addHeaders); -+PHP_METHOD(HttpRequest, getHeaders); -+PHP_METHOD(HttpRequest, setHeaders); -+PHP_METHOD(HttpRequest, addCookies); -+PHP_METHOD(HttpRequest, getCookies); -+PHP_METHOD(HttpRequest, setCookies); -+PHP_METHOD(HttpRequest, enableCookies); -+PHP_METHOD(HttpRequest, resetCookies); -+PHP_METHOD(HttpRequest, flushCookies); -+PHP_METHOD(HttpRequest, setMethod); -+PHP_METHOD(HttpRequest, getMethod); -+PHP_METHOD(HttpRequest, setUrl); -+PHP_METHOD(HttpRequest, getUrl); -+PHP_METHOD(HttpRequest, setContentType); -+PHP_METHOD(HttpRequest, getContentType); -+PHP_METHOD(HttpRequest, setQueryData); -+PHP_METHOD(HttpRequest, getQueryData); -+PHP_METHOD(HttpRequest, addQueryData); -+PHP_METHOD(HttpRequest, setPostFields); -+PHP_METHOD(HttpRequest, getPostFields); -+PHP_METHOD(HttpRequest, addPostFields); -+PHP_METHOD(HttpRequest, getBody); -+PHP_METHOD(HttpRequest, setBody); -+PHP_METHOD(HttpRequest, addBody); -+PHP_METHOD(HttpRequest, addPostFile); -+PHP_METHOD(HttpRequest, setPostFiles); -+PHP_METHOD(HttpRequest, getPostFiles); -+PHP_METHOD(HttpRequest, setPutFile); -+PHP_METHOD(HttpRequest, getPutFile); -+PHP_METHOD(HttpRequest, getPutData); -+PHP_METHOD(HttpRequest, setPutData); -+PHP_METHOD(HttpRequest, addPutData); -+PHP_METHOD(HttpRequest, send); -+PHP_METHOD(HttpRequest, getResponseData); -+PHP_METHOD(HttpRequest, getResponseHeader); -+PHP_METHOD(HttpRequest, getResponseCookies); -+PHP_METHOD(HttpRequest, getResponseCode); -+PHP_METHOD(HttpRequest, getResponseStatus); -+PHP_METHOD(HttpRequest, getResponseBody); -+PHP_METHOD(HttpRequest, getResponseInfo); -+PHP_METHOD(HttpRequest, getResponseMessage); -+PHP_METHOD(HttpRequest, getRawResponseMessage); -+PHP_METHOD(HttpRequest, getRequestMessage); -+PHP_METHOD(HttpRequest, getRawRequestMessage); -+PHP_METHOD(HttpRequest, getHistory); -+PHP_METHOD(HttpRequest, clearHistory); -+PHP_METHOD(HttpRequest, getMessageClass); -+PHP_METHOD(HttpRequest, setMessageClass); -+PHP_METHOD(HttpRequest, factory); -+ -+#endif -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_request_pool_api.h -@@ -0,0 +1,97 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_request_pool_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_REQUEST_POOL_API_H -+#define PHP_HTTP_REQUEST_POOL_API_H -+#ifdef HTTP_HAVE_CURL -+#ifdef ZEND_ENGINE_2 -+ -+typedef struct _http_request_pool_t { -+ CURLM *ch; -+ zend_llist finished; -+ zend_llist handles; -+ int unfinished; -+#ifdef ZTS -+ void ***tsrm_ls; -+#endif -+#ifdef HTTP_HAVE_EVENT -+ struct event *timeout; -+ unsigned useevents:1; -+ unsigned runsocket:1; -+#endif -+} http_request_pool; -+ -+typedef int (*http_request_pool_apply_func)(http_request_pool *pool, zval *request); -+typedef int (*http_request_pool_apply_with_arg_func)(http_request_pool *pool, zval *request, void *arg); -+ -+PHP_MINIT_FUNCTION(http_request_pool); -+#ifdef HTTP_HAVE_EVENT -+PHP_RINIT_FUNCTION(http_request_pool); -+#endif -+ -+#define http_request_pool_timeout _http_request_pool_timeout -+extern struct timeval *_http_request_pool_timeout(http_request_pool *pool, struct timeval *timeout); -+ -+#define http_request_pool_responsehandler _http_request_pool_responsehandler -+extern void _http_request_pool_responsehandler(http_request_pool *pool); -+ -+#define http_request_pool_apply_responsehandler _http_request_pool_responsehandler -+extern int _http_request_pool_apply_responsehandler(http_request_pool *pool, zval *req, void *ch); -+ -+#define http_request_pool_init(p) _http_request_pool_init((p) TSRMLS_CC) -+PHP_HTTP_API http_request_pool *_http_request_pool_init(http_request_pool *pool TSRMLS_DC); -+ -+#define http_request_pool_attach(p, r) _http_request_pool_attach((p), (r)) -+PHP_HTTP_API STATUS _http_request_pool_attach(http_request_pool *pool, zval *request); -+ -+#define http_request_pool_detach(p, r) _http_request_pool_detach((p), (r)) -+PHP_HTTP_API STATUS _http_request_pool_detach(http_request_pool *pool, zval *request); -+ -+#define http_request_pool_apply(p, f) _http_request_pool_apply((p), (f)) -+PHP_HTTP_API void _http_request_pool_apply(http_request_pool *pool, http_request_pool_apply_func cb); -+ -+#define http_request_pool_apply_with_arg(p, f, a) _http_request_pool_apply_with_arg((p), (f), (a)) -+PHP_HTTP_API void _http_request_pool_apply_with_arg(http_request_pool *pool, http_request_pool_apply_with_arg_func cb, void *arg); -+ -+#define http_request_pool_detach_all(p) _http_request_pool_detach_all((p)) -+PHP_HTTP_API void _http_request_pool_detach_all(http_request_pool *pool); -+ -+#define http_request_pool_send(p) _http_request_pool_send((p)) -+PHP_HTTP_API STATUS _http_request_pool_send(http_request_pool *pool); -+ -+#define http_request_pool_select _http_request_pool_select -+PHP_HTTP_API STATUS _http_request_pool_select(http_request_pool *pool); -+ -+#define http_request_pool_select_ex _http_request_pool_select_ex -+PHP_HTTP_API STATUS _http_request_pool_select_ex(http_request_pool *pool, struct timeval *custom_timeout); -+ -+#define http_request_pool_perform(p) _http_request_pool_perform((p)) -+PHP_HTTP_API int _http_request_pool_perform(http_request_pool *pool); -+ -+#define http_request_pool_dtor(p) _http_request_pool_dtor((p)) -+PHP_HTTP_API void _http_request_pool_dtor(http_request_pool *pool); -+ -+#endif -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_requestdatashare_object.h -@@ -0,0 +1,59 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_requestdatashare_object.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_REQUEST_DATASHARE_OBJECT_H -+#define PHP_HTTP_REQUEST_DATASHARE_OBJECT_H -+#ifdef HTTP_HAVE_CURL -+#ifdef ZEND_ENGINE_2 -+ -+typedef struct _http_requestdatashare_object_t { -+ zend_object zo; -+ http_request_datashare *share; -+} http_requestdatashare_object; -+ -+extern zend_class_entry *http_requestdatashare_object_ce; -+extern zend_function_entry http_requestdatashare_object_fe[]; -+ -+extern PHP_MINIT_FUNCTION(http_requestdatashare_object); -+ -+#define http_requestdatashare_object_new(ce) _http_requestdatashare_object_new((ce) TSRMLS_CC) -+extern zend_object_value _http_requestdatashare_object_new(zend_class_entry *ce TSRMLS_DC); -+#define http_requestdatashare_object_new_ex(ce, s, ptr) _http_requestdatashare_object_new_ex((ce), (s), (ptr) TSRMLS_CC) -+extern zend_object_value _http_requestdatashare_object_new_ex(zend_class_entry *ce, http_request_datashare *share, http_requestdatashare_object **ptr TSRMLS_DC); -+#define http_requestdatashare_object_free(o) _http_requestdatashare_object_free((o) TSRMLS_CC) -+extern void _http_requestdatashare_object_free(zend_object *object TSRMLS_DC); -+ -+PHP_METHOD(HttpRequestDataShare, __destruct); -+PHP_METHOD(HttpRequestDataShare, count); -+PHP_METHOD(HttpRequestDataShare, attach); -+PHP_METHOD(HttpRequestDataShare, detach); -+PHP_METHOD(HttpRequestDataShare, reset); -+PHP_METHOD(HttpRequestDataShare, factory); -+#ifndef WONKY -+PHP_METHOD(HttpRequestDataShare, singleton); -+#endif -+ -+#endif -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_requestpool_object.h -@@ -0,0 +1,69 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_requestpool_object.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_REQUESTPOOL_OBJECT_H -+#define PHP_HTTP_REQUESTPOOL_OBJECT_H -+#ifdef HTTP_HAVE_CURL -+#ifdef ZEND_ENGINE_2 -+ -+typedef struct _http_requestpool_object_t { -+ zend_object zo; -+ http_request_pool pool; -+ struct { -+ long pos; -+ } iterator; -+} http_requestpool_object; -+ -+extern zend_class_entry *http_requestpool_object_ce; -+extern zend_function_entry http_requestpool_object_fe[]; -+ -+extern PHP_MINIT_FUNCTION(http_requestpool_object); -+ -+#define http_requestpool_object_new(ce) _http_requestpool_object_new(ce TSRMLS_CC) -+extern zend_object_value _http_requestpool_object_new(zend_class_entry *ce TSRMLS_DC); -+#define http_requestpool_object_free(o) _http_requestpool_object_free(o TSRMLS_CC) -+extern void _http_requestpool_object_free(zend_object *object TSRMLS_DC); -+ -+PHP_METHOD(HttpRequestPool, __construct); -+PHP_METHOD(HttpRequestPool, __destruct); -+PHP_METHOD(HttpRequestPool, attach); -+PHP_METHOD(HttpRequestPool, detach); -+PHP_METHOD(HttpRequestPool, send); -+PHP_METHOD(HttpRequestPool, reset); -+PHP_METHOD(HttpRequestPool, socketPerform); -+PHP_METHOD(HttpRequestPool, socketSelect); -+PHP_METHOD(HttpRequestPool, valid); -+PHP_METHOD(HttpRequestPool, current); -+PHP_METHOD(HttpRequestPool, key); -+PHP_METHOD(HttpRequestPool, next); -+PHP_METHOD(HttpRequestPool, rewind); -+PHP_METHOD(HttpRequestPool, count); -+PHP_METHOD(HttpRequestPool, getAttachedRequests); -+PHP_METHOD(HttpRequestPool, getFinishedRequests); -+PHP_METHOD(HttpRequestPool, enablePipelining); -+PHP_METHOD(HttpRequestPool, enableEvents); -+ -+#endif -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_response_object.h -@@ -0,0 +1,67 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_response_object.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_RESPONSE_OBJECT_H -+#define PHP_HTTP_RESPONSE_OBJECT_H -+#ifdef ZEND_ENGINE_2 -+#ifndef WONKY -+ -+extern zend_class_entry *http_response_object_ce; -+extern zend_function_entry http_response_object_fe[]; -+ -+extern PHP_MINIT_FUNCTION(http_response_object); -+ -+PHP_METHOD(HttpResponse, setHeader); -+PHP_METHOD(HttpResponse, getHeader); -+PHP_METHOD(HttpResponse, setETag); -+PHP_METHOD(HttpResponse, getETag); -+PHP_METHOD(HttpResponse, setLastModified); -+PHP_METHOD(HttpResponse, getLastModified); -+PHP_METHOD(HttpResponse, setContentDisposition); -+PHP_METHOD(HttpResponse, getContentDisposition); -+PHP_METHOD(HttpResponse, setContentType); -+PHP_METHOD(HttpResponse, getContentType); -+PHP_METHOD(HttpResponse, guessContentType); -+PHP_METHOD(HttpResponse, setCache); -+PHP_METHOD(HttpResponse, getCache); -+PHP_METHOD(HttpResponse, setCacheControl); -+PHP_METHOD(HttpResponse, getCacheControl); -+PHP_METHOD(HttpResponse, setGzip); -+PHP_METHOD(HttpResponse, getGzip); -+PHP_METHOD(HttpResponse, setThrottleDelay); -+PHP_METHOD(HttpResponse, getThrottleDelay); -+PHP_METHOD(HttpResponse, setBufferSize); -+PHP_METHOD(HttpResponse, getBufferSize); -+PHP_METHOD(HttpResponse, setData); -+PHP_METHOD(HttpResponse, getData); -+PHP_METHOD(HttpResponse, setFile); -+PHP_METHOD(HttpResponse, getFile); -+PHP_METHOD(HttpResponse, setStream); -+PHP_METHOD(HttpResponse, getStream); -+PHP_METHOD(HttpResponse, send); -+PHP_METHOD(HttpResponse, capture); -+ -+#endif -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_send_api.h -@@ -0,0 +1,91 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_send_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_SEND_API_H -+#define PHP_HTTP_SEND_API_H -+ -+typedef enum _http_send_mode_t { -+ SEND_DATA, -+ SEND_RSRC -+} http_send_mode; -+ -+#define HTTP_REDIRECT 0L -+#define HTTP_REDIRECT_PERM 301L -+#define HTTP_REDIRECT_FOUND 302L -+#define HTTP_REDIRECT_POST 303L -+#define HTTP_REDIRECT_PROXY 305L -+#define HTTP_REDIRECT_TEMP 307L -+ -+extern PHP_MINIT_FUNCTION(http_send); -+ -+#define http_send_status(s) sapi_header_op(SAPI_HEADER_SET_STATUS, (void *) (long) (s) TSRMLS_CC) -+#define http_send_header(n, v, r) _http_send_header_ex((n), strlen(n), (v), strlen(v), (r), NULL TSRMLS_CC) -+#define http_send_header_ex(n, nl, v, vl, r, s) _http_send_header_ex((n), (nl), (v), (vl), (r), (s) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_send_header_ex(const char *name, size_t name_len, const char *value, size_t value_len, zend_bool replace, char **sent_header TSRMLS_DC); -+#define http_send_header_string(h) _http_send_status_header_ex(0, (h), strlen(h), 1 TSRMLS_CC) -+#define http_send_header_string_ex(h, l, r) _http_send_status_header_ex(0, (h), (l), (r) TSRMLS_CC) -+#define http_send_status_header(s, h) _http_send_status_header_ex((s), (h), (h)?strlen(h):0, 1 TSRMLS_CC) -+#define http_send_status_header_ex(s, h, l, r) _http_send_status_header_ex((s), (h), (l), (r) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_send_status_header_ex(int status, const char *header, size_t header_len, zend_bool replace TSRMLS_DC); -+ -+#define http_send_header_zval(n, z, r) http_send_header_zval_ex((n), strlen(n), (z), (r)) -+#define http_send_header_zval_ex(n, l, z, r) _http_send_header_zval_ex((n), (l), (z), (r) TSRMLS_CC) -+PHP_HTTP_API void _http_send_header_zval_ex(const char *name, size_t name_len, zval **val, zend_bool replace TSRMLS_DC); -+ -+#define http_hide_header(h) http_hide_header_ex((h), strlen(h)) -+#define http_hide_header_ex(h, l) _http_hide_header_ex((h), (l) TSRMLS_CC) -+PHP_HTTP_API void _http_hide_header_ex(const char *name, size_t name_len TSRMLS_DC); -+ -+#define http_send_last_modified(t) _http_send_last_modified_ex((t), NULL TSRMLS_CC) -+#define http_send_last_modified_ex(t, s) _http_send_last_modified_ex((t), (s) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_send_last_modified_ex(time_t t, char **sent_header TSRMLS_DC); -+ -+#define http_send_etag(e, l) _http_send_etag_ex((e), (l), NULL TSRMLS_CC) -+#define http_send_etag_ex(e, l, s) _http_send_etag_ex((e), (l), (s) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_send_etag_ex(const char *etag, size_t etag_len, char **sent_header TSRMLS_DC); -+ -+#define http_send_cache_control(cc, cl) http_send_header_ex("Cache-Control", lenof("Cache-Control"), (cc), (cl), 1, NULL) -+ -+#define http_send_content_type(c, l) _http_send_content_type((c), (l) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_send_content_type(const char *content_type, size_t ct_len TSRMLS_DC); -+ -+#define http_send_content_disposition(f, l, i) _http_send_content_disposition((f), (l), (i) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_send_content_disposition(const char *filename, size_t f_len, zend_bool send_inline TSRMLS_DC); -+ -+#define http_send_data(d, l) http_send((d), (l), SEND_DATA) -+#define http_send_data_ex(d, l, nc) http_send_ex((d), (l), SEND_DATA, (nc)) -+#define http_send(d, s, m) _http_send_ex((d), (s), (m), 0 TSRMLS_CC) -+#define http_send_ex(d, s, m, nc) _http_send_ex((d), (s), (m), (nc) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_send_ex(const void *data, size_t data_size, http_send_mode mode, zend_bool no_cache TSRMLS_DC); -+ -+#define http_send_file(f) http_send_stream_ex(php_stream_open_wrapper_ex(f, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT), 1, 0) -+#define http_send_file_ex(f, nc) http_send_stream_ex(php_stream_open_wrapper_ex(f, "rb", REPORT_ERRORS|ENFORCE_SAFE_MODE, NULL, HTTP_DEFAULT_STREAM_CONTEXT), 1, (nc)) -+#define http_send_stream(s) http_send_stream_ex((s), 0, 0) -+#define http_send_stream_ex(s, c, nc) _http_send_stream_ex((s), (c), (nc) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_send_stream_ex(php_stream *s, zend_bool close_stream, zend_bool no_cache TSRMLS_DC); -+ -+#define http_guess_content_type(mf, mm, d, l, m) _http_guess_content_type((mf), (mm), (d), (l), (m) TSRMLS_CC) -+PHP_HTTP_API char *_http_guess_content_type(const char *magic_file, long magic_mode, void *data_ptr, size_t data_len, http_send_mode mode TSRMLS_DC); -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_std_defs.h -@@ -0,0 +1,406 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_std_defs.h 310777 2011-05-05 06:43:10Z mike $ */ -+ -+#ifndef PHP_HTTP_STD_DEFS_H -+#define PHP_HTTP_STD_DEFS_H -+ -+#if defined(PHP_WIN32) -+# if defined(HTTP_EXPORTS) -+# define PHP_HTTP_API __declspec(dllexport) -+# elif defined(COMPILE_DL_HTTP) -+# define PHP_HTTP_API __declspec(dllimport) -+# else -+# define PHP_HTTP_API -+# endif -+#else -+# define PHP_HTTP_API -+#endif -+ -+/* make functions that return SUCCESS|FAILURE more obvious */ -+typedef int STATUS; -+ -+/* lenof() */ -+#define lenof(S) (sizeof(S) - 1) -+ -+#ifndef MIN -+# define MIN(a,b) (ab?a:b) -+#endif -+ -+/* STR_SET() */ -+#ifndef STR_SET -+# define STR_SET(STR, SET) \ -+ { \ -+ STR_FREE(STR); \ -+ STR = SET; \ -+ } -+#endif -+ -+#define STR_PTR(s) (s?s:"") -+ -+#define INIT_ZARR(zv, ht) \ -+ { \ -+ INIT_PZVAL(&(zv)); \ -+ Z_TYPE(zv) = IS_ARRAY; \ -+ Z_ARRVAL(zv) = (ht); \ -+ } -+ -+/* return bool (v == SUCCESS) */ -+#define RETVAL_SUCCESS(v) RETVAL_BOOL(SUCCESS == (v)) -+#define RETURN_SUCCESS(v) RETURN_BOOL(SUCCESS == (v)) -+/* return object(values) */ -+#define RETVAL_OBJECT(o, addref) \ -+ RETVAL_OBJVAL((o)->value.obj, addref) -+#define RETURN_OBJECT(o, addref) \ -+ RETVAL_OBJECT(o, addref); \ -+ return -+#define RETVAL_OBJVAL(ov, addref) \ -+ ZVAL_OBJVAL(return_value, ov, addref) -+#define RETURN_OBJVAL(ov, addref) \ -+ RETVAL_OBJVAL(ov, addref); \ -+ return -+#define ZVAL_OBJVAL(zv, ov, addref) \ -+ (zv)->type = IS_OBJECT; \ -+ (zv)->value.obj = (ov);\ -+ if (addref && Z_OBJ_HT_P(zv)->add_ref) { \ -+ Z_OBJ_HT_P(zv)->add_ref((zv) TSRMLS_CC); \ -+ } -+/* return property */ -+#define RETVAL_PROP(n) RETVAL_PROP_EX(getThis(), n) -+#define RETURN_PROP(n) RETURN_PROP_EX(getThis(), n) -+#define RETVAL_PROP_EX(this, n) \ -+ { \ -+ zval *__prop = zend_read_property(THIS_CE, this, ZEND_STRS(#n)-1, 0 TSRMLS_CC); \ -+ RETVAL_ZVAL(__prop, 1, 0); \ -+ } -+#define RETURN_PROP_EX(this, n) \ -+ { \ -+ zval *__prop = zend_read_property(THIS_CE, this, ZEND_STRS(#n)-1, 0 TSRMLS_CC); \ -+ RETURN_ZVAL(__prop, 1, 0); \ -+ } -+ -+/* function accepts no args */ -+#define NO_ARGS zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, ""); -+ -+/* CR LF */ -+#define HTTP_CRLF "\r\n" -+ -+/* default cache control */ -+#define HTTP_DEFAULT_CACHECONTROL "private, must-revalidate, max-age=0" -+ -+/* max URL length */ -+#define HTTP_URL_MAXLEN 4096 -+ -+/* max request method length */ -+#define HTTP_REQUEST_METHOD_MAXLEN 31 -+ -+/* def URL arg separator */ -+#define HTTP_URL_ARGSEP "&" -+ -+/* send buffer size */ -+#define HTTP_SENDBUF_SIZE 40960 -+ -+/* CURL buffer size */ -+#define HTTP_CURLBUF_SIZE 16384 -+ -+/* known methods */ -+#define HTTP_KNOWN_METHODS \ -+ /* HTTP 1.1 */ \ -+ "GET, HEAD, POST, PUT, DELETE, OPTIONS, TRACE, CONNECT, " \ -+ /* WebDAV - RFC 2518 */ \ -+ "PROPFIND, PROPPATCH, MKCOL, COPY, MOVE, LOCK, UNLOCK, " \ -+ /* WebDAV Versioning - RFC 3253 */ \ -+ "VERSION-CONTROL, REPORT, CHECKOUT, CHECKIN, UNCHECKOUT, " \ -+ "MKWORKSPACE, UPDATE, LABEL, MERGE, BASELINE-CONTROL, MKACTIVITY, " \ -+ /* WebDAV Access Control - RFC 3744 */ \ -+ "ACL, " \ -+ /* END */ -+ -+#ifdef ZEND_ENGINE_2 -+# include "ext/standard/file.h" -+# define HTTP_DEFAULT_STREAM_CONTEXT FG(default_context) -+#else -+# define HTTP_DEFAULT_STREAM_CONTEXT NULL -+#endif -+ -+#define HTTP_PHP_INI_ENTRY(entry, default, scope, updater, global) \ -+ STD_PHP_INI_ENTRY(entry, default, scope, updater, global, zend_http_globals, http_globals) -+#define HTTP_PHP_INI_ENTRY_EX(entry, default, scope, updater, displayer, global) \ -+ STD_PHP_INI_ENTRY_EX(entry, default, scope, updater, global, zend_http_globals, http_globals, displayer) -+ -+ -+#define HTTP_LONG_CONSTANT(name, const) REGISTER_LONG_CONSTANT(name, const, CONST_CS | CONST_PERSISTENT) -+ -+/* {{{ objects & properties */ -+#ifdef ZEND_ENGINE_2 -+ -+# define HTTP_STATIC_ME_ALIAS(me, al, ai) ZEND_FENTRY(me, ZEND_FN(al), ai, ZEND_ACC_PUBLIC | ZEND_ACC_STATIC) -+ -+# define HTTP_REGISTER_CLASS_EX(classname, name, parent, flags) \ -+ { \ -+ zend_class_entry ce; \ -+ memset(&ce, 0, sizeof(zend_class_entry)); \ -+ INIT_CLASS_ENTRY(ce, #classname, name## _fe); \ -+ ce.create_object = _ ##name## _new; \ -+ name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \ -+ name## _ce->ce_flags |= flags; \ -+ memcpy(& name## _handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers)); \ -+ } -+ -+# define HTTP_REGISTER_CLASS(classname, name, parent, flags) \ -+ { \ -+ zend_class_entry ce; \ -+ memset(&ce, 0, sizeof(zend_class_entry)); \ -+ INIT_CLASS_ENTRY(ce, #classname, name## _fe); \ -+ ce.create_object = NULL; \ -+ name## _ce = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \ -+ name## _ce->ce_flags |= flags; \ -+ } -+ -+# define HTTP_REGISTER_EXCEPTION(classname, cename, parent) \ -+ { \ -+ zend_class_entry ce; \ -+ memset(&ce, 0, sizeof(zend_class_entry)); \ -+ INIT_CLASS_ENTRY(ce, #classname, NULL); \ -+ ce.create_object = NULL; \ -+ cename = zend_register_internal_class_ex(&ce, parent, NULL TSRMLS_CC); \ -+ } -+ -+# define getObject(t, o) getObjectEx(t, o, getThis()) -+# define getObjectEx(t, o, v) t * o = ((t *) zend_object_store_get_object(v TSRMLS_CC)) -+# define putObject(t, o) zend_objects_store_put(o, (zend_objects_store_dtor_t) zend_objects_destroy_object, (zend_objects_free_object_storage_t) _ ##t## _free, NULL TSRMLS_CC); -+# ifndef WONKY -+# define freeObject(o) \ -+ if (OBJ_GUARDS(o)) { \ -+ zend_hash_destroy(OBJ_GUARDS(o)); \ -+ FREE_HASHTABLE(OBJ_GUARDS(o)); \ -+ } \ -+ if (OBJ_PROP(o)) { \ -+ zend_hash_destroy(OBJ_PROP(o)); \ -+ FREE_HASHTABLE(OBJ_PROP(o)); \ -+ } \ -+ efree(o); -+# else -+# define freeObject(o) \ -+ if (OBJ_PROP(o)) { \ -+ zend_hash_destroy(OBJ_PROP(o)); \ -+ FREE_HASHTABLE(OBJ_PROP(o)); \ -+ } \ -+ efree(o); -+# endif -+# define OBJ_PROP(o) (o)->zo.properties -+# define OBJ_GUARDS(o) (o)->zo.guards -+ -+# define ACC_PROP_PRIVATE(ce, flags) ((flags & ZEND_ACC_PRIVATE) && (EG(scope) && ce == EG(scope)) -+# define ACC_PROP_PROTECTED(ce, flags) ((flags & ZEND_ACC_PROTECTED) && (zend_check_protected(ce, EG(scope)))) -+# define ACC_PROP_PUBLIC(flags) (flags & ZEND_ACC_PUBLIC) -+# define ACC_PROP(ce, flags) (ACC_PROP_PUBLIC(flags) || ACC_PROP_PRIVATE(ce, flags) || ACC_PROP_PROTECTED(ce, flags)) -+ -+# define SET_EH_THROW_HTTP() SET_EH_THROW_EX(http_exception_get_default()) -+# define SET_EH_THROW_EX(ex) php_set_error_handling(EH_THROW, ex TSRMLS_CC) -+# define SET_EH_NORMAL() php_set_error_handling(EH_NORMAL, NULL TSRMLS_CC) -+ -+#endif /* ZEND_ENGINE_2 */ -+/* }}} */ -+ -+#ifdef ZEND_ENGINE_2 -+# define with_error_handling(eh, ec) \ -+ { \ -+ error_handling_t __eh = GLOBAL_ERROR_HANDLING; \ -+ zend_class_entry *__ec= GLOBAL_EXCEPTION_CLASS; \ -+ php_set_error_handling(eh, ec TSRMLS_CC); -+# define end_error_handling() \ -+ php_set_error_handling(__eh, __ec TSRMLS_CC); \ -+ } -+#else -+# define with_error_handling(eh, ec) -+# define end_error_handling() -+#endif -+ -+#if (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 2) || PHP_MAJOR_VERSION > 5 -+# define ZEND_EXCEPTION_GET_DEFAULT() zend_exception_get_default(TSRMLS_C) -+#else -+# define ZEND_EXCEPTION_GET_DEFAULT() zend_exception_get_default() -+#endif -+ -+#ifndef E_THROW -+# define E_THROW 0 -+#endif -+#ifdef ZEND_ENGINE_2 -+# define HE_THROW E_THROW TSRMLS_CC -+# define HE_NOTICE (HTTP_G->only_exceptions ? E_THROW : E_NOTICE) TSRMLS_CC -+# define HE_WARNING (HTTP_G->only_exceptions ? E_THROW : E_WARNING) TSRMLS_CC -+# define HE_ERROR (HTTP_G->only_exceptions ? E_THROW : E_ERROR) TSRMLS_CC -+#else -+# define HE_THROW E_WARNING TSRMLS_CC -+# define HE_NOTICE E_NOTICE TSRMLS_CC -+# define HE_WARNING E_WARNING TSRMLS_CC -+# define HE_ERROR E_ERROR TSRMLS_CC -+#endif -+ -+#define HTTP_E_RUNTIME 1L -+#define HTTP_E_INVALID_PARAM 2L -+#define HTTP_E_HEADER 3L -+#define HTTP_E_MALFORMED_HEADERS 4L -+#define HTTP_E_REQUEST_METHOD 5L -+#define HTTP_E_MESSAGE_TYPE 6L -+#define HTTP_E_ENCODING 7L -+#define HTTP_E_REQUEST 8L -+#define HTTP_E_REQUEST_POOL 9L -+#define HTTP_E_SOCKET 10L -+#define HTTP_E_RESPONSE 11L -+#define HTTP_E_URL 12L -+#define HTTP_E_QUERYSTRING 13L -+ -+#ifdef ZEND_ENGINE_2 -+# define HTTP_BEGIN_ARGS_EX(class, method, ret_ref, req_args) HTTP_STATIC_ARG_INFO ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 0, ret_ref, req_args) -+# define HTTP_BEGIN_ARGS_AR(class, method, ret_ref, req_args) HTTP_STATIC_ARG_INFO ZEND_BEGIN_ARG_INFO_EX(args_for_ ##class## _ ##method , 1, ret_ref, req_args) -+# define HTTP_END_ARGS } -+# define HTTP_EMPTY_ARGS_EX(class, method, ret_ref) HTTP_BEGIN_ARGS_EX(class, method, ret_ref, 0) HTTP_END_ARGS -+# define HTTP_ARGS(class, method) args_for_ ##class## _ ##method -+# define HTTP_ARG_VAL(name, pass_ref) ZEND_ARG_INFO(pass_ref, name) -+# define HTTP_ARG_OBJ(class, name, allow_null) ZEND_ARG_OBJ_INFO(0, name, class, allow_null) -+#endif -+ -+#ifdef ZEND_ENGINE_2 -+# define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL, 0, 0} -+#else -+# define EMPTY_FUNCTION_ENTRY {NULL, NULL, NULL} -+#endif -+ -+#ifdef HTTP_HAVE_CURL -+# ifdef ZEND_ENGINE_2 -+# define HTTP_DECLARE_ARG_PASS_INFO() \ -+ HTTP_STATIC_ARG_INFO \ -+ ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(1) \ -+ ZEND_END_ARG_INFO(); \ -+ \ -+ HTTP_STATIC_ARG_INFO \ -+ ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(1) \ -+ ZEND_END_ARG_INFO(); \ -+ \ -+ HTTP_STATIC_ARG_INFO \ -+ ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(1) \ -+ ZEND_END_ARG_INFO(); \ -+ \ -+ HTTP_STATIC_ARG_INFO \ -+ ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_5, 0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(1) \ -+ ZEND_END_ARG_INFO(); -+ -+# else -+# define HTTP_DECLARE_ARG_PASS_INFO() \ -+ static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE}; \ -+ static unsigned char http_arg_pass_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \ -+ static unsigned char http_arg_pass_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \ -+ static unsigned char http_arg_pass_ref_5[] = {5, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -+# endif /* ZEND_ENGINE_2 */ -+#else -+# ifdef ZEND_ENGINE_2 -+# define HTTP_DECLARE_ARG_PASS_INFO() \ -+ HTTP_STATIC_ARG_INFO \ -+ ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_2, 0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(1) \ -+ ZEND_END_ARG_INFO(); \ -+\ -+ HTTP_STATIC_ARG_INFO \ -+ ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_3, 0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(1) \ -+ ZEND_END_ARG_INFO(); \ -+\ -+ HTTP_STATIC_ARG_INFO \ -+ ZEND_BEGIN_ARG_INFO(http_arg_pass_ref_4, 0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(0) \ -+ ZEND_ARG_PASS_INFO(1) \ -+ ZEND_END_ARG_INFO(); -+# else -+# define HTTP_DECLARE_ARG_PASS_INFO() \ -+ static unsigned char http_arg_pass_ref_2[] = {2, BYREF_NONE, BYREF_FORCE}; \ -+ static unsigned char http_arg_pass_ref_3[] = {3, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; \ -+ static unsigned char http_arg_pass_ref_4[] = {4, BYREF_NONE, BYREF_NONE, BYREF_NONE, BYREF_FORCE}; -+# endif /* ZEND_ENGINE_2 */ -+#endif /* HTTP_HAVE_CURL */ -+ -+ -+#ifndef HAVE_CURL_SHARE_STRERROR -+# define curl_share_strerror(dummy) "unknown error" -+#endif -+#ifndef HAVE_CURL_EASY_STRERROR -+# define curl_easy_strerror(dummy) "unknown error" -+#endif -+#ifndef HAVE_CURL_MULTI_STRERROR -+# define curl_multi_strerror(dummy) "unknown error" -+#endif -+ -+#define PHP_MINIT_CALL(func) PHP_MINIT(func)(INIT_FUNC_ARGS_PASSTHRU) -+#define PHP_RINIT_CALL(func) PHP_RINIT(func)(INIT_FUNC_ARGS_PASSTHRU) -+#define PHP_MSHUTDOWN_CALL(func) PHP_MSHUTDOWN(func)(SHUTDOWN_FUNC_ARGS_PASSTHRU) -+#define PHP_RSHUTDOWN_CALL(func) PHP_RSHUTDOWN(func)(SHUTDOWN_FUNC_ARGS_PASSTHRU) -+ -+#define Z_OBJ_DELREF(z) \ -+ if (Z_OBJ_HT(z)->del_ref) { \ -+ Z_OBJ_HT(z)->del_ref(&(z) TSRMLS_CC); \ -+ } -+#define Z_OBJ_ADDREF(z) \ -+ if (Z_OBJ_HT(z)->add_ref) { \ -+ Z_OBJ_HT(z)->add_ref(&(z) TSRMLS_CC); \ -+ } -+#define Z_OBJ_DELREF_P(z) \ -+ if (Z_OBJ_HT_P(z)->del_ref) { \ -+ Z_OBJ_HT_P(z)->del_ref((z) TSRMLS_CC); \ -+ } -+#define Z_OBJ_ADDREF_P(z) \ -+ if (Z_OBJ_HT_P(z)->add_ref) { \ -+ Z_OBJ_HT_P(z)->add_ref((z) TSRMLS_CC); \ -+ } -+#define Z_OBJ_DELREF_PP(z) \ -+ if (Z_OBJ_HT_PP(z)->del_ref) { \ -+ Z_OBJ_HT_PP(z)->del_ref(*(z) TSRMLS_CC); \ -+ } -+#define Z_OBJ_ADDREF_PP(z) \ -+ if (Z_OBJ_HT_PP(z)->add_ref) { \ -+ Z_OBJ_HT_PP(z)->add_ref(*(z) TSRMLS_CC); \ -+ } -+ -+#endif /* PHP_HTTP_STD_DEFS_H */ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_url_api.h -@@ -0,0 +1,165 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_url_api.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_URL_API_H -+#define PHP_HTTP_URL_API_H -+ -+#include "ext/standard/url.h" -+ -+extern PHP_MINIT_FUNCTION(http_url); -+ -+#define http_absolute_url(u) _http_absolute_url_ex((u), HTTP_URL_REPLACE TSRMLS_CC) -+#define http_absolute_url_ex(u, f) _http_absolute_url_ex((u), (f) TSRMLS_CC) -+PHP_HTTP_API char *_http_absolute_url_ex(const char *url, int flags TSRMLS_DC); -+ -+#define HTTP_URL_REPLACE 0x000 -+#define HTTP_URL_JOIN_PATH 0x001 -+#define HTTP_URL_JOIN_QUERY 0x002 -+#define HTTP_URL_STRIP_USER 0x004 -+#define HTTP_URL_STRIP_PASS 0x008 -+#define HTTP_URL_STRIP_AUTH (HTTP_URL_STRIP_USER|HTTP_URL_STRIP_PASS) -+#define HTTP_URL_STRIP_PORT 0x020 -+#define HTTP_URL_STRIP_PATH 0x040 -+#define HTTP_URL_STRIP_QUERY 0x080 -+#define HTTP_URL_STRIP_FRAGMENT 0x100 -+#define HTTP_URL_STRIP_ALL ( \ -+ HTTP_URL_STRIP_AUTH | \ -+ HTTP_URL_STRIP_PORT | \ -+ HTTP_URL_STRIP_PATH | \ -+ HTTP_URL_STRIP_QUERY | \ -+ HTTP_URL_STRIP_FRAGMENT \ -+) -+#define HTTP_URL_FROM_ENV 0x1000 -+ -+#define http_build_url(f, o, n, p, s, l) _http_build_url((f), (o), (n), (p), (s), (l) TSRMLS_CC) -+PHP_HTTP_API void _http_build_url(int flags, const php_url *old_url, const php_url *new_url, php_url **url_ptr, char **url_str, size_t *url_len TSRMLS_DC); -+ -+#define http_urlencode_hash(h, q) _http_urlencode_hash_ex((h), 1, NULL, 0, (q), NULL TSRMLS_CC) -+#define http_urlencode_hash_ex(h, o, p, pl, q, ql) _http_urlencode_hash_ex((h), (o), (p), (pl), (q), (ql) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_urlencode_hash_ex(HashTable *hash, zend_bool override_argsep, char *pre_encoded_data, size_t pre_encoded_len, char **encoded_data, size_t *encoded_len TSRMLS_DC); -+ -+#define http_urlencode_hash_recursive(ht, s, as, al, pr, pl) _http_urlencode_hash_recursive((ht), (s), (as), (al), (pr), (pl) TSRMLS_CC) -+PHP_HTTP_API STATUS _http_urlencode_hash_recursive(HashTable *ht, phpstr *str, const char *arg_sep, size_t arg_sep_len, const char *prefix, size_t prefix_len TSRMLS_DC); -+ -+#define http_url_from_struct(u, ht) _http_url_from_struct((u), (ht) TSRMLS_CC) -+static inline php_url *_http_url_from_struct(php_url *url, HashTable *ht TSRMLS_DC) -+{ -+ zval **e; -+ -+ if (!url) { -+ url = ecalloc(1, sizeof(php_url)); -+ } -+ -+ if ((SUCCESS == zend_hash_find(ht, "scheme", sizeof("scheme"), (void *) &e)) -+ && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { -+ url->scheme = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); -+ } -+ if ((SUCCESS == zend_hash_find(ht, "user", sizeof("user"), (void *) &e)) -+ && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { -+ url->user = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); -+ } -+ if ((SUCCESS == zend_hash_find(ht, "pass", sizeof("pass"), (void *) &e)) -+ && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { -+ url->pass = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); -+ } -+ if ((SUCCESS == zend_hash_find(ht, "host", sizeof("host"), (void *) &e)) -+ && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { -+ url->host = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); -+ } -+ if ((SUCCESS == zend_hash_find(ht, "path", sizeof("path"), (void *) &e)) -+ && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { -+ url->path = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); -+ } -+ if ((SUCCESS == zend_hash_find(ht, "query", sizeof("query"), (void *) &e)) -+ && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { -+ url->query = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); -+ } -+ if ((SUCCESS == zend_hash_find(ht, "fragment", sizeof("fragment"), (void *) &e)) -+ && (Z_TYPE_PP(e) == IS_STRING) && Z_STRLEN_PP(e)) { -+ url->fragment = estrndup(Z_STRVAL_PP(e), Z_STRLEN_PP(e)); -+ } -+ if (SUCCESS == zend_hash_find(ht, "port", sizeof("port"), (void *) &e)) { -+ if (Z_TYPE_PP(e) == IS_LONG) { -+ url->port = (unsigned short) Z_LVAL_PP(e); -+ } else { -+ zval *o = http_zsep(IS_LONG, *e); -+ -+ url->port = (unsigned short) Z_LVAL_P(o); -+ zval_ptr_dtor(&o); -+ } -+ } -+ -+ return url; -+} -+ -+#define http_url_tostruct(u, strct) _http_url_tostruct((u), (strct) TSRMLS_CC) -+static inline HashTable *_http_url_tostruct(php_url *url, zval *strct TSRMLS_DC) -+{ -+ zval arr; -+ -+ if (strct) { -+ switch (Z_TYPE_P(strct)) { -+ default: -+ zval_dtor(strct); -+ array_init(strct); -+ case IS_ARRAY: -+ case IS_OBJECT: -+ INIT_ZARR(arr, HASH_OF(strct)); -+ } -+ } else { -+ INIT_PZVAL(&arr); -+ array_init(&arr); -+ } -+ -+ if (url) { -+ if (url->scheme) { -+ add_assoc_string(&arr, "scheme", url->scheme, 1); -+ } -+ if (url->user) { -+ add_assoc_string(&arr, "user", url->user, 1); -+ } -+ if (url->pass) { -+ add_assoc_string(&arr, "pass", url->pass, 1); -+ } -+ if (url->host) { -+ add_assoc_string(&arr, "host", url->host, 1); -+ } -+ if (url->port) { -+ add_assoc_long(&arr, "port", (long) url->port); -+ } -+ if (url->path) { -+ add_assoc_string(&arr, "path", url->path, 1); -+ } -+ if (url->query) { -+ add_assoc_string(&arr, "query", url->query, 1); -+ } -+ if (url->fragment) { -+ add_assoc_string(&arr, "fragment", url->fragment, 1); -+ } -+ } -+ -+ return Z_ARRVAL(arr); -+} -+ -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/php_http_util_object.h -@@ -0,0 +1,35 @@ -+/* -+ +--------------------------------------------------------------------+ -+ | PECL :: http | -+ +--------------------------------------------------------------------+ -+ | Redistribution and use in source and binary forms, with or without | -+ | modification, are permitted provided that the conditions mentioned | -+ | in the accompanying LICENSE file are met. | -+ +--------------------------------------------------------------------+ -+ | Copyright (c) 2004-2010, Michael Wallner | -+ +--------------------------------------------------------------------+ -+*/ -+ -+/* $Id: php_http_util_object.h 292841 2009-12-31 08:48:57Z mike $ */ -+ -+#ifndef PHP_HTTP_UTIL_OBJECT_H -+#define PHP_HTTP_UTIL_OBJECT_H -+#ifdef ZEND_ENGINE_2 -+ -+extern zend_class_entry *http_util_object_ce; -+extern zend_function_entry http_util_object_fe[]; -+ -+extern PHP_MINIT_FUNCTION(http_util_object); -+ -+#endif -+#endif -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: noet sw=4 ts=4 fdm=marker -+ * vim<600: noet sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/phpstr/phpstr.c -@@ -0,0 +1,379 @@ -+ -+/* $Id: phpstr.c 211942 2006-04-24 17:17:09Z mike $ */ -+ -+#include "php.h" -+#include "phpstr.h" -+ -+PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, int flags) -+{ -+ if (!buf) { -+ buf = pemalloc(sizeof(phpstr), flags & PHPSTR_INIT_PERSISTENT); -+ } -+ -+ if (buf) { -+ buf->size = (chunk_size) ? chunk_size : PHPSTR_DEFAULT_SIZE; -+ buf->pmem = (flags & PHPSTR_INIT_PERSISTENT) ? 1 : 0; -+ buf->data = (flags & PHPSTR_INIT_PREALLOC) ? pemalloc(buf->size, buf->pmem) : NULL; -+ buf->free = (flags & PHPSTR_INIT_PREALLOC) ? buf->size : 0; -+ buf->used = 0; -+ } -+ -+ return buf; -+} -+ -+PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, const char *string, size_t length) -+{ -+ if ((buf = phpstr_init(buf))) { -+ if (PHPSTR_NOMEM == phpstr_append(buf, string, length)) { -+ pefree(buf, buf->pmem); -+ buf = NULL; -+ } -+ } -+ return buf; -+} -+ -+PHPSTR_API size_t phpstr_resize_ex(phpstr *buf, size_t len, size_t override_size, int allow_error) -+{ -+ char *ptr = NULL; -+#if 0 -+ fprintf(stderr, "RESIZE: size=%lu, used=%lu, free=%lu\n", buf->size, buf->used, buf->free); -+#endif -+ if (buf->free < len) { -+ size_t size = override_size ? override_size : buf->size; -+ -+ while ((size + buf->free) < len) { -+ size <<= 1; -+ } -+ -+ if (allow_error) { -+ ptr = perealloc_recoverable(buf->data, buf->used + buf->free + size, buf->pmem); -+ } else { -+ ptr = perealloc(buf->data, buf->used + buf->free + size, buf->pmem); -+ } -+ -+ if (ptr) { -+ buf->data = ptr; -+ } else { -+ return PHPSTR_NOMEM; -+ } -+ -+ buf->free += size; -+ return size; -+ } -+ return 0; -+} -+ -+PHPSTR_API size_t phpstr_shrink(phpstr *buf) -+{ -+ /* avoid another realloc on fixation */ -+ if (buf->free > 1) { -+ char *ptr = perealloc(buf->data, buf->used + 1, buf->pmem); -+ -+ if (ptr) { -+ buf->data = ptr; -+ } else { -+ return PHPSTR_NOMEM; -+ } -+ buf->free = 1; -+ } -+ return buf->used; -+} -+ -+PHPSTR_API size_t phpstr_append(phpstr *buf, const char *append, size_t append_len) -+{ -+ if (PHPSTR_NOMEM == phpstr_resize(buf, append_len)) { -+ return PHPSTR_NOMEM; -+ } -+ memcpy(buf->data + buf->used, append, append_len); -+ buf->used += append_len; -+ buf->free -= append_len; -+ return append_len; -+} -+ -+PHPSTR_API size_t phpstr_appendf(phpstr *buf, const char *format, ...) -+{ -+ va_list argv; -+ char *append; -+ size_t append_len, alloc; -+ -+ va_start(argv, format); -+ append_len = vspprintf(&append, 0, format, argv); -+ va_end(argv); -+ -+ alloc = phpstr_append(buf, append, append_len); -+ efree(append); -+ -+ if (PHPSTR_NOMEM == alloc) { -+ return PHPSTR_NOMEM; -+ } -+ return append_len; -+} -+ -+PHPSTR_API size_t phpstr_insert(phpstr *buf, const char *insert, size_t insert_len, size_t offset) -+{ -+ if (PHPSTR_NOMEM == phpstr_resize(buf, insert_len)) { -+ return PHPSTR_NOMEM; -+ } -+ memmove(buf->data + offset + insert_len, buf->data + offset, insert_len); -+ memcpy(buf->data + offset, insert, insert_len); -+ buf->used += insert_len; -+ buf->free -= insert_len; -+ return insert_len; -+} -+ -+PHPSTR_API size_t phpstr_insertf(phpstr *buf, size_t offset, const char *format, ...) -+{ -+ va_list argv; -+ char *insert; -+ size_t insert_len, alloc; -+ -+ va_start(argv, format); -+ insert_len = vspprintf(&insert, 0, format, argv); -+ va_end(argv); -+ -+ alloc = phpstr_insert(buf, insert, insert_len, offset); -+ efree(insert); -+ -+ if (PHPSTR_NOMEM == alloc) { -+ return PHPSTR_NOMEM; -+ } -+ return insert_len; -+} -+ -+PHPSTR_API size_t phpstr_prepend(phpstr *buf, const char *prepend, size_t prepend_len) -+{ -+ if (PHPSTR_NOMEM == phpstr_resize(buf, prepend_len)) { -+ return PHPSTR_NOMEM; -+ } -+ memmove(buf->data + prepend_len, buf->data, buf->used); -+ memcpy(buf->data, prepend, prepend_len); -+ buf->used += prepend_len; -+ buf->free -= prepend_len; -+ return prepend_len; -+} -+ -+PHPSTR_API size_t phpstr_prependf(phpstr *buf, const char *format, ...) -+{ -+ va_list argv; -+ char *prepend; -+ size_t prepend_len, alloc; -+ -+ va_start(argv, format); -+ prepend_len = vspprintf(&prepend, 0, format, argv); -+ va_end(argv); -+ -+ alloc = phpstr_prepend(buf, prepend, prepend_len); -+ efree(prepend); -+ -+ if (PHPSTR_NOMEM == alloc) { -+ return PHPSTR_NOMEM; -+ } -+ return prepend_len; -+} -+ -+PHPSTR_API char *phpstr_data(const phpstr *buf, char **into, size_t *len) -+{ -+ char *copy = ecalloc(1, buf->used + 1); -+ memcpy(copy, buf->data, buf->used); -+ if (into) { -+ *into = copy; -+ } -+ if (len) { -+ *len = buf->used; -+ } -+ return copy; -+} -+ -+PHPSTR_API phpstr *phpstr_dup(const phpstr *buf) -+{ -+ phpstr *dup = phpstr_clone(buf); -+ if (PHPSTR_NOMEM == phpstr_append(dup, buf->data, buf->used)) { -+ phpstr_free(&dup); -+ } -+ return dup; -+} -+ -+PHPSTR_API size_t phpstr_cut(phpstr *buf, size_t offset, size_t length) -+{ -+ if (offset >= buf->used) { -+ return 0; -+ } -+ if (offset + length > buf->used) { -+ length = buf->used - offset; -+ } -+ memmove(buf->data + offset, buf->data + offset + length, buf->used - length); -+ buf->used -= length; -+ buf->free += length; -+ return length; -+} -+ -+PHPSTR_API phpstr *phpstr_sub(const phpstr *buf, size_t offset, size_t length) -+{ -+ if (offset >= buf->used) { -+ return NULL; -+ } else { -+ size_t need = 1 + ((length + offset) > buf->used ? (buf->used - offset) : (length - offset)); -+ phpstr *sub = phpstr_init_ex(NULL, need, PHPSTR_INIT_PREALLOC | (buf->pmem ? PHPSTR_INIT_PERSISTENT:0)); -+ if (sub) { -+ if (PHPSTR_NOMEM == phpstr_append(sub, buf->data + offset, need)) { -+ phpstr_free(&sub); -+ } else { -+ sub->size = buf->size; -+ } -+ } -+ return sub; -+ } -+} -+ -+PHPSTR_API phpstr *phpstr_right(const phpstr *buf, size_t length) -+{ -+ if (length < buf->used) { -+ return phpstr_sub(buf, buf->used - length, length); -+ } else { -+ return phpstr_sub(buf, 0, buf->used); -+ } -+} -+ -+ -+PHPSTR_API phpstr *phpstr_merge_va(phpstr *buf, unsigned argc, va_list argv) -+{ -+ unsigned i = 0; -+ buf = phpstr_init(buf); -+ -+ if (buf) { -+ while (argc > i++) { -+ phpstr_free_t f = va_arg(argv, phpstr_free_t); -+ phpstr *current = va_arg(argv, phpstr *); -+ phpstr_append(buf, current->data, current->used); -+ FREE_PHPSTR(f, current); -+ } -+ } -+ -+ return buf; -+} -+ -+PHPSTR_API phpstr *phpstr_merge_ex(phpstr *buf, unsigned argc, ...) -+{ -+ va_list argv; -+ phpstr *ret; -+ -+ va_start(argv, argc); -+ ret = phpstr_merge_va(buf, argc, argv); -+ va_end(argv); -+ return ret; -+} -+ -+PHPSTR_API phpstr *phpstr_merge(unsigned argc, ...) -+{ -+ va_list argv; -+ phpstr *ret; -+ -+ va_start(argv, argc); -+ ret = phpstr_merge_va(NULL, argc, argv); -+ va_end(argv); -+ return ret; -+} -+ -+PHPSTR_API phpstr *phpstr_fix(phpstr *buf) -+{ -+ if (PHPSTR_NOMEM == phpstr_resize_ex(buf, 1, 1, 0)) { -+ return NULL; -+ } -+ buf->data[buf->used] = '\0'; -+ return buf; -+} -+ -+PHPSTR_API int phpstr_cmp(phpstr *left, phpstr *right) -+{ -+ if (left->used > right->used) { -+ return -1; -+ } else if (right->used > left->used) { -+ return 1; -+ } else { -+ return memcmp(left->data, right->data, left->used); -+ } -+} -+ -+PHPSTR_API void phpstr_reset(phpstr *buf) -+{ -+ buf->free += buf->used; -+ buf->used = 0; -+} -+ -+PHPSTR_API void phpstr_dtor(phpstr *buf) -+{ -+ if (buf->data) { -+ pefree(buf->data, buf->pmem); -+ buf->data = NULL; -+ } -+ buf->used = 0; -+ buf->free = 0; -+} -+ -+PHPSTR_API void phpstr_free(phpstr **buf) -+{ -+ if (*buf) { -+ phpstr_dtor(*buf); -+ pefree(*buf, (*buf)->pmem); -+ *buf = NULL; -+ } -+} -+ -+PHPSTR_API size_t phpstr_chunk_buffer(phpstr **s, const char *data, size_t data_len, char **chunk, size_t chunk_size) -+{ -+ phpstr *storage; -+ -+ *chunk = NULL; -+ -+ if (!*s) { -+ *s = phpstr_init_ex(NULL, chunk_size << 1, chunk_size ? PHPSTR_INIT_PREALLOC : 0); -+ } -+ storage = *s; -+ -+ if (data_len) { -+ phpstr_append(storage, data, data_len); -+ } -+ -+ if (!chunk_size) { -+ phpstr_data(storage, chunk, &chunk_size); -+ phpstr_free(s); -+ return chunk_size; -+ } -+ -+ if (storage->used >= (chunk_size = storage->size >> 1)) { -+ *chunk = estrndup(storage->data, chunk_size); -+ phpstr_cut(storage, 0, chunk_size); -+ return chunk_size; -+ } -+ -+ return 0; -+} -+ -+PHPSTR_API void phpstr_chunked_output(phpstr **s, const char *data, size_t data_len, size_t chunk_len, phpstr_passthru_func passthru, void *opaque TSRMLS_DC) -+{ -+ char *chunk = NULL; -+ size_t got = 0; -+ -+ while ((got = phpstr_chunk_buffer(s, data, data_len, &chunk, chunk_len))) { -+ passthru(opaque, chunk, got TSRMLS_CC); -+ if (!chunk_len) { -+ /* we already got the last chunk, -+ and freed all resources */ -+ break; -+ } -+ data = NULL; -+ data_len = 0; -+ STR_SET(chunk, NULL); -+ } -+ STR_FREE(chunk); -+} -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: sw=4 ts=4 fdm=marker -+ * vim<600: sw=4 ts=4 -+ */ -+ ---- /dev/null -+++ b/ext/http/phpstr/phpstr.h -@@ -0,0 +1,224 @@ -+ -+/* $Id: phpstr.h 229282 2007-02-07 15:31:50Z mike $ */ -+ -+#ifndef _PHPSTR_H_ -+#define _PHPSTR_H_ -+ -+#ifndef PHPSTR_DEFAULT_SIZE -+# define PHPSTR_DEFAULT_SIZE 256 -+#endif -+ -+#define PHPSTR_NOMEM ((size_t) -1) -+ -+#ifndef STR_FREE -+# define STR_FREE(STR) \ -+ { \ -+ if (STR) { \ -+ efree(STR); \ -+ } \ -+ } -+#endif -+#ifndef STR_SET -+# define STR_SET(STR, SET) \ -+ { \ -+ STR_FREE(STR); \ -+ STR = SET; \ -+ } -+#endif -+#ifndef TSRMLS_D -+# define TSRMLS_D -+# define TSRMLS_DC -+# define TSRMLS_CC -+# define TSRMLS_C -+#endif -+#ifdef PHP_ATTRIBUTE_FORMAT -+# define PHPSTR_ATTRIBUTE_FORMAT(f, a, b) PHP_ATTRIBUTE_FORMAT(f, a, b) -+#else -+# define PHPSTR_ATTRIBUTE_FORMAT(f, a, b) -+#endif -+#ifndef pemalloc -+# define pemalloc(s,p) malloc(s) -+# define pefree(x,p) free(x) -+# define perealloc(x,s,p) realloc(x,s) -+# define perealloc_recoverable perealloc -+# define ecalloc calloc -+static inline void *estrndup(void *p, size_t s) -+{ -+ char *r = (char *) malloc(s+1); -+ if (r) memcpy((void *) r, p, s), r[s] = '\0'; -+ return (void *) r; -+} -+#endif -+ -+#if defined(PHP_WIN32) -+# if defined(PHPSTR_EXPORTS) -+# define PHPSTR_API __declspec(dllexport) -+# elif defined(COMPILE_DL_PHPSTR) -+# define PHPSTR_API __declspec(dllimport) -+# else -+# define PHPSTR_API -+# endif -+#else -+# define PHPSTR_API -+#endif -+ -+#define PHPSTR(p) ((phpstr *) (p)) -+#define PHPSTR_VAL(p) (PHPSTR(p))->data -+#define PHPSTR_LEN(p) (PHPSTR(p))->used -+ -+#define FREE_PHPSTR_PTR(STR) pefree(STR, STR->pmem) -+#define FREE_PHPSTR_VAL(STR) phpstr_dtor(STR) -+#define FREE_PHPSTR_ALL(STR) phpstr_free(&(STR)) -+#define FREE_PHPSTR(free, STR) \ -+ switch (free) \ -+ { \ -+ case PHPSTR_FREE_NOT: break; \ -+ case PHPSTR_FREE_PTR: pefree(STR, STR->pmem); break; \ -+ case PHPSTR_FREE_VAL: phpstr_dtor(STR); break; \ -+ case PHPSTR_FREE_ALL: \ -+ { \ -+ phpstr *PTR = (STR); \ -+ phpstr_free(&PTR); \ -+ } \ -+ break; \ -+ default: break; \ -+ } -+ -+#define RETURN_PHPSTR_PTR(STR) RETURN_PHPSTR((STR), PHPSTR_FREE_PTR, 0) -+#define RETURN_PHPSTR_VAL(STR) RETURN_PHPSTR((STR), PHPSTR_FREE_NOT, 0) -+#define RETURN_PHPSTR_DUP(STR) RETURN_PHPSTR((STR), PHPSTR_FREE_NOT, 1) -+#define RETVAL_PHPSTR_PTR(STR) RETVAL_PHPSTR((STR), PHPSTR_FREE_PTR, 0) -+#define RETVAL_PHPSTR_VAL(STR) RETVAL_PHPSTR((STR), PHPSTR_FREE_NOT, 0) -+#define RETVAL_PHPSTR_DUP(STR) RETVAL_PHPSTR((STR), PHPSTR_FREE_NOT, 1) -+/* RETURN_PHPSTR(buf, PHPSTR_FREE_PTR, 0) */ -+#define RETURN_PHPSTR(STR, free, dup) \ -+ RETVAL_PHPSTR((STR), (free), (dup)); \ -+ return; -+ -+#define RETVAL_PHPSTR(STR, free, dup) \ -+ phpstr_fix(STR); \ -+ RETVAL_STRINGL((STR)->data, (STR)->used, (dup)); \ -+ FREE_PHPSTR((free), (STR)); -+ -+typedef struct _phpstr_t { -+ char *data; -+ size_t used; -+ size_t free; -+ size_t size; -+ unsigned pmem:1; -+ unsigned reserved:31; -+} phpstr; -+ -+typedef enum _phpstr_free_t { -+ PHPSTR_FREE_NOT = 0, -+ PHPSTR_FREE_PTR, /* pefree() */ -+ PHPSTR_FREE_VAL, /* phpstr_dtor() */ -+ PHPSTR_FREE_ALL /* phpstr_free() */ -+} phpstr_free_t; -+ -+#define PHPSTR_ALL_FREE(STR) PHPSTR_FREE_ALL,(STR) -+#define PHPSTR_PTR_FREE(STR) PHPSTR_FREE_PTR,(STR) -+#define PHPSTR_VAL_FREE(STR) PHPSTR_FREE_VAL,(STR) -+#define PHPSTR_NOT_FREE(STR) PHPSTR_FREE_NOT,(STR) -+ -+#define PHPSTR_INIT_PREALLOC 0x01 -+#define PHPSTR_INIT_PERSISTENT 0x02 -+ -+/* create a new phpstr */ -+#define phpstr_new() phpstr_init(NULL) -+#define phpstr_init(b) phpstr_init_ex(b, PHPSTR_DEFAULT_SIZE, 0) -+#define phpstr_clone(phpstr_pointer) phpstr_init_ex(NULL, (phpstr_pointer)->size, (phpstr_pointer)->pmem ? PHPSTR_INIT_PERSISTENT:0) -+PHPSTR_API phpstr *phpstr_init_ex(phpstr *buf, size_t chunk_size, int flags); -+ -+/* create a phpstr from a zval or c-string */ -+#define phpstr_from_zval(z) phpstr_from_string(Z_STRVAL(z), Z_STRLEN(z)) -+#define phpstr_from_zval_ex(b, z) phpstr_from_string_ex(b, Z_STRVAL(z), Z_STRLEN(z)) -+#define phpstr_from_string(s, l) phpstr_from_string_ex(NULL, (s), (l)) -+PHPSTR_API phpstr *phpstr_from_string_ex(phpstr *buf, const char *string, size_t length); -+ -+/* usually only called from within the internal functions */ -+#define phpstr_resize(b, s) phpstr_resize_ex((b), (s), 0, 0) -+PHPSTR_API size_t phpstr_resize_ex(phpstr *buf, size_t len, size_t override_size, int allow_error); -+ -+/* shrink memory chunk to actually used size (+1) */ -+PHPSTR_API size_t phpstr_shrink(phpstr *buf); -+ -+/* append data to the phpstr */ -+#define phpstr_appends(b, a) phpstr_append((b), (a), sizeof(a)-1) -+#define phpstr_appendl(b, a) phpstr_append((b), (a), strlen(a)) -+PHPSTR_API size_t phpstr_append(phpstr *buf, const char *append, size_t append_len); -+PHPSTR_API size_t phpstr_appendf(phpstr *buf, const char *format, ...) PHPSTR_ATTRIBUTE_FORMAT(printf, 2, 3); -+ -+/* insert data at a specific position of the phpstr */ -+#define phpstr_inserts(b, i, o) phpstr_insert((b), (i), sizeof(i)-1, (o)) -+#define phpstr_insertl(b, i, o) phpstr_insert((b), (i), strlen(i), (o)) -+PHPSTR_API size_t phpstr_insert(phpstr *buf, const char *insert, size_t insert_len, size_t offset); -+PHPSTR_API size_t phpstr_insertf(phpstr *buf, size_t offset, const char *format, ...) PHPSTR_ATTRIBUTE_FORMAT(printf, 3, 4); -+ -+/* prepend data */ -+#define phpstr_prepends(b, p) phpstr_prepend((b), (p), sizeof(p)-1) -+#define phpstr_prependl(b, p) phpstr_prepend((b), (p), strlen(p)) -+PHPSTR_API size_t phpstr_prepend(phpstr *buf, const char *prepend, size_t prepend_len); -+PHPSTR_API size_t phpstr_prependf(phpstr *buf, const char *format, ...) PHPSTR_ATTRIBUTE_FORMAT(printf, 2, 3); -+ -+/* get a zero-terminated string */ -+PHPSTR_API char *phpstr_data(const phpstr *buf, char **into, size_t *len); -+ -+/* get a part of the phpstr */ -+#define phpstr_mid(b, o, l) phpstr_sub((b), (o), (l)) -+#define phpstr_left(b, l) phpstr_sub((b), 0, (l)) -+PHPSTR_API phpstr *phpstr_right(const phpstr *buf, size_t length); -+PHPSTR_API phpstr *phpstr_sub(const phpstr *buf, size_t offset, size_t len); -+ -+/* remove a substring */ -+PHPSTR_API size_t phpstr_cut(phpstr *buf, size_t offset, size_t length); -+ -+/* get a complete phpstr duplicate */ -+PHPSTR_API phpstr *phpstr_dup(const phpstr *buf); -+ -+/* merge several phpstr objects -+ use like: -+ -+ phpstr *final = phpstr_merge(3, -+ PHPSTR_NOT_FREE(&keep), -+ PHPSTR_ALL_FREE(middle_ptr), -+ PHPSTR_VAL_FREE(&local); -+*/ -+PHPSTR_API phpstr *phpstr_merge(unsigned argc, ...); -+PHPSTR_API phpstr *phpstr_merge_ex(phpstr *buf, unsigned argc, ...); -+PHPSTR_API phpstr *phpstr_merge_va(phpstr *buf, unsigned argc, va_list argv); -+ -+/* sets a trailing NUL byte */ -+PHPSTR_API phpstr *phpstr_fix(phpstr *buf); -+ -+/* memcmp for phpstr objects */ -+PHPSTR_API int phpstr_cmp(phpstr *left, phpstr *right); -+ -+/* reset phpstr object */ -+PHPSTR_API void phpstr_reset(phpstr *buf); -+ -+/* free a phpstr objects contents */ -+PHPSTR_API void phpstr_dtor(phpstr *buf); -+ -+/* free a phpstr object completely */ -+PHPSTR_API void phpstr_free(phpstr **buf); -+ -+/* stores data in a phpstr until it reaches chunk_size */ -+PHPSTR_API size_t phpstr_chunk_buffer(phpstr **s, const char *data, size_t data_len, char **chunk, size_t chunk_size); -+ -+typedef void (*phpstr_passthru_func)(void *opaque, const char *, size_t TSRMLS_DC); -+ -+/* wrapper around phpstr_chunk_buffer, which passes available chunks to passthru() */ -+PHPSTR_API void phpstr_chunked_output(phpstr **s, const char *data, size_t data_len, size_t chunk_size, phpstr_passthru_func passthru, void *opaque TSRMLS_DC); -+ -+#endif -+ -+ -+/* -+ * Local variables: -+ * tab-width: 4 -+ * c-basic-offset: 4 -+ * End: -+ * vim600: sw=4 ts=4 fdm=marker -+ * vim<600: sw=4 ts=4 -+ */ ---- /dev/null -+++ b/ext/http/tests/HttpMessage_001.phpt -@@ -0,0 +1,70 @@ -+--TEST-- -+HttpMessage -+--SKIPIF-- -+ -+--FILE-- -+getResponseStatus()); -+ -+$x = $m->getParentMessage(); -+$x = $m->getParentMessage(); -+$x = $m->getParentMessage(); -+ -+var_dump($m->getBody()); -+var_dump(HttpMessage::fromString($m->toString(true))->toString(true)); -+try { -+ do { -+ var_dump($m->toString()); -+ } while ($m = $m->getParentMessage()); -+} catch (HttpException $ex) { -+} -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+string(15) "Partial content" -+string(1) "X" -+string(190) "HTTP/1.1 301 -+Location: /anywhere -+HTTP/1.1 302 -+Location: /somewhere -+HTTP/1.1 206 Partial content -+Content-Range: bytes=2-3 -+X-Original-Transfer-Encoding: chunked -+Content-Length: 1 -+ -+X -+" -+string(119) "HTTP/1.1 206 Partial content -+Content-Range: bytes=2-3 -+X-Original-Transfer-Encoding: chunked -+Content-Length: 1 -+ -+X -+" -+string(36) "HTTP/1.1 302 -+Location: /somewhere -+" -+string(35) "HTTP/1.1 301 -+Location: /anywhere -+" -+Done ---- /dev/null -+++ b/ext/http/tests/HttpMessage_002.phpt -@@ -0,0 +1,65 @@ -+--TEST-- -+HttpMessage properties -+--SKIPIF-- -+ -+--FILE-- -+var_property); -+ var_dump($this->public_property); -+ var_dump($this->protected_property); -+ var_dump($this->private_property); -+ var_dump($this->non_ex_property); -+ $this->var_property.='_property'; -+ $this->public_property.='_property'; -+ $this->protected_property.='_property'; -+ $this->private_property.='_property'; -+ $this->non_ex_property = 'non_ex'; -+ var_dump($this->var_property); -+ var_dump($this->public_property); -+ var_dump($this->protected_property); -+ var_dump($this->private_property); -+ var_dump($this->non_ex_property); -+ -+ print_r($this->headers); -+ $this->headers['Foo'] = 'Bar'; -+ } -+} -+ -+error_reporting(E_ALL|E_STRICT); -+ -+echo "-TEST\n"; -+$m = new Message; -+$m->test(); -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+string(3) "var" -+string(6) "public" -+string(9) "protected" -+string(7) "private" -+ -+Notice: Undefined property: Message::$non_ex_property in %s -+NULL -+string(12) "var_property" -+string(15) "public_property" -+string(18) "protected_property" -+string(16) "private_property" -+string(6) "non_ex" -+Array -+( -+) -+%aFatal error%sCannot access HttpMessage properties by reference or array key/index in%s ---- /dev/null -+++ b/ext/http/tests/HttpMessage_003.phpt -@@ -0,0 +1,70 @@ -+--TEST-- -+HttpMessage implements Serializable, Countable -+--SKIPIF-- -+ -+--FILE-- -+count()); -+var_dump($m->serialize()); -+$m->unserialize("HTTP/1.1 200 Ok\r\nServer: Funky/1.0"); -+var_dump($m); -+var_dump($m->count()); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+int(3) -+string(148) "HTTP/1.1 301 -+Location: /anywhere -+HTTP/1.1 302 -+Location: /somewhere -+HTTP/1.1 200 -+X-Original-Transfer-Encoding: chunked -+Content-Length: 1 -+ -+X -+" -+object(HttpMessage)#%d (%d) { -+ ["type%s]=> -+ int(2) -+ ["body%s]=> -+ string(0) "" -+ ["requestMethod%s]=> -+ string(0) "" -+ ["requestUrl%s]=> -+ string(0) "" -+ ["responseStatus%s]=> -+ string(2) "Ok" -+ ["responseCode%s]=> -+ int(200) -+ ["httpVersion%s]=> -+ float(1.1) -+ ["headers%s]=> -+ array(1) { -+ ["Server"]=> -+ string(9) "Funky/1.0" -+ } -+ ["parentMessage%s]=> -+ NULL -+} -+int(1) -+Done ---- /dev/null -+++ b/ext/http/tests/HttpMessage_004.phpt -@@ -0,0 +1,36 @@ -+--TEST-- -+HttpMessage::detach() -+--SKIPIF-- -+ -+--FILE-- -+detach(); -+$d->addHeaders(array('Server'=>'Funky/2.0')); -+var_dump($d->getHeaders() == $m->getHeaders()); -+var_dump($d->getBody()); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+bool(false) -+string(3) "Hi!" -+Done -\ No newline at end of file ---- /dev/null -+++ b/ext/http/tests/HttpMessage_005.phpt -@@ -0,0 +1,86 @@ -+--TEST-- -+HttpMessage::prepend() -+--SKIPIF-- -+ -+--FILE-- -+prepend($m2); -+$m2 = NULL; -+echo $m1->toString(true); -+ -+$m1->prepend($m1->detach(), false); -+echo $m1->toString(true); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+GET http://example.com/ HTTP/1.0 -+HTTP/1.1 200 ok -+Server: Funky/2.0 -+Content-Type: text/html -+Content-Length: 9 -+ -+Hi there! -+GET / HTTP/1.1 -+Host: example.com -+Accept: */* -+Connection: close -+HTTP/1.1 200 ok -+Server: Funky/1.0 -+Content-Type: text/plain -+Content-Length: 3 -+ -+Hi! -+GET http://example.com/ HTTP/1.0 -+HTTP/1.1 200 ok -+Server: Funky/2.0 -+Content-Type: text/html -+Content-Length: 9 -+ -+Hi there! -+GET / HTTP/1.1 -+Host: example.com -+Accept: */* -+Connection: close -+HTTP/1.1 200 ok -+Server: Funky/1.0 -+Content-Type: text/plain -+Content-Length: 3 -+ -+Hi! -+HTTP/1.1 200 ok -+Server: Funky/1.0 -+Content-Type: text/plain -+Content-Length: 3 -+ -+Hi! -+Done -\ No newline at end of file ---- /dev/null -+++ b/ext/http/tests/HttpMessage_006.phpt -@@ -0,0 +1,35 @@ -+--TEST-- -+HttpMessage iterator -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+== -+HTTP/1.1 304 Not Modified -+== -+GET /foo HTTP/1.1 -+== -+HTTP/1.1 200 OK -+== -+GET / HTTP/1.1 -+Done -\ No newline at end of file ---- /dev/null -+++ b/ext/http/tests/HttpMessage_007.phpt -@@ -0,0 +1,46 @@ -+--TEST-- -+HttpMessage::reverse() -+--SKIPIF-- -+ -+--FILE-- -+toString(true); -+echo "===\n"; -+echo HttpMessage::fromString($s)->reverse()->toString(true); -+ -+$m = new HttpMessage($s); -+$r = $m->reverse(); -+unset($m); -+var_dump($r->count()); -+echo $r->toString(true); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+GET /first HTTP/1.1 -+HTTP/1.1 200 Ok-first -+GET /second HTTP/1.1 -+HTTP/1.1 200 Ok-second -+GET /third HTTP/1.1 -+HTTP/1.1 200 Ok-third -+=== -+HTTP/1.1 200 Ok-third -+GET /third HTTP/1.1 -+HTTP/1.1 200 Ok-second -+GET /second HTTP/1.1 -+HTTP/1.1 200 Ok-first -+GET /first HTTP/1.1 -+int(6) -+HTTP/1.1 200 Ok-third -+GET /third HTTP/1.1 -+HTTP/1.1 200 Ok-second -+GET /second HTTP/1.1 -+HTTP/1.1 200 Ok-first -+GET /first HTTP/1.1 -+Done ---- /dev/null -+++ b/ext/http/tests/HttpMessage_008.phpt -@@ -0,0 +1,41 @@ -+--TEST-- -+HttpMessage::toMessageTypeObject() -+--SKIPIF-- -+ -+--FILE-- -+"b",1=>2),null); -+ -+$m = new HttpMessage; -+$m->setType(HttpMessage::TYPE_REQUEST); -+$m->setRequestMethod('POST'); -+$m->setRequestUrl("http://www.example.com"); -+$m->setHttpVersion('1.1'); -+$m->addHeaders( -+ array( -+ "Content-Type" => "application/x-www-form-urlencoded", -+ "Host" => "www.example.com", -+ "Content-Length"=> strlen($b), -+ ) -+); -+$m->setBody($b); -+$r = $m->toMessageTypeObject(); -+echo $m,"\n"; -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+POST http://www.example.com HTTP/1.1 -+Content-Type: application/x-www-form-urlencoded -+Host: www.example.com -+Content-Length: 7 -+ -+a=b&1=2 -+ -+Done ---- /dev/null -+++ b/ext/http/tests/HttpMessage_009_bug16700.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+Bug #16700 - child classes of HttpMessage cannot not have array properties -+--SKIPIF-- -+ -+--FILE-- -+properties['foo'] = 'bar'; -+echo $child->properties['foo'], "\n"; -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+bar -+Done ---- /dev/null -+++ b/ext/http/tests/HttpQueryString_001.phpt -@@ -0,0 +1,116 @@ -+--TEST-- -+HttpQueryString global -+--SKIPIF-- -+ -+--FILE-- -+'b','c'=>'3.4','r'=>array(1,2,3)); -+$_SERVER['QUERY_STRING'] = 'a=b&c=3.4&r[0]=1&r[1]=2&r[2]=3'; -+ -+var_dump(HttpQueryString::singleton()->get()); -+var_dump(HttpQueryString::singleton()->get('n')); -+var_dump(HttpQueryString::singleton()->get('a')); -+var_dump(HttpQueryString::singleton()->get('a', "i", 0, true)); -+var_dump(HttpQueryString::singleton()->get('a', "string", 'hi!')); -+var_dump(HttpQueryString::singleton()->get('c')); -+var_dump(HttpQueryString::singleton()->get('c', HttpQueryString::TYPE_INT)); -+var_dump(HttpQueryString::singleton()->get('c', HttpQueryString::TYPE_FLOAT)); -+var_dump(HttpQueryString::singleton()->get('c', HttpQueryString::TYPE_BOOL)); -+var_dump(HttpQueryString::singleton()->get('r')); -+var_dump(HttpQueryString::singleton()->get('r', HttpQueryString::TYPE_ARRAY)); -+var_dump(HttpQueryString::singleton()->get('r', HttpQueryString::TYPE_OBJECT)); -+ -+HttpQueryString::singleton()->set(new HttpQueryString(false, 'z[0]=2')); -+ -+HttpQueryString::singleton()->set(array('a'=>'b', 'c'=> "3.4")); -+HttpQueryString::singleton()->set(array('a' => NULL)); -+ -+var_dump(HttpQueryString::singleton()); -+var_dump($_GET); -+var_dump($_SERVER['QUERY_STRING']); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+string(42) "a=b&c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3" -+NULL -+string(1) "b" -+int(0) -+string(3) "hi!" -+string(3) "3.4" -+int(3) -+float(3.4) -+bool(true) -+array(3) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+} -+array(3) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+} -+object(stdClass)#%d (%d) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+} -+object(HttpQueryString)#1 (2) { -+ ["queryArray%s]=> -+ &array(3) { -+ ["c"]=> -+ string(3) "3.4" -+ ["r"]=> -+ array(3) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+ } -+ ["z"]=> -+ array(1) { -+ [0]=> -+ string(1) "2" -+ } -+ } -+ ["queryString%s]=> -+ &string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2" -+} -+array(3) { -+ ["c"]=> -+ string(3) "3.4" -+ ["r"]=> -+ array(3) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+ } -+ ["z"]=> -+ array(1) { -+ [0]=> -+ string(1) "2" -+ } -+} -+string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2" -+Done -\ No newline at end of file ---- /dev/null -+++ b/ext/http/tests/HttpQueryString_002.phpt -@@ -0,0 +1,108 @@ -+--TEST-- -+HttpQueryString local -+--SKIPIF-- -+ -+--FILE-- -+'b','c'=>'3.4','r'=>array(1,2,3))); -+var_dump($q->get()); -+var_dump($q->get('n')); -+var_dump($q->get('a')); -+var_dump($q->get('a', "i", 0, true)); -+var_dump($q->get('a', "string", 'hi!')); -+var_dump($q->get('c')); -+var_dump($q->get('c', HttpQueryString::TYPE_INT)); -+var_dump($q->get('c', HttpQueryString::TYPE_FLOAT)); -+var_dump($q->get('c', HttpQueryString::TYPE_BOOL)); -+var_dump($q->get('r')); -+var_dump($q->get('r', HttpQueryString::TYPE_ARRAY)); -+var_dump($q->get('r', HttpQueryString::TYPE_OBJECT)); -+ -+$q->set('z[0]=2'); -+$q->set(array('a'=>'b', 'c'=> "3.4")); -+$q->set(array('a' => NULL)); -+ -+var_dump($q); -+var_dump($array); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+string(42) "a=b&c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3" -+NULL -+string(1) "b" -+int(0) -+string(3) "hi!" -+string(3) "3.4" -+int(3) -+float(3.4) -+bool(true) -+array(3) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+} -+array(3) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+} -+object(stdClass)#%d (%d) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+} -+object(HttpQueryString)#1 (2) { -+ ["queryArray%s]=> -+ array(3) { -+ ["c"]=> -+ string(3) "3.4" -+ ["r"]=> -+ array(3) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+ } -+ ["z"]=> -+ array(1) { -+ [0]=> -+ string(1) "2" -+ } -+ } -+ ["queryString%s]=> -+ string(49) "c=3.4&r%5B0%5D=1&r%5B1%5D=2&r%5B2%5D=3&z%5B0%5D=2" -+} -+array(3) { -+ ["a"]=> -+ string(1) "b" -+ ["c"]=> -+ string(3) "3.4" -+ ["r"]=> -+ array(3) { -+ [0]=> -+ int(1) -+ [1]=> -+ int(2) -+ [2]=> -+ int(3) -+ } -+} -+Done -\ No newline at end of file ---- /dev/null -+++ b/ext/http/tests/HttpQueryString_003.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+HttpQueryString xlate -+--SKIPIF-- -+ -+--FILE-- -+get()); -+$qs->xlate("latin1", "utf8"); -+var_dump($qs->get()); -+$qs->xlate("utf8", "latin1"); -+var_dump($qs->get()); -+echo "Done\n"; -+--EXPECTF-- -+%aTEST -+string(29) "%E4%5B0%5D=%FC&%F6%5Ba%5D=%DF" -+string(41) "%C3%A4%5B0%5D=%C3%BC&%C3%B6%5Ba%5D=%C3%9F" -+string(29) "%E4%5B0%5D=%FC&%F6%5Ba%5D=%DF" -+Done ---- /dev/null -+++ b/ext/http/tests/HttpQueryString_004.phpt -@@ -0,0 +1,54 @@ -+--TEST-- -+HttpQueryString w/ objects -+--SKIPIF-- -+ -+--FILE-- -+bar = (object) array("baz"=>1); -+ $this->dont_show = 'xxx'; -+ $this->dont_show2 = 'zzz'; -+ } -+} -+$foo = new test_props; -+var_dump($q = new HttpQueryString(false, $foo)); -+$foo->bar->baz = 0; -+var_dump($q->mod($foo)); -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+object(HttpQueryString)#3 (2) { -+ ["queryArray%s]=> -+ array(1) { -+ ["bar"]=> -+ array(1) { -+ ["baz"]=> -+ int(1) -+ } -+ } -+ ["queryString%s]=> -+ string(14) "bar%5Bbaz%5D=1" -+} -+object(HttpQueryString)#4 (2) { -+ ["queryArray%s]=> -+ array(1) { -+ ["bar"]=> -+ array(1) { -+ ["baz"]=> -+ int(0) -+ } -+ } -+ ["queryString%s]=> -+ string(14) "bar%5Bbaz%5D=0" -+} -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequestDataShare_001.phpt -@@ -0,0 +1,38 @@ -+--TEST-- -+HttpRequestDataShare -+--SKIPIF-- -+ -+--FILE-- -+dns = true; -+$s->cookie = true; -+ -+$r1 = new HttpRequest("http://www.google.com/"); -+$r2 = new HttpRequest("http://www.google.com/"); -+ -+$r1->enableCookies(); -+$r2->enableCookies(); -+ -+$s->attach($r1); -+$s->attach($r2); -+ -+$r1->send(); -+$r2->send(); -+ -+$s->reset(); -+ -+var_dump(current($r1->getResponseCookies())->cookies["PREF"] === HttpUtil::parseCookie($r2->getRequestMessage()->getHeader("Cookie"))->cookies["PREF"]); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+bool(true) -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequestDataShare_002.phpt -@@ -0,0 +1,52 @@ -+--TEST-- -+HttpRequestDataShare global -+--SKIPIF-- -+ -+--FILE-- -+cookie = true; -+var_dump($s); -+ -+$r1 = new HttpRequest("http://www.google.com/"); -+$r2 = new HttpRequest("http://www.google.com/"); -+ -+$r1->enableCookies(); -+$r2->enableCookies(); -+ -+$s->attach($r1); -+$s->attach($r2); -+ -+$r1->send(); -+$r2->send(); -+ -+$s->reset(); -+ -+if (current($r1->getResponseCookies())->cookies["PREF"] !== HttpUtil::parseCookie($r2->getRequestMessage()->getHeader("Cookie"))->cookies["PREF"]) { -+ var_dump( -+ current($r1->getResponseCookies())->cookies["PREF"], -+ HttpUtil::parseCookie($r2->getRequestMessage()->getHeader("Cookie"))->cookies["PREF"] -+ ); -+} -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+object(HttpRequestDataShare)#1 (4) { -+ ["cookie"]=> -+ bool(true) -+ ["dns"]=> -+ bool(true) -+ ["ssl"]=> -+ bool(false) -+ ["connect"]=> -+ bool(false) -+} -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequestPool_001.phpt -@@ -0,0 +1,51 @@ -+--TEST-- -+HttpRequestPool -+--SKIPIF-- -+ -+--FILE-- -+addPostFields(array('a'=>1,'b'=>2)) ; -+ -+$pool = new HttpRequestPool( -+ new HttpRequest('http://www.php.net/', HTTP_METH_HEAD), -+ $post -+); -+ -+$pool->send(); -+ -+foreach ($pool as $req) { -+ echo $req->getUrl(), '=', -+ $req->getResponseCode(), ':', -+ $req->getResponseMessage()->getResponseCode(), "\n"; -+} -+ -+foreach ($pool as $req) { -+ try { -+ $pool->attach(new HttpRequest('http://foo.bar')); -+ } catch (HttpRequestPoolException $x) { -+ echo ".\n"; -+ } -+} -+ -+foreach ($pool as $req) { -+ $pool->detach($req); -+} -+ -+echo "Done\n"; -+?> -+ -+--EXPECTF-- -+%aTEST -+http://www.php.net/=200:200 -+http://dev.iworks.at/ext-http/.print_request.php=200:200 -+. -+. -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequestPool_002.phpt -@@ -0,0 +1,51 @@ -+--TEST-- -+extending HttpRequestPool -+--SKIPIF-- -+ -+--FILE-- -+socketPerform()) { -+ if (!$this->socketSelect()) { -+ throw new HttpSocketException; -+ } -+ } -+ } -+ -+ protected final function socketPerform() -+ { -+ $result = parent::socketPerform(); -+ -+ echo "."; -+ foreach ($this->getFinishedRequests() as $r) { -+ echo "=", $r->getResponseCode(), "="; -+ $this->detach($r); -+ } -+ -+ return $result; -+ } -+} -+ -+$pool = new MyPool( -+ new HttpRequest('http://www.php.net/', HTTP_METH_HEAD), -+ new HttpRequest('http://www.php.net/', HTTP_METH_HEAD), -+ new HttpRequest('http://www.php.net/', HTTP_METH_HEAD) -+); -+ -+$pool->send(); -+ -+echo "\nDone\n"; -+?> -+--EXPECTREGEX-- -+.+TEST -+\.*=200=\.*=200=\.*=200= -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequestPool_003.phpt -@@ -0,0 +1,175 @@ -+--TEST-- -+HttpRequestPool chain -+--SKIPIF-- -+ -+--FILE-- -+dir = (is_dir($cache_dir) or @mkdir($cache_dir)) ? $cache_dir : null; -+ -+ foreach (array_map('trim', file($urls_file)) as $url) { -+ $this->all[$url] = $this->dir ? $this->dir .'/'. md5($url) : null; -+ } -+ -+ $this->send(); -+ } -+ -+ public final function send() -+ { -+ if (RMAX) { -+ $now = array_slice($this->all, 0, RMAX); -+ $this->rem = array_slice($this->all, RMAX); -+ } else { -+ $now = $urls; -+ $this->rem = array(); -+ } -+ -+ foreach ($now as $url => $file) { -+ $this->attach( -+ new HttpRequest( -+ $url, -+ HttpRequest::METH_GET, -+ array( -+ 'redirect' => 5, -+ 'compress' => GZIP, -+ 'timeout' => TOUT, -+ 'connecttimeout' => TOUT, -+ 'lastmodified' => is_file($file)?filemtime($file):0 -+ ) -+ ) -+ ); -+ } -+ -+ while ($this->socketPerform()) { -+ if (!$this->socketSelect()) { -+ throw new HttpSocketException; -+ } -+ } -+ } -+ -+ protected final function socketPerform() -+ { -+ try { -+ $rc = parent::socketPerform(); -+ } catch (HttpRequestException $x) { -+ // a request may have thrown an exception, -+ // but it is still save to continue -+ echo $x->getMessage(), "\n"; -+ } -+ -+ foreach ($this->getFinishedRequests() as $r) { -+ $this->detach($r); -+ -+ $u = $r->getUrl(); -+ $c = $r->getResponseCode(); -+ $b = $r->getResponseBody(); -+ -+ printf("%d %s %d\n", $c, $u, strlen($b)); -+ -+ if ($c == 200 && $this->dir) { -+ file_put_contents($this->all[$u], $b); -+ } -+ -+ if ($a = each($this->rem)) { -+ list($url, $file) = $a; -+ $this->attach( -+ new HttpRequest( -+ $url, -+ HttpRequest::METH_GET, -+ array( -+ 'redirect' => 5, -+ 'compress' => GZIP, -+ 'timeout' => TOUT, -+ 'connecttimeout' => TOUT, -+ 'lastmodified' => is_file($file)?filemtime($file):0 -+ ) -+ ) -+ ); -+ } -+ } -+ return $rc; -+ } -+} -+ -+define('GZIP', true); -+define('TOUT', 50); -+define('RMAX', 10); -+chdir(dirname(__FILE__)); -+ -+$time = microtime(true); -+$pool = new Pool(); -+printf("Elapsed: %0.3fs\n", microtime(true)-$time); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+%d %s %d -+Elapsed: %fs -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequestPool_004.phpt -@@ -0,0 +1,19 @@ -+--TEST-- -+HttpRequestPool::__destruct() invalid curl handle -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequestPool_005.phpt -@@ -0,0 +1,46 @@ -+--TEST-- -+HttpRequestPool exception -+--SKIPIF-- -+ -+--FILE-- -+send(); -+} catch (HttpRequestPoolException $x) { -+ for ($i=0; $x; ++$i, $x = @$x->innerException) { -+ printf("%s%s: %s\n", str_repeat("\t", $i), get_class($x), $x->getMessage()); -+ } -+ var_dump($i); -+} -+$p = new HttpRequestPool(new HttpRequest('http://_____'), new HttpRequest('http://_____')); -+try { -+ $p->send(); -+} catch (HttpRequestPoolException $x) { -+ for ($i=0; $x; ++$i, $x = @$x->innerException) { -+ printf("%s%s: %s\n", str_repeat("\t", $i), get_class($x), $x->getMessage()); -+ } -+ var_dump($i); -+} -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+HttpRequestPoolException: Exception caused by 2 inner exception(s) -+ HttpInvalidParamException: Empty or too short HTTP message: '' -+ HttpRequestException: %souldn't resolve host name; %s (http://_____/) -+int(3) -+HttpRequestPoolException: Exception caused by 4 inner exception(s) -+ HttpInvalidParamException: Empty or too short HTTP message: '' -+ HttpRequestException: %souldn't resolve host name; %s (http://_____/) -+ HttpInvalidParamException: Empty or too short HTTP message: '' -+ HttpRequestException: %souldn't resolve host name; %s (http://_____/) -+int(5) -+Done -+ ---- /dev/null -+++ b/ext/http/tests/HttpRequestPool_006.phpt -@@ -0,0 +1,50 @@ -+--TEST-- -+HttpRequestPool detaching in callbacks -+--SKIPIF-- -+ -+--FILE-- -+getUrl()])) { -+ $i[$this->getUrl()] = true; -+ try { -+ $GLOBALS['p']->detach($this); -+ } catch (Exception $ex) { -+ echo $ex, "\n"; -+ } -+ } -+ } -+ function onFinish() { -+ $GLOBALS['p']->detach($this); -+ } -+} -+$p = new HttpRequestPool(new r("http://at.php.net"), new r("http://de.php.net")); -+$p->send(); -+var_dump($p->getAttachedRequests()); -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+exception 'HttpRequestPoolException' with message 'HttpRequest object(#%d) cannot be detached from the HttpRequestPool while executing the progress callback' in %aHttpRequestPool_006.php:%d -+Stack trace: -+#0 %aHttpRequestPool_006.php(%d): HttpRequestPool->detach(Object(r)) -+#1 [internal function]: r->onProgress(Array) -+#2 %aHttpRequestPool_006.php(%d): HttpRequestPool->send() -+#3 {main} -+exception 'HttpRequestPoolException' with message 'HttpRequest object(#%d) cannot be detached from the HttpRequestPool while executing the progress callback' in %aHttpRequestPool_006.php:%d -+Stack trace: -+#0 %aHttpRequestPool_006.php(%d): HttpRequestPool->detach(Object(r)) -+#1 [internal function]: r->onProgress(Array) -+#2 %aHttpRequestPool_006.php(%d): HttpRequestPool->send() -+#3 {main} -+array(0) { -+} -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequest_001.phpt -@@ -0,0 +1,51 @@ -+--TEST-- -+HttpRequest options -+--SKIPIF-- -+ -+--FILE-- -+11, 'headers'=>array('X-Foo'=>'Bar'))); -+$r2 = new HttpRequest; -+$r2->setOptions(array('redirect'=>99, 'headers'=>array('X-Bar'=>'Foo'))); -+$o1 = $r1->getOptions(); -+$o2 = $r2->getOptions(); -+$r1->setOptions($o2); -+$r2->setOptions($o1); -+print_r(array($o1, $o2)); -+var_dump(serialize($r1->getOptions()) === serialize($r2->getOptions())); -+$r1 = null; -+$r2 = null; -+?> -+--EXPECTF-- -+%aTEST -+Array -+( -+ [0] => Array -+ ( -+ [headers] => Array -+ ( -+ [X-Foo] => Bar -+ [X-Bar] => Foo -+ ) -+ -+ [redirect] => 11 -+ ) -+ -+ [1] => Array -+ ( -+ [headers] => Array -+ ( -+ [X-Bar] => Foo -+ [X-Foo] => Bar -+ ) -+ -+ [redirect] => 99 -+ ) -+ -+) -+bool(false) ---- /dev/null -+++ b/ext/http/tests/HttpRequest_002.phpt -@@ -0,0 +1,86 @@ -+--TEST-- -+HttpRequest GET/POST -+--SKIPIF-- -+ -+--FILE-- -+send(); -+print_r($r->getResponseInfo()); -+ -+$r = new HttpRequest('http://dev.iworks.at/ext-http/.print_request.php', HTTP_METH_POST); -+$r->addCookies(array('MyCookie' => 'foobar')); -+$r->addQueryData(array('gq'=>'foobar','gi'=>10)); -+$r->addPostFields(array('pq'=>'foobar','pi'=>10)); -+$r->addPostFile('upload', dirname(__FILE__).'/data.txt', 'text/plain'); -+$r->send(); -+echo $r->getResponseBody(); -+var_dump($r->getResponseMessage()->getResponseCode()); -+ -+echo "Done"; -+?> -+--EXPECTF-- -+%aTEST -+Array -+( -+ [effective_url] => http://www.google.com/ -+ [response_code] => 302 -+ [total_time] => %f -+ [namelookup_time] => %f -+ [connect_time] => %f -+ [pretransfer_time] => %f -+ [size_upload] => %d -+ [size_download] => %d -+ [speed_download] => %d -+ [speed_upload] => %d -+ [header_size] => %d -+ [request_size] => %d -+ [ssl_verifyresult] => %d -+ [filetime] => -1 -+ [content_length_download] => %d -+ [content_length_upload] => %d -+ [starttransfer_time] => %f -+ [content_type] => %s -+ [redirect_time] => %d -+ [redirect_count] => %d -+ [connect_code] => %d -+ [httpauth_avail] => %d -+ [proxyauth_avail] => %d -+ [os_errno] => %d -+ [num_connects] => %d -+ [ssl_engines] => Array -+ %a -+ [cookies] => Array -+ %a -+ [error] => -+) -+Array -+( -+ [gq] => foobar -+ [gi] => 10 -+ [pq] => foobar -+ [pi] => 10 -+ [MyCookie] => foobar -+) -+Array -+( -+ [upload] => Array -+ ( -+ [name] => data.txt -+ [type] => text/plain -+ [tmp_name] => %a -+ [error] => 0 -+ [size] => 1010 -+ ) -+ -+) -+int(200) -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequest_003.phpt -@@ -0,0 +1,54 @@ -+--TEST-- -+HttpRequest SSL -+--SKIPIF-- -+ -+--FILE-- -+ '3', 'ssl' => array('version' => '3', 'verifyhost' => '1')); -+$r = new HttpRequest('https://ssl.irmler.at/iworks/data.txt'); -+$r->setOptions($o); -+$r->send(); -+var_dump($r->getResponseBody()); -+var_dump(is_object($r->getResponseMessage())); -+var_dump(is_object($r->getResponseMessage())); -+var_dump(is_object($r->getResponseMessage())); -+var_dump($o); -+$r->setOptions($o); -+$r->send(); -+var_dump($o); -+?> -+--EXPECTF-- -+%aTEST -+string(10) "1234567890" -+bool(true) -+bool(true) -+bool(true) -+array(2) { -+ ["redirect"]=> -+ string(1) "3" -+ ["ssl"]=> -+ array(2) { -+ ["version"]=> -+ string(1) "3" -+ ["verifyhost"]=> -+ string(1) "1" -+ } -+} -+array(2) { -+ ["redirect"]=> -+ string(1) "3" -+ ["ssl"]=> -+ array(2) { -+ ["version"]=> -+ string(1) "3" -+ ["verifyhost"]=> -+ string(1) "1" -+ } -+} -+ ---- /dev/null -+++ b/ext/http/tests/HttpRequest_004.phpt -@@ -0,0 +1,162 @@ -+--TEST-- -+HttpRequest multiple posts -+--SKIPIF-- -+ -+--FILE-- -+ 1, 'dbl' => M_PI), -+ array('str' => 'something', 'nil' => null) -+); -+ -+echo "\nFirst Request\n"; -+$r = new HttpRequest('http://dev.iworks.at/ext-http/.print_request.php', HttpRequest::METH_POST); -+$r->setPostFields($fields[0]); -+$r->addPostFields($fields[1]); -+var_dump($r->send()->getBody()); -+var_dump($fields); -+ -+echo "\nSecond Request\n"; -+$r->setPostFields($fields); -+var_dump($r->send()->getBody()); -+var_dump($fields); -+ -+echo "\nThird Request\n"; -+$r->addPostFields(array('x' => 'X')); -+var_dump($r->send()->getBody()); -+var_dump($fields); -+ -+echo "\nFourth Request\n"; -+$r->setPostFields(array()); -+var_dump($r->send()->getBody()); -+var_dump($fields); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+ -+First Request -+string(%d) "Array -+( -+ [int] => 1 -+ [dbl] => 3.1415926535898 -+ [str] => something -+ [nil] => -+) -+string(44) "int=1&dbl=3.1415926535898&str=something&nil=" -+" -+array(2) { -+ [0]=> -+ array(2) { -+ ["int"]=> -+ int(1) -+ ["dbl"]=> -+ float(3.1415926535898) -+ } -+ [1]=> -+ array(2) { -+ ["str"]=> -+ string(9) "something" -+ ["nil"]=> -+ NULL -+ } -+} -+ -+Second Request -+string(%d) "Array -+( -+ [0] => Array -+ ( -+ [int] => 1 -+ [dbl] => 3.1415926535898 -+ ) -+ -+ [1] => Array -+ ( -+ [str] => something -+ [nil] => -+ ) -+ -+) -+string(72) "0%5Bint%5D=1&0%5Bdbl%5D=3.1415926535898&1%5Bstr%5D=something&1%5Bnil%5D=" -+" -+array(2) { -+ [0]=> -+ array(2) { -+ ["int"]=> -+ int(1) -+ ["dbl"]=> -+ float(3.1415926535898) -+ } -+ [1]=> -+ array(2) { -+ ["str"]=> -+ string(9) "something" -+ ["nil"]=> -+ NULL -+ } -+} -+ -+Third Request -+string(%d) "Array -+( -+ [0] => Array -+ ( -+ [int] => 1 -+ [dbl] => 3.1415926535898 -+ ) -+ -+ [1] => Array -+ ( -+ [str] => something -+ [nil] => -+ ) -+ -+ [x] => X -+) -+string(76) "0%5Bint%5D=1&0%5Bdbl%5D=3.1415926535898&1%5Bstr%5D=something&1%5Bnil%5D=&x=X" -+" -+array(2) { -+ [0]=> -+ array(2) { -+ ["int"]=> -+ int(1) -+ ["dbl"]=> -+ float(3.1415926535898) -+ } -+ [1]=> -+ array(2) { -+ ["str"]=> -+ string(9) "something" -+ ["nil"]=> -+ NULL -+ } -+} -+ -+Fourth Request -+string(13) "string(0) "" -+" -+array(2) { -+ [0]=> -+ array(2) { -+ ["int"]=> -+ int(1) -+ ["dbl"]=> -+ float(3.1415926535898) -+ } -+ [1]=> -+ array(2) { -+ ["str"]=> -+ string(9) "something" -+ ["nil"]=> -+ NULL -+ } -+} -+Done -+ ---- /dev/null -+++ b/ext/http/tests/HttpRequest_005.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+HttpRequest accessors -+--SKIPIF-- -+ -+--FILE-- -+ 3 && substr($method, 0, 3) == 'get') -+ $x = $r->$method(); -+ } catch (HttpException $e) { -+ } -+} -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequest_006.phpt -@@ -0,0 +1,147 @@ -+--TEST-- -+HttpRequest XMLRPC -+--SKIPIF-- -+ -+--FILE-- -+setContentType('text/xml'); -+$r->setBody(xmlrpc_encode_request('testMethod', array('foo' => 'bar'))); -+var_dump($r->send()); -+var_dump($r->send()); -+var_dump($r->send()); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+object(HttpMessage)#%d (%d) { -+ ["type:protected"]=> -+ int(2) -+ ["body:protected"]=> -+ string(309) "string(294) " -+ -+testMethod -+ -+ -+ -+ -+ -+ foo -+ -+ bar -+ -+ -+ -+ -+ -+ -+ -+" -+" -+ ["requestMethod:protected"]=> -+ string(0) "" -+ ["requestUrl:protected"]=> -+ string(0) "" -+ ["responseStatus:protected"]=> -+ string(2) "OK" -+ ["responseCode:protected"]=> -+ int(200) -+ ["httpVersion:protected"]=> -+ float(1.1) -+ ["headers:protected"]=> -+ array(6) { -+ %a -+ } -+ ["parentMessage:protected"]=> -+ NULL -+} -+object(HttpMessage)#%d (%d) { -+ ["type:protected"]=> -+ int(2) -+ ["body:protected"]=> -+ string(309) "string(294) " -+ -+testMethod -+ -+ -+ -+ -+ -+ foo -+ -+ bar -+ -+ -+ -+ -+ -+ -+ -+" -+" -+ ["requestMethod:protected"]=> -+ string(0) "" -+ ["requestUrl:protected"]=> -+ string(0) "" -+ ["responseStatus:protected"]=> -+ string(2) "OK" -+ ["responseCode:protected"]=> -+ int(200) -+ ["httpVersion:protected"]=> -+ float(1.1) -+ ["headers:protected"]=> -+ array(6) { -+ %a -+ } -+ ["parentMessage:protected"]=> -+ NULL -+} -+object(HttpMessage)#%d (%d) { -+ ["type:protected"]=> -+ int(2) -+ ["body:protected"]=> -+ string(309) "string(294) " -+ -+testMethod -+ -+ -+ -+ -+ -+ foo -+ -+ bar -+ -+ -+ -+ -+ -+ -+ -+" -+" -+ ["requestMethod:protected"]=> -+ string(0) "" -+ ["requestUrl:protected"]=> -+ string(0) "" -+ ["responseStatus:protected"]=> -+ string(2) "OK" -+ ["responseCode:protected"]=> -+ int(200) -+ ["httpVersion:protected"]=> -+ float(1.1) -+ ["headers:protected"]=> -+ array(6) { -+ %a -+ } -+ ["parentMessage:protected"]=> -+ NULL -+} -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequest_007.phpt -@@ -0,0 +1,64 @@ -+--TEST-- -+HttpRequest PUT -+--SKIPIF-- -+ -+--FILE-- -+recordHistory = true; -+$r->addHeaders(array('content-type' => 'text/plain')); -+$r->setPutFile(__FILE__); -+$r->send(); -+var_dump($r->getHistory()->toString(true)); -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+string(%d) "PUT /ext-http/.print_put.php5 HTTP/1.1 -+User-Agent: PECL::HTTP/%a -+Host: dev.iworks.at -+Accept: */* -+Content-Type: text/plain -+Content-Length: %d -+Expect: 100-continue -+ -+recordHistory = true; -+$r->addHeaders(array('content-type' => 'text/plain')); -+$r->setPutFile(__FILE__); -+$r->send(); -+var_dump($r->getHistory()->toString(true)); -+echo "Done\n"; -+?> -+ -+HTTP/1.1 100 Continue -+HTTP/1.1 200 OK -+Date: %a -+Server: %a -+X-Powered-By: %a -+Vary: Accept-Encoding -+Content-Length: %d -+Content-Type: text/html -+ -+recordHistory = true; -+$r->addHeaders(array('content-type' => 'text/plain')); -+$r->setPutFile(__FILE__); -+$r->send(); -+var_dump($r->getHistory()->toString(true)); -+echo "Done\n"; -+?> -+ -+" -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequest_008.phpt -@@ -0,0 +1,32 @@ -+--TEST-- -+HttpRequest custom request method -+--SKIPIF-- -+ -+--FILE-- -+setContentType('text/plain'); -+$r->setBody('Yep, this is FOOBAR!'); -+var_dump($r->send()->getResponseCode()); -+var_dump($r->getRawRequestMessage()); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+int(200) -+string(%d) "FOOBAR /ext-http/.print_request.php HTTP/1.1 -+User-Agent: %a -+Host: dev.iworks.at -+Accept: */* -+Content-Type: text/plain -+Content-Length: 20 -+ -+Yep, this is FOOBAR!" -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequest_009.phpt -@@ -0,0 +1,48 @@ -+--TEST-- -+HttpRequest callbacks -+--SKIPIF-- -+ -+--FILE-- -+getResponseCode()); -+ } -+} -+ -+$r = new _R('http://dev.iworks.at/ext-http/.print_request.php', HTTP_METH_POST); -+$r->addPostFile('upload', __FILE__, 'text/plain'); -+$r->send(); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+Array -+( -+ [dltotal] => %f -+ [dlnow] => %f -+ [ultotal] => %f -+ [ulnow] => %f -+) -+%array -+( -+ [dltotal] => %f -+ [dlnow] => %f -+ [ultotal] => %f -+ [ulnow] => %f -+) -+int(200) -+Done ---- /dev/null -+++ b/ext/http/tests/HttpRequest_010.phpt -@@ -0,0 +1,48 @@ -+--TEST-- -+HttpRequest cookie API -+--SKIPIF-- -+ -+--FILE-- -+send(); -+$c[0] = $r->getResponseInfo("cookies"); -+if (!empty($c[0])) { -+ var_dump('$c[0]', $c[0]); -+} -+ -+var_dump($r->enableCookies()); -+$r->send(); -+ -+$c[1] = $r->getResponseInfo("cookies"); -+if (empty($c[1])) { -+ var_dump('$c[1]', $c[1]); -+} -+ -+var_dump($r->resetCookies()); -+$r->send(); -+ -+$c[2] = $r->getResponseInfo("cookies"); -+if ($c[1] === $c[2]) { -+ var_dump('$c[1]', $c[1], '$c[2]', $c[2]); -+} -+ -+$r->send(); -+$c[3] = $r->getResponseInfo("cookies"); -+if ($c[2] !== $c[3]) { -+ var_dump('$c[2]', $c[2], '$c[3]', $c[3]); -+} -+ -+echo "Done\n"; -+--EXPECTF-- -+%aTEST -+bool(true) -+bool(true) -+Done ---- /dev/null -+++ b/ext/http/tests/HttpResponse_001.phpt -@@ -0,0 +1,25 @@ -+--TEST-- -+HttpResponse - send data with caching headers -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: public, must-revalidate, max-age=3600 -+Last-Modified: %a, %d %a 20%d %d:%d:%d GMT -+Content-Type: %a -+Accept-Ranges: bytes -+ETag: "3858f62230ac3c915f300c664312c63f" -+Content-Length: 6 -+ -+foobar ---- /dev/null -+++ b/ext/http/tests/HttpResponse_002.phpt -@@ -0,0 +1,25 @@ -+--TEST-- -+HttpResponse - send gzipped file -+--SKIPIF-- -+ -+--ENV-- -+HTTP_ACCEPT_ENCODING=gzip -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Content-Type: %a -+Accept-Ranges: bytes -+Content-Encoding: gzip -+Vary: Accept-Encoding -+ -+%a ---- /dev/null -+++ b/ext/http/tests/HttpResponse_003.phpt -@@ -0,0 +1,30 @@ -+--TEST-- -+HttpResponse - send gzipped file with caching headers -+--SKIPIF-- -+ -+--ENV-- -+HTTP_ACCEPT_ENCODING=gzip -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: public, must-revalidate, max-age=3600 -+Last-Modified: %a, %d %a 20%d %d:%d:%d GMT -+Content-Type: %a -+Accept-Ranges: bytes -+ETag: "%a" -+Content-Encoding: gzip -+Vary: Accept-Encoding -+ -+%a ---- /dev/null -+++ b/ext/http/tests/HttpResponse_004.phpt -@@ -0,0 +1,27 @@ -+--TEST-- -+HttpResponse - send cached gzipped data -+--SKIPIF-- -+ -+--ENV-- -+HTTP_IF_NONE_MATCH="900150983cd24fb0d6963f7d28e17f72" -+HTTP_ACCEPT_ENCODING=gzip -+--FILE-- -+ -+--EXPECTF-- -+Status: 304%s -+X-Powered-By: PHP/%s -+Cache-Control: public, must-revalidate, max-age=3600 -+Last-Modified: %s -+Accept-Ranges: bytes -+ETag: "900150983cd24fb0d6963f7d28e17f72" ---- /dev/null -+++ b/ext/http/tests/HttpResponse_005.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+HttpResponse file not found -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+Status: 404%s -+X-Powered-By: PHP/%s -+Content-Type: text/plain -+ -+File not found ---- /dev/null -+++ b/ext/http/tests/allowed_methods_002.phpt -@@ -0,0 +1,21 @@ -+--TEST-- -+allowed methods -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+Status: 405%s -+X-Powered-By: PHP/%a -+Allow: POST -+Content-type: %a -+ ---- /dev/null -+++ b/ext/http/tests/allowed_methods_002_logging.phpt -@@ -0,0 +1,21 @@ -+--TEST-- -+logging allowed methods -+--SKIPIF-- -+ -+--ENV-- -+HTTP_HOST=example.com -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d [405-ALLOWED] Allow: POST <%a> -+Done ---- /dev/null -+++ b/ext/http/tests/bug_15800.phpt -@@ -0,0 +1,49 @@ -+--TEST-- -+Bug #15800 Double free when zval is separated in convert_to_* -+--SKIPIF-- -+ -+--FILE-- -+ array('verifypeer'=>'1')); -+debug_zval_dump($o); -+ -+$r = new HttpRequest('http://www.google.com'); -+$r->setOptions($o); -+$r->send(); -+debug_zval_dump($o); -+ -+unset($r); -+debug_zval_dump($o); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+array(1) refcount(2){ -+ ["ssl"]=> -+ array(1) refcount(1){ -+ ["verifypeer"]=> -+ string(1) "1" refcount(1) -+ } -+} -+array(1) refcount(2){ -+ ["ssl"]=> -+ array(1) refcount(1){ -+ ["verifypeer"]=> -+ string(1) "1" refcount(2) -+ } -+} -+array(1) refcount(2){ -+ ["ssl"]=> -+ array(1) refcount(1){ -+ ["verifypeer"]=> -+ string(1) "1" refcount(1) -+ } -+} -+Done ---- /dev/null -+++ b/ext/http/tests/build_str_001.phpt -@@ -0,0 +1,30 @@ -+--TEST-- -+http_build_str -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+a=b -+a=b&c%5B0%5D=1 -+a=b&c%5B0%5D=1&d%5Be%5D=f -+foo%5B0%5D=1&foo%5B1%5D=2&foo%5B2%5D%5B0%5D=3 -+Done ---- /dev/null -+++ b/ext/http/tests/build_url_001.phpt -@@ -0,0 +1,18 @@ -+--TEST-- -+http_build_url() with relative paths -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+http://%a/page -+http://%a/with/some/path/ -+Done ---- /dev/null -+++ b/ext/http/tests/build_url_002.phpt -@@ -0,0 +1,30 @@ -+--TEST-- -+http_build_url() with parse_url() -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+https://www.example.com:9999/replaced?q=1#n -+https://www.example.com:9999/replaced?q=1#n -+Array -+( -+ [scheme] => https -+ [host] => www.example.com -+ [port] => 9999 -+ [path] => /replaced -+ [query] => q=1 -+ [fragment] => n -+) -+Done ---- /dev/null -+++ b/ext/http/tests/build_url_003.phpt -@@ -0,0 +1,26 @@ -+--TEST-- -+http_build_url() -+--SKIPIF-- -+ -+--ENV-- -+HTTP_HOST=www.example.com -+--FILE-- -+ 'https'))); -+printf("-%s-\n", http_build_url($url, array('scheme' => 'https', 'host' => 'ssl.example.com'))); -+printf("-%s-\n", http_build_url($url, array('scheme' => 'ftp', 'host' => 'ftp.example.com', 'port' => 21))); -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+-http://www.example.com/path/?query#anchor- -+-https://www.example.com/path/?query#anchor- -+-https://ssl.example.com/path/?query#anchor- -+-ftp://ftp.example.com/path/?query#anchor- -+Done ---- /dev/null -+++ b/ext/http/tests/build_url_004.phpt -@@ -0,0 +1,22 @@ -+--TEST-- -+http_build_url flags -+--SKPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+http://www.example.com/foo/baz -+http://www.example.com/foo/baz -+http://mike@www.example.com/foo/baz -+http://www.example.com/?a%5B0%5D=1&a%5B1%5D=b&b=c -+Done ---- /dev/null -+++ b/ext/http/tests/chunked_decode_001.phpt -@@ -0,0 +1,25 @@ -+--TEST-- -+http_chunked_decode() "\r\n" -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+string(12) "abra -+cadabra" -+ ---- /dev/null -+++ b/ext/http/tests/chunked_decode_002.phpt -@@ -0,0 +1,25 @@ -+--TEST-- -+http_chunked_decode() "\n" -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+string(12) "abra -+cadabra" -+ ---- /dev/null -+++ b/ext/http/tests/chunked_decode_003.phpt -@@ -0,0 +1,27 @@ -+--TEST-- -+http_chunked_decode() truncated message -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+%aWarning%ahttp_chunked_decode()%aTruncated message: chunk size 255 exceeds remaining data size 12 at pos 34 of 46 in%a -+string(24) "abra -+cadabra -+all we got -+" ---- /dev/null -+++ b/ext/http/tests/chunked_decode_004.phpt -@@ -0,0 +1,26 @@ -+--TEST-- -+http_chunked_decode() truncated message ending with NUL after a chunk -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+string(24) "abra -+cadabra -+all we got -+" ---- /dev/null -+++ b/ext/http/tests/cloning_001.phpt -@@ -0,0 +1,29 @@ -+--TEST-- -+cloning -+--SKIPIF-- -+ -+--FILE-- -+setOptions(array('redirect' => 3)); -+var_dump($r1->getOptions() == $r2->getOptions()); -+$r1->setUrl('http://www.google.com/'); -+var_dump($r1->getUrl() == $r2->getUrl()); -+$r1->send(); -+var_dump($r1->getResponseInfo() == $r2->getResponseInfo()); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+bool(false) -+bool(false) -+bool(false) -+Done ---- /dev/null -+++ b/ext/http/tests/data.txt -@@ -0,0 +1,10 @@ -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 ---- /dev/null -+++ b/ext/http/tests/date_001.phpt -@@ -0,0 +1,17 @@ -+--TEST-- -+http_date() with timestamp -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+Thu, 01 Jan 1970 00:00:01 GMT -+Fri, 13 Feb 2009 23:31:30 GMT -+ ---- /dev/null -+++ b/ext/http/tests/date_002.phpt -@@ -0,0 +1,21 @@ -+--TEST-- -+http_date() without timestamp -+--SKIPIF-- -+ -+--FILE-- -+ 1); -+echo "$t\n$d\nDone\n"; -+?> -+--EXPECTF-- -+%aTEST -+bool(true) -+%d -+%a, %d %a %d %d:%d:%d GMT -+Done ---- /dev/null -+++ b/ext/http/tests/encoding_objects_001.phpt -@@ -0,0 +1,35 @@ -+--TEST-- -+encoding stream objects -+--SKIPIF-- -+ -+--FILE-- -+flush($d->flush("Hi ")); -+echo $i->finish($d->finish("there!\n")); -+echo $i->finish($d->finish("Yo...\n")); -+ -+$id = $i->update($d->update($pd = file_get_contents(__FILE__))); -+foreach (glob('*.phpt') as $f) { -+ $id .= $i->update($d->update($tmp = file_get_contents($f))); -+ $pd .= $tmp; -+} -+$id .= $i->finish($d->finish()); -+ -+var_dump($id == $pd); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+Hi there! -+Yo... -+bool(true) -+Done -+ ---- /dev/null -+++ b/ext/http/tests/encodings.phpt -@@ -0,0 +1,44 @@ -+--TEST-- -+encodings -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+bool(true) -+bool(true) -+bool(true) -+Done ---- /dev/null -+++ b/ext/http/tests/etag_mode_031.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+crc32 etag (may fail because PHPs crc32 is actually crc32b) -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: private, must-revalidate, max-age=0 -+Accept-Ranges: bytes -+ETag: "4e818847" -+Content-Length: 4 -+Content-type: %a -+ -+abc ---- /dev/null -+++ b/ext/http/tests/etag_mode_032.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+sha1 etag -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: private, must-revalidate, max-age=0 -+Accept-Ranges: bytes -+ETag: "03cfd743661f07975fa2f1220c5194cbaff48451" -+Content-Length: 4 -+Content-type: %a -+ -+abc ---- /dev/null -+++ b/ext/http/tests/etag_mode_033.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+md5 etag -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: private, must-revalidate, max-age=0 -+Accept-Ranges: bytes -+ETag: "0bee89b07a248e27c83fc3d5951213c1" -+Content-Length: 4 -+Content-type: %a -+ -+abc ---- /dev/null -+++ b/ext/http/tests/etag_mode_034.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+ext/hash etag -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: private, must-revalidate, max-age=0 -+Accept-Ranges: bytes -+ETag: "edeaaff3f1774ad2888673770c6d64097e391bc362d7d6fb34982ddf0efd18cb" -+Content-Length: 4 -+Content-type: %a -+ -+abc ---- /dev/null -+++ b/ext/http/tests/etag_mode_041.phpt -@@ -0,0 +1,21 @@ -+--TEST-- -+ob crc32 etag (may fail because PHPs crc32 is actually crc32b) -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: private, must-revalidate, max-age=0 -+ETag: "4e818847" -+Content-type: %a -+ -+abc ---- /dev/null -+++ b/ext/http/tests/etag_mode_042.phpt -@@ -0,0 +1,21 @@ -+--TEST-- -+ob sha1 etag -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: private, must-revalidate, max-age=0 -+ETag: "03cfd743661f07975fa2f1220c5194cbaff48451" -+Content-type: %a -+ -+abc ---- /dev/null -+++ b/ext/http/tests/etag_mode_043.phpt -@@ -0,0 +1,21 @@ -+--TEST-- -+ob md5 etag -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: private, must-revalidate, max-age=0 -+ETag: "0bee89b07a248e27c83fc3d5951213c1" -+Content-type: %a -+ -+abc ---- /dev/null -+++ b/ext/http/tests/etag_mode_044.phpt -@@ -0,0 +1,22 @@ -+--TEST-- -+ob ext/hash etag -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%a -+Cache-Control: private, must-revalidate, max-age=0 -+ETag: "edeaaff3f1774ad2888673770c6d64097e391bc362d7d6fb34982ddf0efd18cb" -+Content-type: %a -+ -+abc ---- /dev/null -+++ b/ext/http/tests/exceptions.phpt -@@ -0,0 +1,53 @@ -+--TEST-- -+exceptions -+--SKIPIF-- -+ -+--FILE-- -+ 'Runtime', -+ HTTP_E_INVALID_PARAM => 'InvalidParam', -+ HTTP_E_HEADER => 'Header', -+ HTTP_E_MALFORMED_HEADERS => 'MalformedHeaders', -+ HTTP_E_REQUEST_METHOD => 'RequestMethod', -+ HTTP_E_MESSAGE_TYPE => 'MessageType', -+ HTTP_E_ENCODING => 'Encoding', -+ HTTP_E_REQUEST => 'Request', -+ HTTP_E_REQUEST_POOL => 'RequestPool', -+ HTTP_E_SOCKET => 'Socket', -+ HTTP_E_RESPONSE => 'Response', -+ HTTP_E_URL => 'Url', -+); -+ -+foreach ($e as $i => $c) { -+ try { -+ $n = "Http{$c}Exception"; -+ throw new $n; -+ } catch (HttpException $x) { -+ printf("%2d: %s\n", $i, get_class($x)); -+ } -+} -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+ 1: HttpRuntimeException -+ 2: HttpInvalidParamException -+ 3: HttpHeaderException -+ 4: HttpMalformedHeadersException -+ 5: HttpRequestMethodException -+ 6: HttpMessageTypeException -+ 7: HttpEncodingException -+ 8: HttpRequestException -+ 9: HttpRequestPoolException -+10: HttpSocketException -+11: HttpResponseException -+12: HttpUrlException -+Done ---- /dev/null -+++ b/ext/http/tests/get_request_data_001.phpt -@@ -0,0 +1,40 @@ -+--TEST-- -+get request data -+--SKIPIF-- -+ -+--POST-- -+a=b&c=d -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+Array -+( -+ [Accept-Charset] => iso-8859-1, * -+ [Accept-Encoding] => none -+ [Host] => localhost -+ [User-Agent] => Mozilla/5.0 -+) -+string(7) "a=b&c=d" -+string(7) "a=b&c=d" -+string(7) "a=b&c=d" -+string(7) "a=b&c=d" -+Done ---- /dev/null -+++ b/ext/http/tests/log.inc -@@ -0,0 +1,23 @@ -+ ---- /dev/null -+++ b/ext/http/tests/match_request_header_001.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+http_match_request_header() -+--SKIPIF-- -+ -+--ENV-- -+HTTP_FOO=bar -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+bool(true) -+bool(true) -+bool(false) -+Done ---- /dev/null -+++ b/ext/http/tests/negotiation_001.phpt -@@ -0,0 +1,64 @@ -+--TEST-- -+negotiation -+--SKIPIF-- -+ -+--ENV-- -+HTTP_ACCEPT=application/xml, application/xhtml+xml, text/html ; q = .8 -+HTTP_ACCEPT_LANGUAGE=de-AT,de-DE;q=0.8,en-GB;q=0.3,en-US;q=0.2 -+HTTP_ACCEPT_CHARSET=ISO-8859-1,utf-8;q=0.7,*;q=0.7 -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+string(2) "de" -+string(2) "de" -+string(10) "iso-8859-1" -+string(10) "iso-8859-1" -+string(21) "application/xhtml+xml" -+string(21) "application/xhtml+xml" -+string(7) "unknown" -+string(7) "unknown" -+string(7) "unknown" -+Array -+( -+ [de] => 900 -+ [en] => 0.27 -+) -+Array -+( -+ [iso-8859-1] => 1000 -+ [utf-8] => 0.7 -+) -+Array -+( -+ [application/xhtml+xml] => 999 -+ [text/html] => 0.8 -+) -+Done ---- /dev/null -+++ b/ext/http/tests/ob_deflatehandler_001.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+ob_deflatehandler -+--SKIPIF-- -+ -+--ENV-- -+HTTP_ACCEPT_ENCODING=gzip -+--FILE-- -+ -+--EXPECTF-- -+%a -+Content-Encoding: gzip -+Vary: Accept-Encoding -+%a -+ ---- /dev/null -+++ b/ext/http/tests/ob_inflatehandler_001.phpt -@@ -0,0 +1,16 @@ -+--TEST-- -+ob_inflatehandler -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+ ---- /dev/null -+++ b/ext/http/tests/parse_cookie_001.phpt -@@ -0,0 +1,41 @@ -+--TEST-- -+parse cookie -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+object(stdClass)%a { -+ ["cookies"]=> -+ array(3) { -+ ["name"]=> -+ string(5) "value" -+ ["foo"]=> -+ string(7) "bar"baz" -+ ["hey"]=> -+ string(6) "got"it" -+ } -+ ["extras"]=> -+ array(1) { -+ ["comment"]=> -+ string(0) "" -+ } -+ ["flags"]=> -+ int(32) -+ ["expires"]=> -+ int(1) -+ ["path"]=> -+ string(1) "/" -+ ["domain"]=> -+ string(0) "" -+} -+Done ---- /dev/null -+++ b/ext/http/tests/parse_cookie_002.phpt -@@ -0,0 +1,80 @@ -+--TEST-- -+parse cookie -+--SKIPIF-- -+ -+--FILE-- -+cookies['foo']); -+var_dump(http_parse_cookie('foo;')->cookies['foo']); -+var_dump(http_parse_cookie('foo ')->cookies['foo']); -+var_dump(http_parse_cookie('foo ;')->cookies['foo']); -+var_dump(http_parse_cookie('foo ; ')->cookies['foo']); -+var_dump(http_parse_cookie('foo=')->cookies['foo']); -+var_dump(http_parse_cookie('foo=;')->cookies['foo']); -+var_dump(http_parse_cookie('foo =')->cookies['foo']); -+var_dump(http_parse_cookie('foo =;')->cookies['foo']); -+var_dump(http_parse_cookie('foo= ')->cookies['foo']); -+var_dump(http_parse_cookie('foo= ;')->cookies['foo']); -+ -+var_dump(http_parse_cookie('foo=1')->cookies['foo']); -+var_dump(http_parse_cookie('foo=1;')->cookies['foo']); -+var_dump(http_parse_cookie('foo=1 ;')->cookies['foo']); -+var_dump(http_parse_cookie('foo= 1;')->cookies['foo']); -+var_dump(http_parse_cookie('foo = 1;')->cookies['foo']); -+var_dump(http_parse_cookie('foo = 1 ;')->cookies['foo']); -+var_dump(http_parse_cookie('foo=1')->cookies['foo']); -+var_dump(http_parse_cookie('foo= 1')->cookies['foo']); -+ -+var_dump(http_parse_cookie('foo="1"')->cookies['foo']); -+var_dump(http_parse_cookie('foo="1" ')->cookies['foo']); -+var_dump(http_parse_cookie('foo="1";')->cookies['foo']); -+var_dump(http_parse_cookie('foo = "1" ;')->cookies['foo']); -+var_dump(http_parse_cookie('foo= "1" ')->cookies['foo']); -+ -+var_dump(http_parse_cookie('foo=""')->cookies['foo']); -+var_dump(http_parse_cookie('foo="\""')->cookies['foo']); -+var_dump(http_parse_cookie('foo=" "')->cookies['foo']); -+var_dump(http_parse_cookie('foo= "')->cookies['foo']); -+var_dump(http_parse_cookie('foo=" ')->cookies['foo']); -+var_dump(http_parse_cookie('foo= " ')->cookies['foo']); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+string(0) "" -+string(0) "" -+string(0) "" -+string(0) "" -+string(0) "" -+string(0) "" -+string(0) "" -+string(0) "" -+string(0) "" -+string(0) "" -+string(0) "" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(1) "1" -+string(0) "" -+string(1) """ -+string(1) " " -+string(1) """ -+string(1) """ -+string(1) """ -+Done ---- /dev/null -+++ b/ext/http/tests/parse_headers_001.phpt -@@ -0,0 +1,41 @@ -+--TEST-- -+http_parse_headers() -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+Array -+( -+ [Host] => Array -+ ( -+ [0] => localhost -+ [1] => ambigious -+ ) -+ -+ [Nospace] => here -+ [Muchspace] => there -+ [Empty] => -+ [Empty2] => -+ [Folded] => one -+ two -+ three -+) -+ ---- /dev/null -+++ b/ext/http/tests/parse_message_001.phpt -@@ -0,0 +1,18 @@ -+--TEST-- -+http_parse_message() -+--SKIPIF-- -+ -+--FILE-- -+body; -+echo "Done\n"; -+--EXPECTF-- -+%aTEST -+%aThe document has moved%a -+Done ---- /dev/null -+++ b/ext/http/tests/parse_message_002.phpt -@@ -0,0 +1,39 @@ -+--TEST-- -+identity encoding trap -+--SKIPIF-- -+ -+--FILE-- -+ 2 -+ [httpVersion] => 1.1 -+ [responseCode] => 200 -+ [responseStatus] => Ok -+ [headers] => Array -+ ( -+ [Transfer-Encoding] => identity -+ [Content-Length] => 3 -+ [Content-Type] => text/plain -+ ) -+ -+ [body] => Hi! -+ [parentMessage] => -+) -+Done ---- /dev/null -+++ b/ext/http/tests/parse_message_003.phpt -@@ -0,0 +1,31 @@ -+--TEST-- -+content range message -+--SKIPIF-- -+ -+--FILE-- -+body); -+ -+$message = -+"HTTP/1.1 200 Ok\n". -+"Content-Range: bytes 0-1/1\n\n". -+"X\n"; -+ -+$msg = http_parse_message($message); -+ -+echo "Done\n"; -+--EXPECTF-- -+%aTEST -+string(2) "OK" -+%a Invalid Content-Range header: bytes 0-1/1 in%a -+Done ---- /dev/null -+++ b/ext/http/tests/parse_message_004.phpt -@@ -0,0 +1,115 @@ -+--TEST-- -+http_parse_message() recursive -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+object(stdClass)%a { -+ ["type"]=> -+ int(2) -+ ["httpVersion"]=> -+ float(1.1) -+ ["responseCode"]=> -+ int(200) -+ ["responseStatus"]=> -+ string(2) "Ok" -+ ["headers"]=> -+ array(2) { -+ ["Server"]=> -+ string(9) "Funky/1.0" -+ ["Content-Length"]=> -+ string(2) "10" -+ } -+ ["body"]=> -+ string(10) "1234567890" -+ ["parentMessage"]=> -+ object(stdClass)%a { -+ ["type"]=> -+ int(1) -+ ["httpVersion"]=> -+ float(1.1) -+ ["requestMethod"]=> -+ string(3) "GET" -+ ["requestUrl"]=> -+ string(1) "/" -+ ["headers"]=> -+ array(2) { -+ ["Host"]=> -+ string(15) "www.example.com" -+ ["Accept"]=> -+ string(3) "*/*" -+ } -+ ["body"]=> -+ string(0) "" -+ ["parentMessage"]=> -+ object(stdClass)%a { -+ ["type"]=> -+ int(2) -+ ["httpVersion"]=> -+ float(1.1) -+ ["responseCode"]=> -+ int(200) -+ ["responseStatus"]=> -+ string(2) "Ok" -+ ["headers"]=> -+ array(2) { -+ ["Server"]=> -+ string(9) "Funky/1.0" -+ ["Content-Length"]=> -+ string(2) "10" -+ } -+ ["body"]=> -+ string(0) "" -+ ["parentMessage"]=> -+ object(stdClass)%a { -+ ["type"]=> -+ int(1) -+ ["httpVersion"]=> -+ float(1.1) -+ ["requestMethod"]=> -+ string(4) "HEAD" -+ ["requestUrl"]=> -+ string(1) "/" -+ ["headers"]=> -+ array(2) { -+ ["Host"]=> -+ string(15) "www.example.com" -+ ["Accept"]=> -+ string(3) "*/*" -+ } -+ ["body"]=> -+ string(0) "" -+ ["parentMessage"]=> -+ NULL -+ } -+ } -+ } -+} -+Done ---- /dev/null -+++ b/ext/http/tests/parse_message_005.phpt -@@ -0,0 +1,60 @@ -+--TEST-- -+http_parse_message() content range header w/(o) = -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+stdClass Object -+( -+ [type] => 2 -+ [httpVersion] => 1.1 -+ [responseCode] => 206 -+ [responseStatus] => -+ [headers] => Array -+ ( -+ [Server] => Funky/1.0 -+ [Content-Range] => bytes 0-0/100 -+ ) -+ -+ [body] => 1 -+ [parentMessage] => stdClass Object -+ ( -+ [type] => 2 -+ [httpVersion] => 1.1 -+ [responseCode] => 206 -+ [responseStatus] => -+ [headers] => Array -+ ( -+ [Server] => Funky/1.0 -+ [Content-Range] => bytes: 0-0/100 -+ ) -+ -+ [body] => 1 -+ [parentMessage] => -+ ) -+ -+) -+Done ---- /dev/null -+++ b/ext/http/tests/parse_message_006.phpt -@@ -0,0 +1,38 @@ -+--TEST-- -+mixed EOL trap -+--SKIPIF-- -+ -+--FILE-- -+ 2 -+ [httpVersion] => 1.1 -+ [responseCode] => 200 -+ [responseStatus] => Ok -+ [headers] => Array -+ ( -+ [Header] => Value -+ [Connection] => close -+ ) -+ -+ [body] => Bug! -+ [parentMessage] => -+) -+Done ---- /dev/null -+++ b/ext/http/tests/parse_params_001.phpt -@@ -0,0 +1,75 @@ -+--TEST-- -+http_parse_params -+--SKIPIF-- -+ -+--FILE-- -+params[0]); -+$p = http_parse_params('a=b'); var_dump($p->params[0]); -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+object(stdClass)%a { -+ ["params"]=> -+ array(2) { -+ [0]=> -+ string(9) "text/html" -+ [1]=> -+ array(1) { -+ ["charset"]=> -+ string(10) "iso-8859-1" -+ } -+ } -+} -+object(stdClass)%a { -+ ["params"]=> -+ array(2) { -+ [0]=> -+ string(9) "text/html" -+ [1]=> -+ array(1) { -+ ["charset"]=> -+ string(10) "iso-8859-1" -+ } -+ } -+} -+object(stdClass)%a { -+ ["params"]=> -+ array(2) { -+ [0]=> -+ string(10) "attachment" -+ [1]=> -+ array(1) { -+ ["filename"]=> -+ string(13) "gol;got,a.ext" -+ } -+ } -+} -+object(stdClass)%a { -+ ["params"]=> -+ array(3) { -+ [0]=> -+ string(6) "public" -+ [1]=> -+ string(15) "must-revalidate" -+ [2]=> -+ array(1) { -+ ["max-age"]=> -+ string(1) "0" -+ } -+ } -+} -+string(1) "a" -+array(1) { -+ ["a"]=> -+ string(1) "b" -+} -+Done ---- /dev/null -+++ b/ext/http/tests/persistent_handles_001.phpt -@@ -0,0 +1,91 @@ -+--TEST-- -+persistent handles -+--SKIPIF-- -+ -+--INI-- -+http.persistent.handles.limit=-1 -+http.persistent.handles.ident=GLOBAL -+--FILE-- -+ $idents) { -+ foreach ((array)$idents as $ident => $counts) { -+ if (!empty($counts["free"])) { -+ printf("%a, %a, %a\n", $provider, $ident, $counts["free"]); -+ } -+ } -+} -+ -+http_get("http://www.google.com/", null, $info[]); -+ -+echo "One free request handle within GLOBAL: "; -+var_dump(http_persistent_handles_count()->http_request["GLOBAL"]["free"]); -+ -+echo "Reusing request handle: "; -+http_get("http://www.google.com/", null, $info[]); -+var_dump($info[0]["pretransfer_time"] > 10 * $info[1]["pretransfer_time"], $info[0]["pretransfer_time"], $info[1]["pretransfer_time"]); -+ -+echo "Handles' been cleaned up:\n"; -+http_persistent_handles_clean(); -+print_r(http_persistent_handles_count()); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+No free handles! -+One free request handle within GLOBAL: int(1) -+Reusing request handle: bool(true) -+float(%f) -+float(%f) -+Handles' been cleaned up: -+stdClass Object -+( -+ [http_request] => Array -+ ( -+ [GLOBAL] => Array -+ ( -+ [used] => 0 -+ [free] => 0 -+ ) -+ -+ ) -+ -+ [http_request_datashare] => Array -+ ( -+ [GLOBAL] => Array -+ ( -+ [used] => 0 -+ [free] => 0 -+ ) -+ -+ ) -+ -+ [http_request_datashare_lock] => Array -+ ( -+ [GLOBAL] => Array -+ ( -+ [used] => 0 -+ [free] => 0 -+ ) -+ -+ ) -+ -+ [http_request_pool] => Array -+ ( -+ [GLOBAL] => Array -+ ( -+ [used] => 0 -+ [free] => 0 -+ ) -+ -+ ) -+ -+) -+Done ---- /dev/null -+++ b/ext/http/tests/persistent_handles_002.phpt -@@ -0,0 +1,83 @@ -+--TEST-- -+persistent handles -+--SKIPIF-- -+ -+--INI-- -+http.persistent.handles.limit=-1 -+http.persistent.handles.ident=GLOBAL -+--FILE-- -+ $idents) { -+ foreach ((array)$idents as $ident => $counts) { -+ if (!empty($counts["free"])) { -+ printf("%a, %a, %a\n", $provider, $ident, $counts["free"]); -+ } -+ } -+} -+ -+http_get("http://www.google.com/", null, $info[]); -+ -+echo "One free request handle within GLOBAL: "; -+$h = http_persistent_handles_count(); -+var_dump($h->http_request["GLOBAL"]["free"]); -+ -+echo "Reusing request handle: "; -+http_get("http://www.google.com/", null, $info[]); -+var_dump($info[0]["pretransfer_time"] > 10 * $info[1]["pretransfer_time"], $info[0]["pretransfer_time"], $info[1]["pretransfer_time"]); -+ -+echo "Handles' been cleaned up:\n"; -+http_persistent_handles_clean(); -+print_r(http_persistent_handles_count()); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+No free handles! -+One free request handle within GLOBAL: int(1) -+Reusing request handle: bool(true) -+float(%f) -+float(%f) -+Handles' been cleaned up: -+stdClass Object -+( -+ [http_request] => Array -+ ( -+ [GLOBAL] => Array -+ ( -+ [used] => 0 -+ [free] => 0 -+ ) -+ -+ ) -+ -+ [http_request_datashare] => Array -+ ( -+ [GLOBAL] => Array -+ ( -+ [used] => 0 -+ [free] => 0 -+ ) -+ -+ ) -+ -+ [http_request_pool] => Array -+ ( -+ [GLOBAL] => Array -+ ( -+ [used] => 0 -+ [free] => 0 -+ ) -+ -+ ) -+ -+) -+Done ---- /dev/null -+++ b/ext/http/tests/persistent_handles_003.phpt -@@ -0,0 +1,62 @@ -+--TEST-- -+persistent handles -+--SKIPIF-- -+ -+--INI-- -+http.persistent.handles.limit=-1 -+http.persistent.handles.ident=GLOBAL -+--FILE-- -+ $idents) { -+ foreach ((array)$idents as $ident => $counts) { -+ if (!empty($counts["free"])) { -+ printf("%a, %a, %a\n", $provider, $ident, $counts["free"]); -+ } -+ } -+} -+ -+http_get("http://www.google.com/", null, $info[]); -+ -+echo "One free request handle within GLOBAL: "; -+$h = http_persistent_handles_count(); -+var_dump($h->http_request["GLOBAL"]["free"]); -+ -+echo "Reusing request handle: "; -+http_get("http://www.google.com/", null, $info[]); -+var_dump($info[0]["pretransfer_time"] > 10 * $info[1]["pretransfer_time"], $info[0]["pretransfer_time"], $info[1]["pretransfer_time"]); -+ -+echo "Handles' been cleaned up:\n"; -+http_persistent_handles_clean(); -+print_r(http_persistent_handles_count()); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+No free handles! -+One free request handle within GLOBAL: int(1) -+Reusing request handle: bool(true) -+float(%f) -+float(%f) -+Handles' been cleaned up: -+stdClass Object -+( -+ [http_request] => Array -+ ( -+ [GLOBAL] => Array -+ ( -+ [used] => 0 -+ [free] => 0 -+ ) -+ -+ ) -+ -+) -+Done ---- /dev/null -+++ b/ext/http/tests/redirect_011.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+http_redirect() with params -+--SKIPIF-- -+ -+--ENV-- -+HTTP_HOST=localhost -+--FILE-- -+ 1, 'b' => 2)); -+?> -+--EXPECTF-- -+Status: 302%s -+X-Powered-By: PHP/%a -+Location: http://localhost/redirect?a=1&b=2 -+Content-type: %a -+ -+Redirecting to http://localhost/redirect?a=1&b=2. -+ ---- /dev/null -+++ b/ext/http/tests/redirect_011_logging.phpt -@@ -0,0 +1,21 @@ -+--TEST-- -+logging redirects -+--SKIPIF-- -+ -+--ENV-- -+HTTP_HOST=example.com -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d [302-REDIRECT] Location: http%a <%a> -+Done ---- /dev/null -+++ b/ext/http/tests/redirect_012.phpt -@@ -0,0 +1,27 @@ -+--TEST-- -+http_redirect() with session -+--SKIPIF-- -+ -+--ENV-- -+HTTP_HOST=localhost -+--FILE-- -+ 1), true); -+?> -+--EXPECTF-- -+Status: 302%s -+X-Powered-By: PHP/%a -+Set-Cookie: PHPSESSID=%a; path=/ -+Expires: %a -+Cache-Control: %a -+Pragma: %a -+Location: http://localhost/redirect?a=1&PHPSESSID=%a -+Content-type: %a ---- /dev/null -+++ b/ext/http/tests/redirect_012_logging.phpt -@@ -0,0 +1,22 @@ -+--TEST-- -+logging redirects -+--SKIPIF-- -+ -+--ENV-- -+HTTP_HOST=example.com -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d [302-REDIRECT] Location: http%a <%a> -+Done ---- /dev/null -+++ b/ext/http/tests/redirect_013.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+http_redirect() permanent -+--SKIPIF-- -+ -+--ENV-- -+HTTP_HOST=localhost -+--FILE-- -+ -+--EXPECTF-- -+Status: 301%s -+X-Powered-By: PHP/%a -+Location: http://localhost/redirect -+Content-type: %a -+ -+Redirecting to http://localhost/redirect. -+ ---- /dev/null -+++ b/ext/http/tests/redirect_013_logging.phpt -@@ -0,0 +1,21 @@ -+--TEST-- -+logging redirects -+--SKIPIF-- -+ -+--ENV-- -+HTTP_HOST=example.com -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+%d%d%d%d-%d%d-%d%d %d%d:%d%d:%d%d [301-REDIRECT] Location: http%a <%a> -+Done ---- /dev/null -+++ b/ext/http/tests/request_cookies.phpt -@@ -0,0 +1,52 @@ -+--TEST-- -+urlencoded cookies -+--SKIPIF-- -+ -+--FILE-- -+ "val=ue"); -+ -+$r = new HttpRequest("http://dev.iworks.at/ext-http/.print_request.php", HTTP_METH_GET, array("cookies" => $cookies)); -+$r->recordHistory = true; -+$r->send(); -+$r->setOptions(array('encodecookies' => false)); -+$r->send(); -+echo $r->getHistory()->toString(true); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+GET /ext-http/.print_request.php HTTP/1.1 -+User-Agent: %a -+Host: dev.iworks.at -+Accept: */* -+Cookie: name=val%3Due -+HTTP/1.1 200 OK -+%a -+ -+Array -+( -+ [name] => val=ue -+) -+ -+GET /ext-http/.print_request.php HTTP/1.1 -+User-Agent: %a -+Host: dev.iworks.at -+Accept: */* -+Cookie: name=val=ue; -+HTTP/1.1 200 OK -+%a -+ -+Array -+( -+ [name] => val=ue -+) -+ -+Done ---- /dev/null -+++ b/ext/http/tests/request_etag.phpt -@@ -0,0 +1,21 @@ -+--TEST-- -+request etag -+--SKIPIF-- -+ -+--FILE-- -+ '"26ad3a-5-95eb19c0"'))); -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+string(%d) "HTTP/1.1 304 Not Modified -+Date: %a -+Server: %a -+ETag: "26ad3a-5-95eb19c0" -+" -+Done -\ No newline at end of file ---- /dev/null -+++ b/ext/http/tests/request_gzip.phpt -@@ -0,0 +1,51 @@ -+--TEST-- -+GZIP request -+--SKIPIF-- -+ -+--FILE-- -+ true)))); -+ -+echo "Done\n"; -+--EXPECTF-- -+%aTEST -+object(stdClass)%a { -+ ["type"]=> -+ int(2) -+ ["httpVersion"]=> -+ float(1.1) -+ ["responseCode"]=> -+ int(200) -+ ["responseStatus"]=> -+ string(2) "OK" -+ ["headers"]=> -+ array(8) { -+ %a -+ ["Vary"]=> -+ string(15) "Accept-Encoding" -+ ["Content-Length"]=> -+ string(2) "26" -+ ["Content-Type"]=> -+ string(9) "text/html" -+ ["X-Original-Content-Encoding"]=> -+ string(4) "gzip" -+ ["X-Original-Content-Length"]=> -+ string(2) "51" -+ } -+ ["body"]=> -+ string(26) "Array -+( -+ [gzip] => 1 -+) -+" -+ ["parentMessage"]=> -+ NULL -+} -+Done -+ ---- /dev/null -+++ b/ext/http/tests/request_methods.phpt -@@ -0,0 +1,144 @@ -+--TEST-- -+request methods -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+int(0) -+UNKNOWN -+int(0) -+int(1) -+GET -+int(1) -+int(2) -+HEAD -+int(2) -+int(3) -+POST -+int(3) -+int(4) -+PUT -+int(4) -+int(5) -+DELETE -+int(5) -+int(6) -+OPTIONS -+int(6) -+int(7) -+TRACE -+int(7) -+int(8) -+CONNECT -+int(8) -+int(9) -+PROPFIND -+int(9) -+int(10) -+PROPPATCH -+int(10) -+int(11) -+MKCOL -+int(11) -+int(12) -+COPY -+int(12) -+int(13) -+MOVE -+int(13) -+int(14) -+LOCK -+int(14) -+int(15) -+UNLOCK -+int(15) -+int(16) -+VERSION-CONTROL -+int(16) -+int(17) -+REPORT -+int(17) -+int(18) -+CHECKOUT -+int(18) -+int(19) -+CHECKIN -+int(19) -+int(20) -+UNCHECKOUT -+int(20) -+int(21) -+MKWORKSPACE -+int(21) -+int(22) -+UPDATE -+int(22) -+int(23) -+LABEL -+int(23) -+int(24) -+MERGE -+int(24) -+int(25) -+BASELINE-CONTROL -+int(25) -+int(26) -+MKACTIVITY -+int(26) -+int(27) -+ACL -+int(27) -+int(0) -+UNKNOWN -+int(0) -+int(28) -+int(28) -+int(29) -+int(29) -+int(30) -+int(30) -+int(31) -+int(31) -+int(32) -+int(32) -+bool(true) -+int(0) -+int(0) -+bool(true) -+int(0) -+int(0) -+bool(true) -+int(0) -+int(0) -+bool(true) -+int(0) -+int(0) -+bool(true) -+int(0) -+int(0) -+Done ---- /dev/null -+++ b/ext/http/tests/request_put_data.phpt -@@ -0,0 +1,22 @@ -+--TEST-- -+http_put_data() -+--SKIPIF-- -+ -+--FILE-- -+ CURLBUF_SIZE */); -+$resp = http_put_data("http://dev.iworks.at/ext-http/.print_put.php5", $data); -+$mess = http_parse_message($resp); -+var_dump($data === $mess->body); -+ -+echo "Done\n"; -+?> -+--EXPECTF-- -+%aTEST -+bool(true) -+Done ---- /dev/null -+++ b/ext/http/tests/send_data_001.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+http_send_data() NIL-NUM range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=-5 -+--FILE-- -+ -+--EXPECTF-- -+Status: 206%s -+X-Powered-By: PHP/%s -+Content-Type: text/plain -+Accept-Ranges: bytes -+Content-Range: bytes 5995-5999/6000 -+Content-Length: 5 -+ -+23abc ---- /dev/null -+++ b/ext/http/tests/send_data_002.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+http_send_data() NUM-NUM range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=5-6 -+--FILE-- -+ -+--EXPECTF-- -+Status: 206%s -+X-Powered-By: PHP/%s -+Content-Type: text/plain -+Accept-Ranges: bytes -+Content-Range: bytes 5-6/6000 -+Content-Length: 2 -+ -+c1 ---- /dev/null -+++ b/ext/http/tests/send_data_003.phpt -@@ -0,0 +1,24 @@ -+--TEST-- -+http_send_data() NUM-NIL range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=5981- -+--FILE-- -+ -+--EXPECTF-- -+Status: 206%s -+X-Powered-By: PHP/%s -+Content-Type: text/plain -+Accept-Ranges: bytes -+Content-Range: bytes 5981-5999/6000 -+Content-Length: 19 -+ -+c123abc123abc123abc ---- /dev/null -+++ b/ext/http/tests/send_data_004.phpt -@@ -0,0 +1,22 @@ -+--TEST-- -+http_send_data() syntactically invalid range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=123,-wtf ? -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%s -+Content-Type: text/plain -+Accept-Ranges: bytes -+Content-Length: 6000 -+ -+123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc123abc -\ No newline at end of file ---- /dev/null -+++ b/ext/http/tests/send_data_005.phpt -@@ -0,0 +1,17 @@ -+--TEST-- -+http_send_data() oversized range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=5990-6000 -+--FILE-- -+ -+--EXPECTF-- -+Status: 416%a -\ No newline at end of file ---- /dev/null -+++ b/ext/http/tests/send_data_006.phpt -@@ -0,0 +1,38 @@ -+--TEST-- -+http_send_data() multiple ranges -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=0-3, 4-5,9-11 -+--FILE-- -+ -+--EXPECTF-- -+Status: 206%s -+X-Powered-By: PHP/%s -+Accept-Ranges: bytes -+Content-Type: multipart/byteranges; boundary=%d.%d -+ -+ -+--%d.%d -+Content-Type: text/plain -+Content-Range: bytes 0-3/6000 -+ -+123a -+--%d.%d -+Content-Type: text/plain -+Content-Range: bytes 4-5/6000 -+ -+bc -+--%d.%d -+Content-Type: text/plain -+Content-Range: bytes 9-11/6000 -+ -+abc -+--%d.%d-- ---- /dev/null -+++ b/ext/http/tests/send_data_010.phpt -@@ -0,0 +1,20 @@ -+--TEST-- -+http_send_data() HTTP_SENDBUF_SIZE long string -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%s -+Accept-Ranges: bytes -+Content-Length: 20 -+Content-type: %s -+ -+00000000000000000000 ---- /dev/null -+++ b/ext/http/tests/send_data_011.phpt -@@ -0,0 +1,22 @@ -+--TEST-- -+http_send_data() last modified caching -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%s -+Cache-Control: private, must-revalidate, max-age=0 -+Last-Modified: %s, %d %s %d %d:%d:%d GMT -+Accept-Ranges: bytes -+Content-Length: 4 -+Content-type: %s -+ -+abc ---- /dev/null -+++ b/ext/http/tests/send_failed_precond_001.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+http_send() failed precondition -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=0-1 -+HTTP_IF_UNMODIFIED_SINCE=Thu, 01 Jan 1970 00:16:40 GMT -+--FILE-- -+ -+--EXPECTF-- -+Status: 412%s -+X-Powered-By: %s -+Cache-Control: private, must-revalidate, max-age=0 -+Last-Modified: %s -+Accept-Ranges: bytes -+Content-type: text/html ---- /dev/null -+++ b/ext/http/tests/send_file_005.phpt -@@ -0,0 +1,38 @@ -+--TEST-- -+http_send_file() multiple ranges -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=0-3, 4-5,9-11 -+--FILE-- -+ -+--EXPECTF-- -+Status: 206%s -+X-Powered-By: PHP/%s -+Accept-Ranges: bytes -+Content-Type: multipart/byteranges; boundary=%d.%d -+ -+ -+--%d.%d -+Content-Type: text/plain -+Content-Range: bytes 0-3/1010 -+ -+0123 -+--%d.%d -+Content-Type: text/plain -+Content-Range: bytes 4-5/1010 -+ -+45 -+--%d.%d -+Content-Type: text/plain -+Content-Range: bytes 9-11/1010 -+ -+901 -+--%d.%d-- ---- /dev/null -+++ b/ext/http/tests/send_file_008.phpt -@@ -0,0 +1,28 @@ -+--TEST-- -+http_send_file() -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%s -+Accept-Ranges: bytes -+Content-Length: 1010 -+Content-type: %s -+ -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 ---- /dev/null -+++ b/ext/http/tests/send_file_009.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+http_send_file() NUM-NUM range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=5-9 -+--FILE-- -+ -+--EXPECTF-- -+Status: 206%s -+X-Powered-By: PHP/%s -+Accept-Ranges: bytes -+Content-Range: bytes 5-9/1010 -+Content-Length: 5 -+Content-type: %s -+ -+56789 ---- /dev/null -+++ b/ext/http/tests/send_file_010.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+http_send_file() NIL-NUM range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=-9 -+--FILE-- -+ -+--EXPECTF-- -+Status: 206%s -+X-Powered-By: PHP/%s -+Accept-Ranges: bytes -+Content-Range: bytes 1001-1009/1010 -+Content-Length: 9 -+Content-type: %s -+ -+23456789 ---- /dev/null -+++ b/ext/http/tests/send_file_011.phpt -@@ -0,0 +1,23 @@ -+--TEST-- -+http_send_file() NUM-NIL range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=1000- -+--FILE-- -+ -+--EXPECTF-- -+Status: 206%s -+X-Powered-By: PHP/%s -+Accept-Ranges: bytes -+Content-Range: bytes 1000-1009/1010 -+Content-Length: 10 -+Content-type: %s -+ -+123456789 ---- /dev/null -+++ b/ext/http/tests/send_file_012.phpt -@@ -0,0 +1,30 @@ -+--TEST-- -+http_send_file() syntactically invalid range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=xxx -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: PHP/%s -+Accept-Ranges: bytes -+Content-Length: 1010 -+Content-type: %s -+ -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 -+0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789 ---- /dev/null -+++ b/ext/http/tests/send_file_013.phpt -@@ -0,0 +1,19 @@ -+--TEST-- -+http_send_file() oversized range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=-1111 -+--FILE-- -+ -+--EXPECTF-- -+Status: 416 -+X-Powered-By: PHP/%s -+Accept-Ranges: bytes -+Content-type: %s ---- /dev/null -+++ b/ext/http/tests/send_ifrange_001.phpt -@@ -0,0 +1,27 @@ -+--TEST-- -+http_send() If-Range -+--SKIPIF-- -+ -+--ENV-- -+HTTP_RANGE=bytes=0-1 -+HTTP_IF_RANGE="abc" -+--FILE-- -+ -+--EXPECTF-- -+Status: 206%s -+X-Powered-By: %s -+Cache-Control: private, must-revalidate, max-age=0 -+ETag: "abc" -+Accept-Ranges: bytes -+Content-Range: bytes 0-1/%d -+Content-Length: 2 -+Content-type: text/html -+ -+ -+--ENV-- -+HTTP_RANGE=bytes=0-1 -+HTTP_IF_RANGE="abcd" -+--FILE-- -+ -+--EXPECTF-- -+X-Powered-By: %s -+Cache-Control: private, must-revalidate, max-age=0 -+ETag: "abc" -+Accept-Ranges: bytes -+Content-Length: %d -+Content-type: text/html -+ -+%a ---- /dev/null -+++ b/ext/http/tests/skip.inc -@@ -0,0 +1,15 @@ -+= v%s",$ver)); } -+function checkmax($ver) { skipif(version_compare(PHP_VERSION, $ver) > 0, sprintf("need PHP <= v%s",$ver)); } -+function checkurl($url) { skipif(!@fsockopen($url, 80), "$url not responsive"); } -+function checkcls($cls) { skipif(!class_exists($cls), "need class $cls"); } -+function checkver($ver) { checkmin($ver); } -+checkext('http'); -+?> ---- /dev/null -+++ b/ext/http/tests/stream_filters_001.phpt -@@ -0,0 +1,45 @@ -+--TEST-- -+stream filters -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+string(30) "5 -+Here -+2 -+we -+5 -+ go! -+ -+0 -+" -+string(12) "Here we go! -+" -+Done ---- /dev/null -+++ b/ext/http/tests/stream_filters_002.phpt -@@ -0,0 +1,50 @@ -+--TEST-- -+gzip stream filters -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+bool(true) -+bool(true) -+bool(true) -+Done ---- /dev/null -+++ b/ext/http/tests/stream_filters_003.phpt -@@ -0,0 +1,42 @@ -+--TEST-- -+stream filter fun -+--SKIPIF-- -+ -+--FILE-- -+ -+--EXPECTF-- -+%aTEST -+This is some stream filter fun; we'll see if it bails out or not. -+The text should come out at the other end of the stream exactly like written to it. -+Go figure! ---- /dev/null -+++ b/ext/http/tests/urls.txt -@@ -0,0 +1,49 @@ -+http://www.microsoft.com -+http://www.opensource.org -+http://www.google.com -+http://www.yahoo.com -+http://www.ibm.com -+http://www.mysql.com -+http://www.oracle.com -+http://www.ripe.net -+http://www.iana.org -+http://www.amazon.com -+http://www.netcraft.com -+http://www.heise.de -+http://www.chip.de -+http://www.ca.com -+http://www.cnet.com -+http://www.news.com -+http://www.cnn.com -+http://www.wikipedia.org -+http://www.dell.com -+http://www.hp.com -+http://www.cert.org -+http://www.mit.edu -+http://www.nist.gov -+http://www.ebay.com -+http://www.playstation.com -+http://www.uefa.com -+http://www.ieee.org -+http://www.apple.com -+http://www.sony.com -+http://www.symantec.com -+http://www.zdnet.com -+http://www.fujitsu.com -+http://www.supermicro.com -+http://www.hotmail.com -+http://www.ecma.com -+http://www.bbc.co.uk -+http://news.google.com -+http://www.foxnews.com -+http://www.msn.com -+http://www.wired.com -+http://www.sky.com -+http://www.usatoday.com -+http://www.cbs.com -+http://www.nbc.com -+http://slashdot.org -+http://www.bloglines.com -+http://www.techweb.com -+http://www.newslink.org -+http://www.un.org -\ No newline at end of file diff --git a/lang/php5/patches/100-fix_membar_producer_link_error_gcc41.patch b/lang/php5/patches/100-fix_membar_producer_link_error_gcc41.patch new file mode 100644 index 0000000000..7055373552 --- /dev/null +++ b/lang/php5/patches/100-fix_membar_producer_link_error_gcc41.patch @@ -0,0 +1,11 @@ +--- a/ext/standard/php_crypt_r.c ++++ b/ext/standard/php_crypt_r.c +@@ -94,7 +94,7 @@ + if (!initialized) { + #ifdef PHP_WIN32 + InterlockedIncrement(&initialized); +-#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 2)) ++#elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 1)) + __sync_fetch_and_add(&initialized, 1); + #elif defined(HAVE_ATOMIC_H) /* Solaris 10 defines atomic API within */ + membar_producer(); diff --git a/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch b/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch index 3e81dd6b92..b3f677f1a0 100644 --- a/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch +++ b/lang/php5/patches/101-fix_membar_producer_link_error_gcc3x.patch @@ -2,7 +2,7 @@ +++ b/ext/standard/php_crypt_r.c @@ -96,6 +96,8 @@ void _crypt_extended_init_r(void) InterlockedIncrement(&initialized); - #elif defined(HAVE_SYNC_FETCH_AND_ADD) + #elif (defined(__GNUC__) && (__GNUC__ >= 4 && __GNUC_MINOR__ >= 1)) __sync_fetch_and_add(&initialized, 1); +#elif (defined(__GNUC__) && (__GNUC__ == 3)) + initialized = 1; diff --git a/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch b/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch deleted file mode 100644 index 24a283a52a..0000000000 --- a/lang/php5/patches/102-debian_patches_use_embedded_timezonedb.patch +++ /dev/null @@ -1,655 +0,0 @@ - -Add support for use of the system timezone database, rather -than embedding a copy. Discussed upstream but was not desired. - -History: -r7: per Sean Finney's review: simpler lat/long rounding, - use stat() not access() to check existence of timezone, - improve comments throughout. -r6: fix fd leak in r5, fix country code/BC flag use in - timezone_identifiers_list() using system db, - fix use of PECL timezonedb to override system db, -r5: reverts addition of "System/Localtime" fake tzname. - updated for 5.3.0, parses zone.tab to pick up mapping between - timezone name, country code and long/lat coords -r4: added "System/Localtime" tzname which uses /etc/localtime -r3: fix a crash if /usr/share/zoneinfo doesn't exist (Raphael Geissert) -r2: add filesystem trawl to set up name alias index -r1: initial revision - ---- a/ext/date/lib/parse_tz.c -+++ b/ext/date/lib/parse_tz.c -@@ -20,6 +20,16 @@ - - #include "timelib.h" - -+#ifdef HAVE_SYSTEM_TZDATA -+#include -+#include -+#include -+#include -+#include -+ -+#include "php_scandir.h" -+#endif -+ - #include - - #ifdef HAVE_LOCALE_H -@@ -31,7 +41,12 @@ - #else - #include - #endif -+ -+#ifndef HAVE_SYSTEM_TZDATA - #include "timezonedb.h" -+#endif -+ -+#include - - #if (defined(__APPLE__) || defined(__APPLE_CC__)) && (defined(__BIG_ENDIAN__) || defined(__LITTLE_ENDIAN__)) - # if defined(__LITTLE_ENDIAN__) -@@ -51,6 +66,11 @@ - - static void read_preamble(const unsigned char **tzf, timelib_tzinfo *tz) - { -+ if (memcmp(tzf, "TZif", 4) == 0) { -+ *tzf += 20; -+ return; -+ } -+ - /* skip ID */ - *tzf += 4; - -@@ -256,7 +276,435 @@ void timelib_dump_tzinfo(timelib_tzinfo - } - } - --static int seek_to_tz_position(const unsigned char **tzf, char *timezone, const timelib_tzdb *tzdb) -+#ifdef HAVE_SYSTEM_TZDATA -+ -+#ifdef HAVE_SYSTEM_TZDATA_PREFIX -+#define ZONEINFO_PREFIX HAVE_SYSTEM_TZDATA_PREFIX -+#else -+#define ZONEINFO_PREFIX "/usr/share/zoneinfo" -+#endif -+ -+/* Hash table entry for the cache of the zone.tab mapping table. */ -+struct location_info { -+ char code[2]; /* Country code. */ -+ double latitude, longitude; -+ char name[64]; -+ char *comment; -+ struct location_info *next; -+}; -+ -+/* System timezone database pointer. */ -+static const timelib_tzdb *timezonedb_system = NULL; -+ -+/* Cache of zone.tab location data. */ -+static struct location_info **system_location_table; -+ -+/* Size of the zone.tab hash table; a random-ish prime big enough to -+ * prevent too many collisions. */ -+#define LOCINFO_HASH_SIZE (1021) -+ -+/* Hash function for indexing the location_info hash table. */ -+static uint32_t tz_hash(const char *str) -+{ -+ const unsigned char *p = (const unsigned char *)str; -+ uint32_t hash = 5381; -+ int c; -+ -+ while ((c = *p++) != '\0') { -+ hash = (hash << 5) ^ hash ^ c; -+ } -+ -+ return hash % LOCINFO_HASH_SIZE; -+} -+ -+/* Parse an ISO-6709 co-ordinate as used in zone.tab. Returns end of -+ * the parsed string on success, or NULL on parse error. On success, -+ * writes the parsed number to *result. */ -+static char *parse_iso6709(char *p, double *result) -+{ -+ double v, sign; -+ char *pend; -+ size_t len; -+ -+ if (*p == '+') -+ sign = 1.0; -+ else if (*p == '-') -+ sign = -1.0; -+ else -+ return NULL; -+ -+ p++; -+ for (pend = p; *pend >= '0' && *pend <= '9'; pend++) -+ ;; -+ -+ /* Annoying encoding used by zone.tab has no decimal point, so use -+ * the length to determine the format: -+ * -+ * 4 = DDMM -+ * 5 = DDDMM -+ * 6 = DDMMSS -+ * 7 = DDDMMSS -+ */ -+ len = pend - p; -+ if (len < 4 || len > 7) { -+ return NULL; -+ } -+ -+ /* p => [D]DD */ -+ v = (p[0] - '0') * 10.0 + (p[1] - '0'); -+ p += 2; -+ if (len == 5 || len == 7) -+ v = v * 10.0 + (*p++ - '0'); -+ /* p => MM[SS] */ -+ v += (10.0 * (p[0] - '0') -+ + p[1] - '0') / 60.0; -+ p += 2; -+ /* p => [SS] */ -+ if (len > 5) { -+ v += (10.0 * (p[0] - '0') -+ + p[1] - '0') / 3600.0; -+ p += 2; -+ } -+ -+ /* Round to five decimal place, not because it's a good idea, -+ * but, because the builtin data uses rounded data, so, match -+ * that. */ -+ *result = sign * (int)(v * 100000.0 + 0.5) / 100000.0; -+ -+ return p; -+} -+ -+/* This function parses the zone.tab file to build up the mapping of -+ * timezone to country code and geographic location, and returns a -+ * hash table. The hash table is indexed by the function: -+ * -+ * tz_hash(timezone-name) -+ */ -+static struct location_info **create_location_table(void) -+{ -+ struct location_info **li, *i; -+ char zone_tab[PATH_MAX]; -+ char line[512]; -+ FILE *fp; -+ -+ strncpy(zone_tab, ZONEINFO_PREFIX "/zone.tab", sizeof zone_tab); -+ -+ fp = fopen(zone_tab, "r"); -+ if (!fp) { -+ return NULL; -+ } -+ -+ li = calloc(LOCINFO_HASH_SIZE, sizeof *li); -+ -+ while (fgets(line, sizeof line, fp)) { -+ char *p = line, *code, *name, *comment; -+ uint32_t hash; -+ double latitude, longitude; -+ -+ while (isspace(*p)) -+ p++; -+ -+ if (*p == '#' || *p == '\0' || *p == '\n') -+ continue; -+ -+ if (!isalpha(p[0]) || !isalpha(p[1]) || p[2] != '\t') -+ continue; -+ -+ /* code => AA */ -+ code = p; -+ p[2] = 0; -+ p += 3; -+ -+ /* coords => [+-][D]DDMM[SS][+-][D]DDMM[SS] */ -+ p = parse_iso6709(p, &latitude); -+ if (!p) { -+ continue; -+ } -+ p = parse_iso6709(p, &longitude); -+ if (!p) { -+ continue; -+ } -+ -+ if (!p || *p != '\t') { -+ continue; -+ } -+ -+ /* name = string */ -+ name = ++p; -+ while (*p != '\t' && *p && *p != '\n') -+ p++; -+ -+ *p++ = '\0'; -+ -+ /* comment = string */ -+ comment = p; -+ while (*p != '\t' && *p && *p != '\n') -+ p++; -+ -+ if (*p == '\n' || *p == '\t') -+ *p = '\0'; -+ -+ hash = tz_hash(name); -+ i = malloc(sizeof *i); -+ memcpy(i->code, code, 2); -+ strncpy(i->name, name, sizeof i->name); -+ i->comment = strdup(comment); -+ i->longitude = longitude; -+ i->latitude = latitude; -+ i->next = li[hash]; -+ li[hash] = i; -+ /* printf("%s [%u, %f, %f]\n", name, hash, latitude, longitude); */ -+ } -+ -+ fclose(fp); -+ -+ return li; -+} -+ -+/* Return location info from hash table, using given timezone name. -+ * Returns NULL if the name could not be found. */ -+const struct location_info *find_zone_info(struct location_info **li, -+ const char *name) -+{ -+ uint32_t hash = tz_hash(name); -+ const struct location_info *l; -+ -+ if (!li) { -+ return NULL; -+ } -+ -+ for (l = li[hash]; l; l = l->next) { -+ if (strcasecmp(l->name, name) == 0) -+ return l; -+ } -+ -+ return NULL; -+} -+ -+/* Filter out some non-tzdata files and the posix/right databases, if -+ * present. */ -+static int index_filter(const struct dirent *ent) -+{ -+ return strcmp(ent->d_name, ".") != 0 -+ && strcmp(ent->d_name, "..") != 0 -+ && strcmp(ent->d_name, "posix") != 0 -+ && strcmp(ent->d_name, "posixrules") != 0 -+ && strcmp(ent->d_name, "right") != 0 -+ && strstr(ent->d_name, ".tab") == NULL; -+} -+ -+/* Comparison callback for qsort(), used to alpha-sort the index -+ * array by timezone name. */ -+static int sysdbcmp(const void *first, const void *second) -+{ -+ const timelib_tzdb_index_entry *alpha = first, *beta = second; -+ -+ return strcmp(alpha->id, beta->id); -+} -+ -+ -+/* Create the zone identifier index by trawling the filesystem. */ -+static void create_zone_index(timelib_tzdb *db) -+{ -+ size_t dirstack_size, dirstack_top; -+ size_t index_size, index_next; -+ timelib_tzdb_index_entry *db_index; -+ char **dirstack; -+ -+ /* LIFO stack to hold directory entries to scan; each slot is a -+ * directory name relative to the zoneinfo prefix. */ -+ dirstack_size = 32; -+ dirstack = malloc(dirstack_size * sizeof *dirstack); -+ dirstack_top = 1; -+ dirstack[0] = strdup(""); -+ -+ /* Index array. */ -+ index_size = 64; -+ db_index = malloc(index_size * sizeof *db_index); -+ index_next = 0; -+ -+ do { -+ struct dirent **ents; -+ char name[PATH_MAX], *top; -+ int count; -+ -+ /* Pop the top stack entry, and iterate through its contents. */ -+ top = dirstack[--dirstack_top]; -+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s", top); -+ -+ count = php_scandir(name, &ents, index_filter, php_alphasort); -+ -+ while (count > 0) { -+ struct stat st; -+ const char *leaf = ents[count - 1]->d_name; -+ -+ snprintf(name, sizeof name, ZONEINFO_PREFIX "/%s/%s", -+ top, leaf); -+ -+ if (strlen(name) && stat(name, &st) == 0) { -+ /* Name, relative to the zoneinfo prefix. */ -+ const char *root = top; -+ -+ if (root[0] == '/') root++; -+ -+ snprintf(name, sizeof name, "%s%s%s", root, -+ *root ? "/": "", leaf); -+ -+ if (S_ISDIR(st.st_mode)) { -+ if (dirstack_top == dirstack_size) { -+ dirstack_size *= 2; -+ dirstack = realloc(dirstack, -+ dirstack_size * sizeof *dirstack); -+ } -+ dirstack[dirstack_top++] = strdup(name); -+ } -+ else { -+ if (index_next == index_size) { -+ index_size *= 2; -+ db_index = realloc(db_index, -+ index_size * sizeof *db_index); -+ } -+ -+ db_index[index_next++].id = strdup(name); -+ } -+ } -+ -+ free(ents[--count]); -+ } -+ -+ if (count != -1) free(ents); -+ free(top); -+ } while (dirstack_top); -+ -+ /* Alpha-sort the index array; shouldn't be technically necessary -+ * but some of the test cases rely on this, and, it matches the -+ * builtin database. */ -+ qsort(db_index, index_next, sizeof *db_index, sysdbcmp); -+ -+ db->index = db_index; -+ db->index_size = index_next; -+ -+ free(dirstack); -+} -+ -+#define FAKE_HEADER "1234\0??\1??" -+#define FAKE_BC_POS (0) -+#define FAKE_UTC_POS (7 - 4) -+ -+/* Create a fake data segment for database 'sysdb'. This mocks -+ * up a fake ->data segment for the given timezone database. -+ * php_date.c::timezone_identifiers_list() looks at data[pos + 4] -+ * through data[pos + 6] to compare the country code and BC flag, -+ * which are stored in the builtin data array like: -+ * -+ * (pos + 4) => BC flag -+ * (pos + 5, pos + 6) => Two chars of country code -+ * -+ * where pos is the index corresponding to the timezone name. -+ * -+ * Timezone names are classified here into three types: -+ * 1) UTC, which is special -+ * 2) "normal" zone names -+ * 3) "backwards-compat" zone names -+ * -+ * (boolean logic of the BC flag seems to be inverted, but hey) -+ * -+ * UTC is special since it has BC=\1, code = "??" -+ * "normal" zones exist in zone.tab and have the given c-code and BC=\1 -+ * "backwards-compat" zones don't exist in zone.tab and have BC=\0 -+ * -+ * Since UTC and the BC zones are constant, they are encoded in the -+ * FAKE_HEADER prefix, and pos pointers index into that. -+ * -+ * FAKE_HEADER is hence four random bytes, then the BC zone segment -+ * (three bytes), then the UTC zone segment (another three). -+ * -+ * For all "normal" zones, three bytes are appended to the data array; -+ * the BC flag, always 1, and the two bytes of country code. -+ */ -+static void fake_data_segment(timelib_tzdb *sysdb, -+ struct location_info **info) -+{ -+ size_t n; -+ char *data, *p; -+ -+ /* Worst case maximum is 3 bytes per zone, plus the header. */ -+ data = malloc((3 * sysdb->index_size) + sizeof(FAKE_HEADER) - 1); -+ -+ /* Append the fake header, p then = next byte */ -+ p = mempcpy(data, FAKE_HEADER, sizeof(FAKE_HEADER) - 1); -+ -+ for (n = 0; n < sysdb->index_size; n++) { -+ const struct location_info *li; -+ timelib_tzdb_index_entry *ent; -+ -+ /* Lost const'ness since we're modifying the pos pointer. */ -+ ent = (timelib_tzdb_index_entry *)&sysdb->index[n]; -+ -+ /* Lookup the timezone name in the hash table. */ -+ if (strcmp(ent->id, "UTC") == 0) { -+ ent->pos = FAKE_UTC_POS; -+ continue; -+ } -+ -+ li = find_zone_info(info, ent->id); -+ if (li) { -+ /* If found, append the BC byte and the country code; set -+ * the position index for the timezone to point to -+ * this. */ -+ ent->pos = (p - data) - 4; -+ *p++ = '\x01'; -+ *p++ = li->code[0]; -+ *p++ = li->code[1]; -+ } -+ else { -+ /* If not found, the timezone data can -+ * point at the header. */ -+ ent->pos = 0; -+ } -+ } -+ -+ /* Store the fake data array */ -+ sysdb->data = (unsigned char *)data; -+} -+ -+/* Evaluates to true if given timezone name is valid. */ -+#define is_valid_tz_name(tz_) (tz_[0] && strstr(tz_, "..") == NULL) -+ -+/* Return the mmap()ed tzfile if found, else NULL. On success, the -+ * length of the mapped data is placed in *length. */ -+static char *map_tzfile(const char *timezone, size_t *length) -+{ -+ char fname[PATH_MAX]; -+ struct stat st; -+ char *p; -+ int fd; -+ -+ if (!is_valid_tz_name(timezone)) { -+ return NULL; -+ } -+ -+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone); -+ -+ fd = open(fname, O_RDONLY); -+ if (fd == -1) { -+ return NULL; -+ } else if (fstat(fd, &st) != 0 || st.st_size < 21) { -+ close(fd); -+ return NULL; -+ } -+ -+ *length = st.st_size; -+ p = mmap(NULL, st.st_size, PROT_READ, MAP_SHARED, fd, 0); -+ close(fd); -+ -+ return p != MAP_FAILED ? p : NULL; -+} -+#endif -+ -+/* seek_to_tz_position() for a builtin/external database. */ -+static int inmem_seek_to_tz_position(const unsigned char **tzf, -+ char *timezone, const timelib_tzdb *tzdb) - { - int left = 0, right = tzdb->index_size - 1; - #ifdef HAVE_SETLOCALE -@@ -295,36 +743,131 @@ static int seek_to_tz_position(const uns - return 0; - } - -+/* Modified seek_to_tz_position wrapper which handles the system -+ * database and the builtin/external databases in the same way. -+ * Returns zero on failure on non-zero on success. On success, (*map, -+ * *maplen) is an mmap'ed region if *map is non-NULL, and must be -+ * munmaped after use. */ -+static int seek_to_tz_position(const unsigned char **tzf, char *timezone, -+ char **map, size_t *maplen, -+ const timelib_tzdb *tzdb) -+{ -+#ifdef HAVE_SYSTEM_TZDATA -+ if (tzdb == timezonedb_system) { -+ char *orig; -+ -+ orig = map_tzfile(timezone, maplen); -+ if (orig == NULL) { -+ return 0; -+ } -+ -+ (*tzf) = (unsigned char *)orig ; -+ *map = orig; -+ -+ return 1; -+ } -+ else -+#endif -+ { -+ return inmem_seek_to_tz_position(tzf, timezone, tzdb); -+ } -+} -+ - const timelib_tzdb *timelib_builtin_db(void) - { -+#ifdef HAVE_SYSTEM_TZDATA -+ if (timezonedb_system == NULL) { -+ timelib_tzdb *tmp = malloc(sizeof *tmp); -+ -+ tmp->version = "0.system"; -+ tmp->data = NULL; -+ create_zone_index(tmp); -+ system_location_table = create_location_table(); -+ fake_data_segment(tmp, system_location_table); -+ timezonedb_system = tmp; -+ } -+ -+ return timezonedb_system; -+#else - return &timezonedb_builtin; -+#endif - } - - const timelib_tzdb_index_entry *timelib_timezone_builtin_identifiers_list(int *count) - { -+#ifdef HAVE_SYSTEM_TZDATA -+ *count = timezonedb_system->index_size; -+ return timezonedb_system->index; -+#else - *count = sizeof(timezonedb_idx_builtin) / sizeof(*timezonedb_idx_builtin); - return timezonedb_idx_builtin; -+#endif - } - - int timelib_timezone_id_is_valid(char *timezone, const timelib_tzdb *tzdb) - { - const unsigned char *tzf; -- return (seek_to_tz_position(&tzf, timezone, tzdb)); -+ -+#ifdef HAVE_SYSTEM_TZDATA -+ if (tzdb == timezonedb_system) { -+ char fname[PATH_MAX]; -+ struct stat st; -+ -+ if (!is_valid_tz_name(timezone)) { -+ return 0; -+ } -+ -+ snprintf(fname, sizeof fname, ZONEINFO_PREFIX "/%s", timezone); -+ -+ return stat(fname, &st) == 0 && S_ISREG(st.st_mode); -+ } -+#endif -+ -+ return (inmem_seek_to_tz_position(&tzf, timezone, tzdb)); - } - - timelib_tzinfo *timelib_parse_tzfile(char *timezone, const timelib_tzdb *tzdb) - { - const unsigned char *tzf; -+ char *memmap = NULL; -+ size_t maplen; - timelib_tzinfo *tmp; - -- if (seek_to_tz_position(&tzf, timezone, tzdb)) { -+ if (seek_to_tz_position(&tzf, timezone, &memmap, &maplen, tzdb)) { - tmp = timelib_tzinfo_ctor(timezone); - - read_preamble(&tzf, tmp); - read_header(&tzf, tmp); - read_transistions(&tzf, tmp); - read_types(&tzf, tmp); -- read_location(&tzf, tmp); -+ -+#ifdef HAVE_SYSTEM_TZDATA -+ if (memmap) { -+ const struct location_info *li; -+ -+ /* TZif-style - grok the location info from the system database, -+ * if possible. */ -+ if ((li = find_zone_info(system_location_table, timezone)) != NULL) { -+ tmp->location.comments = strdup(li->comment); -+ strncpy(tmp->location.country_code, li->code, 2); -+ tmp->location.longitude = li->longitude; -+ tmp->location.latitude = li->latitude; -+ tmp->bc = 1; -+ } -+ else { -+ strcpy(tmp->location.country_code, "??"); -+ tmp->bc = 0; -+ tmp->location.comments = strdup(""); -+ } -+ -+ /* Now done with the mmap segment - discard it. */ -+ munmap(memmap, maplen); -+ } else -+#endif -+ { -+ /* PHP-style - use the embedded info. */ -+ read_location(&tzf, tmp); -+ } - } else { - tmp = NULL; - } ---- a/ext/date/lib/timelib.m4 -+++ b/ext/date/lib/timelib.m4 -@@ -78,3 +78,17 @@ stdlib.h - - dnl Check for strtoll, atoll - AC_CHECK_FUNCS(strtoll atoll strftime) -+ -+PHP_ARG_WITH(system-tzdata, for use of system timezone data, -+[ --with-system-tzdata[=DIR] to specify use of system timezone data], -+no, no) -+ -+if test "$PHP_SYSTEM_TZDATA" != "no"; then -+ AC_DEFINE(HAVE_SYSTEM_TZDATA, 1, [Define if system timezone data is used]) -+ -+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then -+ AC_DEFINE_UNQUOTED(HAVE_SYSTEM_TZDATA_PREFIX, "$PHP_SYSTEM_TZDATA", -+ [Define for location of system timezone data]) -+ fi -+fi -+ diff --git a/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch b/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch deleted file mode 100644 index 8180f60582..0000000000 --- a/lang/php5/patches/103-debian_patches_use_embedded_timezonedb.patch +++ /dev/null @@ -1,64 +0,0 @@ -Author: Sean Finney -Forwarded: no (upstream doesn't want it) -Description: Silence warnings about using the default system timezone info - In vanilla upstream php, this is considered an error (i.e. the user must - set the timezone explicitly), though with our use of the system timezonedb - patch, we actually feel quite comfortable using the default timezone info. -Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=571762 ---- a/ext/date/php_date.c -+++ b/ext/date/php_date.c -@@ -886,7 +886,7 @@ static char* guess_timezone(const timeli - tzid = "UTC"; - } - -- php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected '%s' for '%s/%.1f/%s' instead", tzid, ta ? ta->tm_zone : "Unknown", ta ? (float) (ta->tm_gmtoff / 3600) : 0, ta ? (ta->tm_isdst ? "DST" : "no DST") : "Unknown"); -+ // php_error_docref(NULL TSRMLS_CC, E_WARNING, DATE_TZ_ERRMSG "We selected '%s' for '%s/%.1f/%s' instead", tzid, ta ? ta->tm_zone : "Unknown", ta ? (float) (ta->tm_gmtoff / 3600) : 0, ta ? (ta->tm_isdst ? "DST" : "no DST") : "Unknown"); - return tzid; - } - #endif ---- a/ext/date/tests/date_default_timezone_get-1.phpt -+++ /dev/null -@@ -1,16 +0,0 @@ ----TEST-- --date_default_timezone_get() function [1] ----INI-- --date.timezone= ----FILE-- -- ----EXPECTF-- --Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 3 --UTC -- --Warning: date(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-1.php on line 4 --UTC ---- a/ext/date/tests/date_default_timezone_get-2.phpt -+++ /dev/null -@@ -1,12 +0,0 @@ ----TEST-- --date_default_timezone_get() function [2] ----INI-- --date.timezone= ----FILE-- -- ----EXPECTF-- --Warning: date_default_timezone_get(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_get-2.php on line 3 --UTC ---- a/ext/date/tests/date_default_timezone_set-1.phpt -+++ b/ext/date/tests/date_default_timezone_set-1.phpt -@@ -22,9 +22,6 @@ date.timezone= - echo date(DATE_ISO8601, $date4), "\n"; - ?> - --EXPECTF-- --Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 3 -- --Warning: strtotime(): It is not safe to rely on the system's timezone settings. You are *required* to use the date.timezone setting or the date_default_timezone_set() function. In case you used any of those methods and you are still getting this warning, you most likely misspelled the timezone identifier. We selected 'UTC' for 'UTC/0.0/no DST' instead in %sdate_default_timezone_set-1.php on line 4 - America/Indiana/Knox - 2005-01-12T03:00:00-0500 - 2005-07-12T03:00:00-0500 diff --git a/lang/php5/patches/900-prevent_buildconf_force.patch b/lang/php5/patches/900-prevent_buildconf_force.patch index 3dd0503e6f..52cb8fdc9f 100644 --- a/lang/php5/patches/900-prevent_buildconf_force.patch +++ b/lang/php5/patches/900-prevent_buildconf_force.patch @@ -1,15 +1,6 @@ --- a/configure +++ b/configure -@@ -826,6 +826,8 @@ ac_help="$ac_help - --disable-all Disable all extensions which are enabled by default - " - ac_help="$ac_help -+ --with-system-tzdata[=DIR] to specify use of system timezone data" -+ac_help="$ac_help - --with-regex=TYPE regex library type: system, php. [TYPE=php] - WARNING: Do NOT use unless you know what you are doing!" - ac_help="$ac_help -@@ -847,6 +849,30 @@ ac_help="$ac_help +@@ -847,6 +847,30 @@ ac_help="$ac_help --with-zlib-dir= Define the location of zlib install directory" ac_help="$ac_help @@ -40,5460 +31,5030 @@ --enable-bcmath Enable bc style precision math functions" ac_help="$ac_help --with-bz2[=DIR] Include BZip2 support" -@@ -884,6 +910,8 @@ ac_help="$ac_help - ac_help="$ac_help - --disable-flatfile DBA: FlatFile support (bundled)" - ac_help="$ac_help -+ --enable-dio Enable direct I/O support" -+ac_help="$ac_help - --disable-dom Disable DOM support" - ac_help="$ac_help - --with-libxml-dir[=DIR] DOM: libxml2 install prefix" -@@ -951,6 +979,8 @@ ac_help="$ac_help - ac_help="$ac_help - --with-ldap-sasl[=DIR] LDAP: Include Cyrus SASL support" - ac_help="$ac_help -+ --with-libevent Include libevent support" -+ac_help="$ac_help - --enable-mbstring Enable multibyte string support" - ac_help="$ac_help - --disable-mbregex MBSTRING: Disable multibyte regex support" -@@ -1167,6 +1197,24 @@ ac_help="$ac_help - ac_help="$ac_help - --with-pcre-dir ZIP: pcre install prefix" - ac_help="$ac_help -+ --enable-http Enable extended HTTP support" -+ac_help="$ac_help -+ --with-http-shared-deps -+ HTTP: disable to not depend on extensions like hash, -+ iconv and session (when built shared)" -+ac_help="$ac_help -+ --with-http-curl-requests[=LIBCURLDIR] -+ HTTP: with cURL request support" -+ac_help="$ac_help -+ --with-http-curl-libevent[=LIBEVENTDIR] -+ HTTP: libevent install directory" -+ac_help="$ac_help -+ --with-http-zlib-compression[=LIBZDIR] -+ HTTP: with zlib encodings support" -+ac_help="$ac_help -+ --with-http-magic-mime[=LIBMAGICDIR] -+ HTTP: with magic mime response content type guessing" -+ac_help="$ac_help - --enable-mysqlnd Enable mysqlnd expliciely, will be done implicitly - when required by other extensions" - ac_help="$ac_help -@@ -1893,12 +1941,12 @@ fi +@@ -1888,12 +1912,12 @@ echo $ac_n "checking for Cygwin environment""... $ac_c" 1>&6 --echo "configure:1897: checking for Cygwin environment" >&5 -+echo "configure:1945: checking for Cygwin environment" >&5 +-echo "configure:1892: checking for Cygwin environment" >&5 ++echo "configure:1916: checking for Cygwin environment" >&5 if eval "test \"`echo '$''{'ac_cv_cygwin'+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:1961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_cygwin=yes else -@@ -1926,19 +1974,19 @@ echo "$ac_t""$ac_cv_cygwin" 1>&6 +@@ -1921,19 +1945,19 @@ CYGWIN= test "$ac_cv_cygwin" = yes && CYGWIN=yes echo $ac_n "checking for mingw32 environment""... $ac_c" 1>&6 --echo "configure:1930: checking for mingw32 environment" >&5 -+echo "configure:1978: checking for mingw32 environment" >&5 +-echo "configure:1925: checking for mingw32 environment" >&5 ++echo "configure:1949: checking for mingw32 environment" >&5 if eval "test \"`echo '$''{'ac_cv_mingw32'+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:1990: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:1937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:1961: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_mingw32=yes else -@@ -1957,7 +2005,7 @@ test "$ac_cv_mingw32" = yes && MINGW32=y +@@ -1952,7 +1976,7 @@ echo $ac_n "checking for egrep""... $ac_c" 1>&6 --echo "configure:1961: checking for egrep" >&5 -+echo "configure:2009: checking for egrep" >&5 +-echo "configure:1956: checking for egrep" >&5 ++echo "configure:1980: checking for egrep" >&5 if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -1972,7 +2020,7 @@ echo "$ac_t""$ac_cv_prog_egrep" 1>&6 +@@ -1967,7 +1991,7 @@ echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6 --echo "configure:1976: checking for a sed that does not truncate output" >&5 -+echo "configure:2024: checking for a sed that does not truncate output" >&5 +-echo "configure:1971: checking for a sed that does not truncate output" >&5 ++echo "configure:1995: checking for a sed that does not truncate output" >&5 if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2122,7 +2170,7 @@ else { echo "configure: error: can not r +@@ -2117,7 +2141,7 @@ fi echo $ac_n "checking host system type""... $ac_c" 1>&6 --echo "configure:2126: checking host system type" >&5 -+echo "configure:2174: checking host system type" >&5 +-echo "configure:2121: checking host system type" >&5 ++echo "configure:2145: checking host system type" >&5 host_alias=$host case "$host_alias" in -@@ -2143,7 +2191,7 @@ host_os=`echo $host | sed 's/^\([^-]*\)- +@@ -2138,7 +2162,7 @@ echo "$ac_t""$host" 1>&6 echo $ac_n "checking target system type""... $ac_c" 1>&6 --echo "configure:2147: checking target system type" >&5 -+echo "configure:2195: checking target system type" >&5 +-echo "configure:2142: checking target system type" >&5 ++echo "configure:2166: checking target system type" >&5 target_alias=$target case "$target_alias" in -@@ -2255,7 +2303,7 @@ rm -f libs/* +@@ -2250,7 +2274,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:2259: checking for $ac_word" >&5 -+echo "configure:2307: checking for $ac_word" >&5 +-echo "configure:2254: checking for $ac_word" >&5 ++echo "configure:2278: 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 -@@ -2285,7 +2333,7 @@ if test -z "$CC"; then +@@ -2280,7 +2304,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:2289: checking for $ac_word" >&5 -+echo "configure:2337: checking for $ac_word" >&5 +-echo "configure:2284: checking for $ac_word" >&5 ++echo "configure:2308: 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 -@@ -2336,7 +2384,7 @@ fi +@@ -2331,7 +2355,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:2340: checking for $ac_word" >&5 -+echo "configure:2388: checking for $ac_word" >&5 +-echo "configure:2335: checking for $ac_word" >&5 ++echo "configure:2359: 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 -@@ -2368,7 +2416,7 @@ fi +@@ -2363,7 +2387,7 @@ fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:2372: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 -+echo "configure:2420: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +-echo "configure:2367: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ++echo "configure:2391: 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. -@@ -2379,12 +2427,12 @@ cross_compiling=$ac_cv_prog_cc_cross +@@ -2374,12 +2398,12 @@ cat > conftest.$ac_ext << EOF --#line 2383 "configure" -+#line 2431 "configure" +-#line 2378 "configure" ++#line 2402 "configure" #include "confdefs.h" main(){return(0);} EOF --if { (eval echo configure:2388: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:2383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2407: \"$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 -@@ -2410,12 +2458,12 @@ if test $ac_cv_prog_cc_works = no; then +@@ -2405,12 +2429,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:2414: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:2462: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +-echo "configure:2409: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:2433: 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:2419: checking whether we are using GNU C" >&5 -+echo "configure:2467: checking whether we are using GNU C" >&5 +-echo "configure:2414: checking whether we are using GNU C" >&5 ++echo "configure:2438: 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 -@@ -2424,7 +2472,7 @@ else +@@ -2419,7 +2443,7 @@ yes; #endif EOF --if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2428: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then -+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2476: \"$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:2423: \"$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:2447: \"$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 -@@ -2443,7 +2491,7 @@ ac_test_CFLAGS="${CFLAGS+set}" +@@ -2438,7 +2462,7 @@ ac_save_CFLAGS="$CFLAGS" CFLAGS= echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 --echo "configure:2447: checking whether ${CC-cc} accepts -g" >&5 -+echo "configure:2495: checking whether ${CC-cc} accepts -g" >&5 +-echo "configure:2442: checking whether ${CC-cc} accepts -g" >&5 ++echo "configure:2466: 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 -@@ -2475,7 +2523,7 @@ else +@@ -2470,7 +2494,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:2479: checking how to run the C preprocessor" >&5 -+echo "configure:2527: checking how to run the C preprocessor" >&5 +-echo "configure:2474: checking how to run the C preprocessor" >&5 ++echo "configure:2498: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -2490,13 +2538,13 @@ else +@@ -2485,13 +2509,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:2500: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2548: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2519: \"$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 : -@@ -2507,13 +2555,13 @@ else +@@ -2502,13 +2526,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:2517: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2565: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2512: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2536: \"$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 : -@@ -2524,13 +2572,13 @@ else +@@ -2519,13 +2543,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:2534: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2582: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2529: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2553: \"$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 : -@@ -2557,9 +2605,9 @@ echo "$ac_t""$CPP" 1>&6 +@@ -2552,9 +2576,9 @@ ICC="no" echo $ac_n "checking for icc""... $ac_c" 1>&6 --echo "configure:2561: checking for icc" >&5 -+echo "configure:2609: checking for icc" >&5 +-echo "configure:2556: checking for icc" >&5 ++echo "configure:2580: checking for icc" >&5 cat > conftest.$ac_ext <&6 --echo "configure:2585: checking for suncc" >&5 -+echo "configure:2633: checking for suncc" >&5 +-echo "configure:2580: checking for suncc" >&5 ++echo "configure:2604: checking for suncc" >&5 cat > conftest.$ac_ext <&6 --echo "configure:2610: checking whether $CC and cc understand -c and -o together" >&5 -+echo "configure:2658: checking whether $CC and cc understand -c and -o together" >&5 +-echo "configure:2605: checking whether $CC and cc understand -c and -o together" >&5 ++echo "configure:2629: 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:2613: checking whether cc understands -c and -o together" >&5 -+echo "configure:2661: checking whether cc understands -c and -o together" >&5 +-echo "configure:2608: checking whether cc understands -c and -o together" >&5 ++echo "configure:2632: 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]/_/'`" -@@ -2621,16 +2669,16 @@ else +@@ -2616,16 +2640,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:2625: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+if { (eval echo configure:2673: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:2674: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +-if { (eval echo configure:2620: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:2621: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++if { (eval echo configure:2644: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:2645: \"$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:2631: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then -+ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2679: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then +- if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2626: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; }; then ++ if { ac_try='cc -c conftest.c 1>&5'; { (eval echo configure:2650: \"$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:2633: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -- test -f conftest.o && { (eval echo configure:2634: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; -+ if { (eval echo configure:2681: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && -+ test -f conftest.o && { (eval echo configure:2682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; +- if { (eval echo configure:2628: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && +- test -f conftest.o && { (eval echo configure:2629: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; ++ if { (eval echo configure:2652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } && ++ test -f conftest.o && { (eval echo configure:2653: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; then # cc works too. : -@@ -2657,7 +2705,7 @@ EOF +@@ -2652,7 +2676,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:2661: checking how to run the C preprocessor" >&5 -+echo "configure:2709: checking how to run the C preprocessor" >&5 +-echo "configure:2656: checking how to run the C preprocessor" >&5 ++echo "configure:2680: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= -@@ -2672,13 +2720,13 @@ else +@@ -2667,13 +2691,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:2682: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2677: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2701: \"$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 : -@@ -2689,13 +2737,13 @@ else +@@ -2684,13 +2708,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:2699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2694: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2718: \"$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 : -@@ -2706,13 +2754,13 @@ else +@@ -2701,13 +2725,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:2716: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:2764: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:2711: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:2735: \"$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 : -@@ -2737,9 +2785,9 @@ fi +@@ -2732,9 +2756,9 @@ echo "$ac_t""$CPP" 1>&6 echo $ac_n "checking for AIX""... $ac_c" 1>&6 --echo "configure:2741: checking for AIX" >&5 -+echo "configure:2789: checking for AIX" >&5 +-echo "configure:2736: checking for AIX" >&5 ++echo "configure:2760: checking for AIX" >&5 cat > conftest.$ac_ext <&6 --echo "configure:2765: checking whether ln -s works" >&5 -+echo "configure:2813: checking whether ln -s works" >&5 +-echo "configure:2760: checking whether ln -s works" >&5 ++echo "configure:2784: 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 -@@ -2786,7 +2834,7 @@ fi +@@ -2781,7 +2805,7 @@ php_with_libdir=lib echo $ac_n "checking for system library directory""... $ac_c" 1>&6 --echo "configure:2790: checking for system library directory" >&5 -+echo "configure:2838: checking for system library directory" >&5 +-echo "configure:2785: checking for system library directory" >&5 ++echo "configure:2809: checking for system library directory" >&5 # Check whether --with-libdir or --without-libdir was given. if test "${with_libdir+set}" = set; then withval="$with_libdir" -@@ -2809,7 +2857,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -2804,7 +2828,7 @@ php_enable_rpath=yes echo $ac_n "checking whether to enable runpaths""... $ac_c" 1>&6 --echo "configure:2813: checking whether to enable runpaths" >&5 -+echo "configure:2861: checking whether to enable runpaths" >&5 +-echo "configure:2808: checking whether to enable runpaths" >&5 ++echo "configure:2832: 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" -@@ -2830,7 +2878,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -2825,7 +2849,7 @@ echo $ac_n "checking if compiler supports -R""... $ac_c" 1>&6 --echo "configure:2834: checking if compiler supports -R" >&5 -+echo "configure:2882: checking if compiler supports -R" >&5 +-echo "configure:2829: checking if compiler supports -R" >&5 ++echo "configure:2853: checking if compiler supports -R" >&5 if eval "test \"`echo '$''{'php_cv_cc_dashr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -2838,14 +2886,14 @@ else +@@ -2833,14 +2857,14 @@ SAVE_LIBS=$LIBS LIBS="-R /usr/$PHP_LIBDIR $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:2844: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_dashr=yes else -@@ -2863,7 +2911,7 @@ if test $php_cv_cc_dashr = "yes"; then +@@ -2858,7 +2882,7 @@ ld_runpath_switch=-R else echo $ac_n "checking if compiler supports -Wl,-rpath,""... $ac_c" 1>&6 --echo "configure:2867: checking if compiler supports -Wl,-rpath," >&5 -+echo "configure:2915: checking if compiler supports -Wl,-rpath," >&5 +-echo "configure:2862: checking if compiler supports -Wl,-rpath," >&5 ++echo "configure:2886: checking if 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 -@@ -2871,14 +2919,14 @@ else +@@ -2866,14 +2890,14 @@ SAVE_LIBS=$LIBS LIBS="-Wl,-rpath,/usr/$PHP_LIBDIR $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:2930: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:2877: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:2901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* php_cv_cc_rpath=yes else -@@ -2909,7 +2957,7 @@ do +@@ -2904,7 +2928,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:2913: checking for $ac_word" >&5 -+echo "configure:2961: checking for $ac_word" >&5 +-echo "configure:2908: checking for $ac_word" >&5 ++echo "configure:2932: 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 -@@ -2950,7 +2998,7 @@ test -n "$AWK" || AWK="bork" +@@ -2945,7 +2969,7 @@ ;; *) echo $ac_n "checking if $AWK is broken""... $ac_c" 1>&6 --echo "configure:2954: checking if $AWK is broken" >&5 -+echo "configure:3002: checking if $AWK is broken" >&5 +-echo "configure:2949: checking if $AWK is broken" >&5 ++echo "configure:2973: checking if $AWK is broken" >&5 if ! $AWK 'function foo() {}' >/dev/null 2>&1 ; then echo "$ac_t""yes" 1>&6 { echo "configure: error: You should install GNU awk" 1>&2; exit 1; } -@@ -2969,7 +3017,7 @@ do +@@ -2964,7 +2988,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:2973: checking for $ac_word" >&5 -+echo "configure:3021: checking for $ac_word" >&5 +-echo "configure:2968: checking for $ac_word" >&5 ++echo "configure:2992: 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 -@@ -3009,7 +3057,7 @@ test -n "$YACC" || YACC="yacc" +@@ -3004,7 +3028,7 @@ bison_version=none if test "$YACC"; then echo $ac_n "checking for bison version""... $ac_c" 1>&6 --echo "configure:3013: checking for bison version" >&5 -+echo "configure:3061: checking for bison version" >&5 +-echo "configure:3008: checking for bison version" >&5 ++echo "configure:3032: checking for bison version" >&5 if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3047,7 +3095,7 @@ echo "$ac_t""$php_cv_bison_version" 1>&6 +@@ -3042,7 +3066,7 @@ # Extract the first word of "re2c", so it can be a program name with args. set dummy re2c; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:3051: checking for $ac_word" >&5 -+echo "configure:3099: checking for $ac_word" >&5 +-echo "configure:3046: checking for $ac_word" >&5 ++echo "configure:3070: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RE2C'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3075,7 +3123,7 @@ fi +@@ -3070,7 +3094,7 @@ if test -n "$RE2C"; then echo $ac_n "checking for re2c version""... $ac_c" 1>&6 --echo "configure:3079: checking for re2c version" >&5 -+echo "configure:3127: checking for re2c version" >&5 +-echo "configure:3074: checking for re2c version" >&5 ++echo "configure:3098: checking for re2c version" >&5 if eval "test \"`echo '$''{'php_cv_re2c_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3114,7 +3162,7 @@ esac +@@ -3109,7 +3133,7 @@ php_enable_re2c_cgoto=no echo $ac_n "checking whether to enable computed goto gcc extension with re2c""... $ac_c" 1>&6 --echo "configure:3118: checking whether to enable computed goto gcc extension with re2c" >&5 -+echo "configure:3166: checking whether to enable computed goto gcc extension with re2c" >&5 +-echo "configure:3113: checking whether to enable computed goto gcc extension with re2c" >&5 ++echo "configure:3137: checking whether to enable computed goto gcc extension with re2c" >&5 # Check whether --enable-re2c-cgoto or --disable-re2c-cgoto was given. if test "${enable_re2c_cgoto+set}" = set; then enableval="$enable_re2c_cgoto" -@@ -3137,9 +3185,9 @@ if test "$PHP_RE2C_CGOTO" = "no"; then +@@ -3132,9 +3156,9 @@ RE2C_FLAGS="" else echo $ac_n "checking whether re2c -g works""... $ac_c" 1>&6 --echo "configure:3141: checking whether re2c -g works" >&5 -+echo "configure:3189: checking whether re2c -g works" >&5 +-echo "configure:3136: checking whether re2c -g works" >&5 ++echo "configure:3160: checking whether re2c -g works" >&5 cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:3209: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:3156: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:3180: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* RE2C_FLAGS="" -@@ -3223,7 +3271,7 @@ case $host_alias in +@@ -3218,7 +3242,7 @@ gcc_arg_name=ac_cv_gcc_arg_no_cpp_precomp echo $ac_n "checking whether $CC supports -no-cpp-precomp""... $ac_c" 1>&6 --echo "configure:3227: checking whether $CC supports -no-cpp-precomp" >&5 -+echo "configure:3275: checking whether $CC supports -no-cpp-precomp" >&5 +-echo "configure:3222: checking whether $CC supports -no-cpp-precomp" >&5 ++echo "configure:3246: checking whether $CC supports -no-cpp-precomp" >&5 if eval "test \"`echo '$''{'ac_cv_gcc_arg_no_cpp_precomp'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -3424,7 +3472,7 @@ esac +@@ -3419,7 +3443,7 @@ # Disable PIC mode by default where it is known to be safe to do so, # to avoid the performance hit from the lost register echo $ac_n "checking whether to force non-PIC code in shared modules""... $ac_c" 1>&6 --echo "configure:3428: checking whether to force non-PIC code in shared modules" >&5 -+echo "configure:3476: checking whether to force non-PIC code in shared modules" >&5 +-echo "configure:3423: checking whether to force non-PIC code in shared modules" >&5 ++echo "configure:3447: checking whether to force non-PIC code in shared modules" >&5 case $host_alias in i?86-*-linux*|i?86-*-freebsd*) if test "${with_pic+set}" != "set" || test "$with_pic" = "no"; then -@@ -3454,7 +3502,7 @@ esac +@@ -3449,7 +3473,7 @@ echo $ac_n "checking whether /dev/urandom exists""... $ac_c" 1>&6 --echo "configure:3458: checking whether /dev/urandom exists" >&5 -+echo "configure:3506: checking whether /dev/urandom exists" >&5 +-echo "configure:3453: checking whether /dev/urandom exists" >&5 ++echo "configure:3477: checking whether /dev/urandom exists" >&5 if test -r "/dev/urandom" && test -c "/dev/urandom"; then cat >> confdefs.h <<\EOF #define HAVE_DEV_URANDOM 1 -@@ -3515,7 +3563,7 @@ if test "$cross_compiling" = yes; then +@@ -3510,7 +3534,7 @@ else cat > conftest.$ac_ext < -@@ -3533,7 +3581,7 @@ int main() { +@@ -3528,7 +3552,7 @@ return pthread_create(&thd, NULL, thread_routine, &data); } EOF --if { (eval echo configure:3537: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3585: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:3532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -3553,7 +3601,7 @@ fi +@@ -3548,7 +3572,7 @@ CFLAGS=$save_CFLAGS echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 --echo "configure:3557: checking for pthreads_cflags" >&5 -+echo "configure:3605: checking for pthreads_cflags" >&5 +-echo "configure:3552: checking for pthreads_cflags" >&5 ++echo "configure:3576: 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 -@@ -3575,7 +3623,7 @@ if test "$cross_compiling" = yes; then +@@ -3570,7 +3594,7 @@ else cat > conftest.$ac_ext < -@@ -3593,7 +3641,7 @@ int main() { +@@ -3588,7 +3612,7 @@ return pthread_create(&thd, NULL, thread_routine, &data); } EOF --if { (eval echo configure:3597: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:3592: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3616: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -3623,7 +3671,7 @@ fi +@@ -3618,7 +3642,7 @@ echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 --echo "configure:3627: checking for pthreads_lib" >&5 -+echo "configure:3675: checking for pthreads_lib" >&5 +-echo "configure:3622: checking for pthreads_lib" >&5 ++echo "configure:3646: 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 -@@ -3645,7 +3693,7 @@ if test "$cross_compiling" = yes; then +@@ -3640,7 +3664,7 @@ else cat > conftest.$ac_ext < -@@ -3663,7 +3711,7 @@ int main() { +@@ -3658,7 +3682,7 @@ return pthread_create(&thd, NULL, thread_routine, &data); } EOF --if { (eval echo configure:3667: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:3715: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:3662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:3686: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then pthreads_working=yes -@@ -3794,7 +3842,7 @@ ext_output=$PHP_AOLSERVER +@@ -3789,7 +3813,7 @@ echo $ac_n "checking for AOLserver support""... $ac_c" 1>&6 --echo "configure:3798: checking for AOLserver support" >&5 -+echo "configure:3846: checking for AOLserver support" >&5 +-echo "configure:3793: checking for AOLserver support" >&5 ++echo "configure:3817: checking for AOLserver support" >&5 if test "$PHP_AOLSERVER" != "no"; then if test -d "$PHP_AOLSERVER/include"; then -@@ -4059,7 +4107,7 @@ ext_output=$PHP_APXS +@@ -4054,7 +4078,7 @@ echo $ac_n "checking for Apache 1.x module support via DSO through APXS""... $ac_c" 1>&6 --echo "configure:4063: checking for Apache 1.x module support via DSO through APXS" >&5 -+echo "configure:4111: checking for Apache 1.x module support via DSO through APXS" >&5 +-echo "configure:4058: checking for Apache 1.x module support via DSO through APXS" >&5 ++echo "configure:4082: checking for Apache 1.x module support via DSO through APXS" >&5 if test "$PHP_APXS" != "no"; then if test "$PHP_APXS" = "yes"; then -@@ -4390,7 +4438,7 @@ ext_output=$PHP_APACHE +@@ -4385,7 +4409,7 @@ echo $ac_n "checking for Apache 1.x module support""... $ac_c" 1>&6 --echo "configure:4394: checking for Apache 1.x module support" >&5 -+echo "configure:4442: checking for Apache 1.x module support" >&5 +-echo "configure:4389: checking for Apache 1.x module support" >&5 ++echo "configure:4413: checking for Apache 1.x module support" >&5 if test "$PHP_SAPI" != "apache" && test "$PHP_APACHE" != "no"; then -@@ -5267,7 +5315,7 @@ fi +@@ -5262,7 +5286,7 @@ php_enable_mod_charset=no echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 --echo "configure:5271: checking whether to enable Apache charset compatibility option" >&5 -+echo "configure:5319: checking whether to enable Apache charset compatibility option" >&5 +-echo "configure:5266: checking whether to enable Apache charset compatibility option" >&5 ++echo "configure:5290: checking whether to enable Apache charset compatibility option" >&5 # Check whether --enable-mod-charset or --disable-mod-charset was given. if test "${enable_mod_charset+set}" = set; then enableval="$enable_mod_charset" -@@ -5299,7 +5347,7 @@ if test "$APACHE_MODULE" = "yes"; then +@@ -5294,7 +5318,7 @@ gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 --echo "configure:5303: checking whether $CC supports -rdynamic" >&5 -+echo "configure:5351: checking whether $CC supports -rdynamic" >&5 +-echo "configure:5298: checking whether $CC supports -rdynamic" >&5 ++echo "configure:5322: 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 -@@ -5342,7 +5390,7 @@ if test -n "$APACHE_INSTALL"; then +@@ -5337,7 +5361,7 @@ echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 --echo "configure:5346: checking for member fd in BUFF *" >&5 -+echo "configure:5394: checking for member fd in BUFF *" >&5 +-echo "configure:5341: checking for member fd in BUFF *" >&5 ++echo "configure:5365: checking for member fd in BUFF *" >&5 if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -5354,14 +5402,14 @@ else +@@ -5349,14 +5373,14 @@ CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi cat > conftest.$ac_ext < int main() { conn_rec *c; int fd = c->client->fd; ; return 0; } EOF --if { (eval echo configure:5365: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:5413: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:5360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:5384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_php_fd_in_buff=yes -@@ -5434,7 +5482,7 @@ ext_output=$PHP_APXS2FILTER +@@ -5429,7 +5453,7 @@ echo $ac_n "checking for Apache 2.0 filter-module support via DSO through APXS""... $ac_c" 1>&6 --echo "configure:5438: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 -+echo "configure:5486: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 +-echo "configure:5433: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 ++echo "configure:5457: checking for Apache 2.0 filter-module support via DSO through APXS" >&5 if test "$PHP_APXS2FILTER" != "no"; then if test "$PHP_APXS2FILTER" = "yes"; then -@@ -6323,7 +6371,7 @@ ext_output=$PHP_APXS2 +@@ -6318,7 +6342,7 @@ echo $ac_n "checking for Apache 2.0 handler-module support via DSO through APXS""... $ac_c" 1>&6 --echo "configure:6327: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 -+echo "configure:6375: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 +-echo "configure:6322: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 ++echo "configure:6346: checking for Apache 2.0 handler-module support via DSO through APXS" >&5 if test "$PHP_APXS2" != "no"; then if test "$PHP_APXS2" = "yes"; then -@@ -7213,7 +7261,7 @@ ext_output=$PHP_APACHE_HOOKS +@@ -7208,7 +7232,7 @@ echo $ac_n "checking for Apache 1.x (hooks) module support via DSO through APXS""... $ac_c" 1>&6 --echo "configure:7217: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 -+echo "configure:7265: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 +-echo "configure:7212: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 ++echo "configure:7236: checking for Apache 1.x (hooks) module support via DSO through APXS" >&5 if test "$PHP_APACHE_HOOKS" != "no"; then if test "$PHP_APACHE_HOOKS" = "yes"; then -@@ -7544,7 +7592,7 @@ ext_output=$PHP_APACHE_HOOKS_STATIC +@@ -7539,7 +7563,7 @@ echo $ac_n "checking for Apache 1.x (hooks) module support""... $ac_c" 1>&6 --echo "configure:7548: checking for Apache 1.x (hooks) module support" >&5 -+echo "configure:7596: checking for Apache 1.x (hooks) module support" >&5 +-echo "configure:7543: checking for Apache 1.x (hooks) module support" >&5 ++echo "configure:7567: checking for Apache 1.x (hooks) module support" >&5 if test "$PHP_SAPI" != "apache" && test "$PHP_SAPI" != "apache_hooks" && test "$PHP_APACHE_HOOKS_STATIC" != "no"; then -@@ -8421,7 +8469,7 @@ fi +@@ -8416,7 +8440,7 @@ php_enable_mod_charset=no echo $ac_n "checking whether to enable Apache charset compatibility option""... $ac_c" 1>&6 --echo "configure:8425: checking whether to enable Apache charset compatibility option" >&5 -+echo "configure:8473: checking whether to enable Apache charset compatibility option" >&5 +-echo "configure:8420: checking whether to enable Apache charset compatibility option" >&5 ++echo "configure:8444: checking whether to enable Apache charset compatibility option" >&5 # Check whether --enable-mod-charset or --disable-mod-charset was given. if test "${enable_mod_charset+set}" = set; then enableval="$enable_mod_charset" -@@ -8453,7 +8501,7 @@ if test "$APACHE_HOOKS_MODULE" = "yes"; +@@ -8448,7 +8472,7 @@ gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 --echo "configure:8457: checking whether $CC supports -rdynamic" >&5 -+echo "configure:8505: checking whether $CC supports -rdynamic" >&5 +-echo "configure:8452: checking whether $CC supports -rdynamic" >&5 ++echo "configure:8476: 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 -@@ -8496,7 +8544,7 @@ if test -n "$APACHE_HOOKS_INSTALL"; then +@@ -8491,7 +8515,7 @@ echo $ac_n "checking for member fd in BUFF *""... $ac_c" 1>&6 --echo "configure:8500: checking for member fd in BUFF *" >&5 -+echo "configure:8548: checking for member fd in BUFF *" >&5 +-echo "configure:8495: checking for member fd in BUFF *" >&5 ++echo "configure:8519: checking for member fd in BUFF *" >&5 if eval "test \"`echo '$''{'ac_cv_php_fd_in_buff'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -8508,14 +8556,14 @@ else +@@ -8503,14 +8527,14 @@ CPPFLAGS="$CPPFLAGS $APACHE_INCLUDE" fi cat > conftest.$ac_ext < int main() { conn_rec *c; int fd = c->client->fd; ; return 0; } EOF --if { (eval echo configure:8519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:8567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:8514: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:8538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_php_fd_in_buff=yes -@@ -8589,7 +8637,7 @@ ext_output=$PHP_CAUDIUM +@@ -8584,7 +8608,7 @@ echo $ac_n "checking for Caudium support""... $ac_c" 1>&6 --echo "configure:8593: checking for Caudium support" >&5 -+echo "configure:8641: checking for Caudium support" >&5 +-echo "configure:8588: checking for Caudium support" >&5 ++echo "configure:8612: checking for Caudium support" >&5 if test "$PHP_CAUDIUM" != "no"; then if test "$prefix" = "NONE"; then CPREF=/usr/local/; fi -@@ -8659,7 +8707,7 @@ if test "$PHP_CAUDIUM" != "no"; then +@@ -8654,7 +8678,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:8663: checking for C includes in $PIKE_C_INCLUDE" >&5 -+echo "configure:8711: checking for C includes in $PIKE_C_INCLUDE" >&5 +-echo "configure:8658: checking for C includes in $PIKE_C_INCLUDE" >&5 ++echo "configure:8682: 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 ####### -@@ -8948,7 +8996,7 @@ ext_output=$PHP_CLI +@@ -8943,7 +8967,7 @@ echo $ac_n "checking for CLI build""... $ac_c" 1>&6 --echo "configure:8952: checking for CLI build" >&5 -+echo "configure:9000: checking for CLI build" >&5 +-echo "configure:8947: checking for CLI build" >&5 ++echo "configure:8971: checking for CLI build" >&5 if test "$PHP_CLI" != "no"; then src=$abs_srcdir/sapi/cli/Makefile.frag -@@ -8998,7 +9046,7 @@ echo "$ac_t""$PHP_CLI" 1>&6 +@@ -8993,7 +9017,7 @@ php_with_continuity=no echo $ac_n "checking for Continuity support""... $ac_c" 1>&6 --echo "configure:9002: checking for Continuity support" >&5 -+echo "configure:9050: checking for Continuity support" >&5 +-echo "configure:8997: checking for Continuity support" >&5 ++echo "configure:9021: checking for Continuity support" >&5 # Check whether --with-continuity or --without-continuity was given. if test "${with_continuity+set}" = set; then withval="$with_continuity" -@@ -9022,7 +9070,7 @@ if test "$PHP_CONTINUITY" != "no"; then +@@ -9017,7 +9041,7 @@ { echo "configure: error: Please specify the path to the root of your Continuity server using --with-continuity=DIR" 1>&2; exit 1; } fi echo $ac_n "checking for Continuity include files""... $ac_c" 1>&6 --echo "configure:9026: checking for Continuity include files" >&5 -+echo "configure:9074: checking for Continuity include files" >&5 +-echo "configure:9021: checking for Continuity include files" >&5 ++echo "configure:9045: checking for Continuity include files" >&5 if test -d $PHP_CONTINUITY/include ; then CAPI_INCLUDE=$PHP_CONTINUITY/include echo "$ac_t""Continuity Binary Distribution" 1>&6 -@@ -9280,7 +9328,7 @@ ext_output=$PHP_EMBED +@@ -9275,7 +9299,7 @@ echo $ac_n "checking for embedded SAPI library support""... $ac_c" 1>&6 --echo "configure:9284: checking for embedded SAPI library support" >&5 -+echo "configure:9332: checking for embedded SAPI library support" >&5 +-echo "configure:9279: checking for embedded SAPI library support" >&5 ++echo "configure:9303: checking for embedded SAPI library support" >&5 if test "$PHP_EMBED" != "no"; then case "$PHP_EMBED" in -@@ -9556,7 +9604,7 @@ ext_output=$PHP_FPM +@@ -9534,7 +9558,7 @@ echo $ac_n "checking for FPM build""... $ac_c" 1>&6 --echo "configure:9560: checking for FPM build" >&5 -+echo "configure:9608: checking for FPM build" >&5 +-echo "configure:9538: checking for FPM build" >&5 ++echo "configure:9562: checking for FPM build" >&5 if test "$PHP_FPM" != "no"; then echo "$ac_t""$PHP_FPM" 1>&6 -@@ -9564,12 +9612,12 @@ if test "$PHP_FPM" != "no"; then +@@ -9542,12 +9566,12 @@ for ac_func in setenv clearenv setproctitle do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:9568: checking for $ac_func" >&5 -+echo "configure:9616: checking for $ac_func" >&5 +-echo "configure:9546: checking for $ac_func" >&5 ++echo "configure:9570: 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:9644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9598: \"$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 -@@ -9619,14 +9667,14 @@ done +@@ -9597,14 +9621,14 @@ echo $ac_n "checking for library containing socket""... $ac_c" 1>&6 --echo "configure:9623: checking for library containing socket" >&5 -+echo "configure:9671: checking for library containing socket" >&5 +-echo "configure:9601: checking for library containing socket" >&5 ++echo "configure:9625: checking for library containing socket" >&5 if eval "test \"`echo '$''{'ac_cv_search_socket'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_socket="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9689: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9619: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="none required" else -@@ -9648,7 +9696,7 @@ rm -f conftest* +@@ -9626,7 +9650,7 @@ test "$ac_cv_search_socket" = "no" && for i in socket; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9711: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9641: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9665: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_socket="-l$i" break -@@ -9681,14 +9729,14 @@ else : +@@ -9659,14 +9683,14 @@ fi echo $ac_n "checking for library containing inet_addr""... $ac_c" 1>&6 --echo "configure:9685: checking for library containing inet_addr" >&5 -+echo "configure:9733: checking for library containing inet_addr" >&5 +-echo "configure:9663: checking for library containing inet_addr" >&5 ++echo "configure:9687: checking for library containing inet_addr" >&5 if eval "test \"`echo '$''{'ac_cv_search_inet_addr'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else ac_func_search_save_LIBS="$LIBS" ac_cv_search_inet_addr="no" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9681: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_addr="none required" else -@@ -9710,7 +9758,7 @@ rm -f conftest* +@@ -9688,7 +9712,7 @@ test "$ac_cv_search_inet_addr" = "no" && for i in nsl; do LIBS="-l$i $ac_func_search_save_LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9773: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_search_inet_addr="-l$i" break -@@ -9746,17 +9794,17 @@ fi +@@ -9724,17 +9748,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9750: checking for $ac_hdr" >&5 -+echo "configure:9798: checking for $ac_hdr" >&5 +-echo "configure:9728: checking for $ac_hdr" >&5 ++echo "configure:9752: 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:9760: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9808: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9738: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9762: \"$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* -@@ -9786,17 +9834,17 @@ done +@@ -9764,17 +9788,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9790: checking for $ac_hdr" >&5 -+echo "configure:9838: checking for $ac_hdr" >&5 +-echo "configure:9768: checking for $ac_hdr" >&5 ++echo "configure:9792: 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:9800: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9848: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9778: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9802: \"$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* -@@ -9826,17 +9874,17 @@ done +@@ -9804,17 +9828,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:9830: checking for $ac_hdr" >&5 -+echo "configure:9878: checking for $ac_hdr" >&5 +-echo "configure:9808: checking for $ac_hdr" >&5 ++echo "configure:9832: 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:9840: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:9888: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:9818: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:9842: \"$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* -@@ -9865,17 +9913,17 @@ done +@@ -9843,17 +9867,17 @@ echo $ac_n "checking for prctl""... $ac_c" 1>&6 --echo "configure:9869: checking for prctl" >&5 -+echo "configure:9917: checking for prctl" >&5 +-echo "configure:9847: checking for prctl" >&5 ++echo "configure:9871: checking for prctl" >&5 cat > conftest.$ac_ext < int main() { prctl(0, 0, 0, 0, 0); ; return 0; } EOF --if { (eval echo configure:9879: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:9927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:9857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:9881: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -9898,17 +9946,17 @@ rm -f conftest* +@@ -9876,17 +9900,17 @@ have_clock_gettime=no echo $ac_n "checking for clock_gettime""... $ac_c" 1>&6 --echo "configure:9902: checking for clock_gettime" >&5 -+echo "configure:9950: checking for clock_gettime" >&5 +-echo "configure:9880: checking for clock_gettime" >&5 ++echo "configure:9904: checking for clock_gettime" >&5 cat > conftest.$ac_ext < int main() { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); ; return 0; } EOF --if { (eval echo configure:9912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9890: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_clock_gettime=yes -@@ -9926,20 +9974,20 @@ rm -f conftest* +@@ -9904,20 +9928,20 @@ if test "$have_clock_gettime" = "no"; then echo $ac_n "checking for clock_gettime in -lrt""... $ac_c" 1>&6 --echo "configure:9930: checking for clock_gettime in -lrt" >&5 -+echo "configure:9978: checking for clock_gettime in -lrt" >&5 +-echo "configure:9908: checking for clock_gettime in -lrt" >&5 ++echo "configure:9932: checking for clock_gettime in -lrt" >&5 SAVED_LIBS="$LIBS" LIBS="$LIBS -lrt" cat > conftest.$ac_ext < int main() { struct timespec ts; clock_gettime(CLOCK_MONOTONIC, &ts); ; return 0; } EOF --if { (eval echo configure:9943: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:9991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:9921: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:9945: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* have_clock_gettime=yes -@@ -9968,13 +10016,13 @@ EOF +@@ -9946,13 +9970,13 @@ if test "$have_clock_gettime" = "no"; then echo $ac_n "checking for clock_get_time""... $ac_c" 1>&6 --echo "configure:9972: checking for clock_get_time" >&5 -+echo "configure:10020: checking for clock_get_time" >&5 +-echo "configure:9950: checking for clock_get_time" >&5 ++echo "configure:9974: checking for clock_get_time" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < #include -@@ -9998,7 +10046,7 @@ else +@@ -9976,7 +10000,7 @@ } EOF --if { (eval echo configure:10002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:9980: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then have_clock_get_time=yes -@@ -10029,10 +10077,10 @@ EOF +@@ -10007,10 +10031,10 @@ have_broken_ptrace=no echo $ac_n "checking for ptrace""... $ac_c" 1>&6 --echo "configure:10033: checking for ptrace" >&5 -+echo "configure:10081: checking for ptrace" >&5 +-echo "configure:10011: checking for ptrace" >&5 ++echo "configure:10035: checking for ptrace" >&5 cat > conftest.$ac_ext < -@@ -10041,7 +10089,7 @@ int main() { +@@ -10019,7 +10043,7 @@ ptrace(0, 0, (void *) 0, 0); ; return 0; } EOF --if { (eval echo configure:10045: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10093: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10023: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10047: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_ptrace=yes -@@ -10059,13 +10107,13 @@ rm -f conftest* +@@ -10037,13 +10061,13 @@ if test "$have_ptrace" = "yes"; then echo $ac_n "checking whether ptrace works""... $ac_c" 1>&6 --echo "configure:10063: checking whether ptrace works" >&5 -+echo "configure:10111: checking whether ptrace works" >&5 +-echo "configure:10041: checking whether ptrace works" >&5 ++echo "configure:10065: checking whether ptrace works" >&5 if test "$cross_compiling" = yes; then { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; } else cat > conftest.$ac_ext < -@@ -10136,7 +10184,7 @@ else +@@ -10114,7 +10138,7 @@ } EOF --if { (eval echo configure:10140: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:10188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:10118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""yes" 1>&6 -@@ -10167,10 +10215,10 @@ EOF +@@ -10145,10 +10169,10 @@ if test "$have_broken_ptrace" = "yes"; then echo $ac_n "checking for mach_vm_read""... $ac_c" 1>&6 --echo "configure:10171: checking for mach_vm_read" >&5 -+echo "configure:10219: checking for mach_vm_read" >&5 +-echo "configure:10149: checking for mach_vm_read" >&5 ++echo "configure:10173: checking for mach_vm_read" >&5 cat > conftest.$ac_ext < #include -@@ -10181,7 +10229,7 @@ int main() { +@@ -10159,7 +10183,7 @@ ; return 0; } EOF --if { (eval echo configure:10185: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10233: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10163: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10187: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_mach_vm_read=yes -@@ -10217,13 +10265,13 @@ EOF +@@ -10195,13 +10219,13 @@ if test -n "$proc_mem_file" ; then echo $ac_n "checking for proc mem file""... $ac_c" 1>&6 --echo "configure:10221: checking for proc mem file" >&5 -+echo "configure:10269: checking for proc mem file" >&5 +-echo "configure:10199: checking for proc mem file" >&5 ++echo "configure:10223: checking for proc mem file" >&5 if test "$cross_compiling" = yes; then { 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:10305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:10235: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:10259: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then echo "$ac_t""$proc_mem_file" 1>&6 -@@ -10297,9 +10345,9 @@ EOF +@@ -10275,9 +10299,9 @@ echo $ac_n "checking if gcc supports __sync_bool_compare_and_swap""... $ac_c" 1>&6 --echo "configure:10301: checking if gcc supports __sync_bool_compare_and_swap" >&5 -+echo "configure:10349: checking if gcc supports __sync_bool_compare_and_swap" >&5 +-echo "configure:10279: checking if gcc supports __sync_bool_compare_and_swap" >&5 ++echo "configure:10303: checking if gcc supports __sync_bool_compare_and_swap" >&5 cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:10362: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:10292: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:10316: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* echo "$ac_t""yes" 1>&6 -@@ -10333,17 +10381,17 @@ rm -f conftest* +@@ -10311,17 +10335,17 @@ have_lq=no echo $ac_n "checking for TCP_INFO""... $ac_c" 1>&6 --echo "configure:10337: checking for TCP_INFO" >&5 -+echo "configure:10385: checking for TCP_INFO" >&5 +-echo "configure:10315: checking for TCP_INFO" >&5 ++echo "configure:10339: checking for TCP_INFO" >&5 cat > conftest.$ac_ext < int main() { struct tcp_info ti; int x = TCP_INFO; ; return 0; } EOF --if { (eval echo configure:10347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10325: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10349: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_lq=tcp_info -@@ -10368,17 +10416,17 @@ EOF +@@ -10346,17 +10370,17 @@ if test "$have_lq" = "no" ; then echo $ac_n "checking for SO_LISTENQLEN""... $ac_c" 1>&6 --echo "configure:10372: checking for SO_LISTENQLEN" >&5 -+echo "configure:10420: checking for SO_LISTENQLEN" >&5 +-echo "configure:10350: checking for SO_LISTENQLEN" >&5 ++echo "configure:10374: checking for SO_LISTENQLEN" >&5 cat > conftest.$ac_ext < int main() { int x = SO_LISTENQLIMIT; int y = SO_LISTENQLEN; ; return 0; } EOF --if { (eval echo configure:10382: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10430: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:10360: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:10384: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_lq=so_listenq -@@ -10404,17 +10452,17 @@ EOF - - - echo $ac_n "checking for sysconf""... $ac_c" 1>&6 --echo "configure:10408: checking for sysconf" >&5 -+echo "configure:10456: checking for sysconf" >&5 - - cat > conftest.$ac_ext < - int main() { - sysconf(_SC_CLK_TCK); - ; return 0; } - EOF --if { (eval echo configure:10418: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -10435,17 +10483,17 @@ rm -f conftest* - - - echo $ac_n "checking for times""... $ac_c" 1>&6 --echo "configure:10439: checking for times" >&5 -+echo "configure:10487: checking for times" >&5 - - cat > conftest.$ac_ext < - int main() { - struct tms t; times(&t); - ; return 0; } - EOF --if { (eval echo configure:10449: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -10466,10 +10514,10 @@ rm -f conftest* - - - echo $ac_n "checking for kqueue""... $ac_c" 1>&6 --echo "configure:10470: checking for kqueue" >&5 -+echo "configure:10518: checking for kqueue" >&5 - - cat > conftest.$ac_ext < -@@ -10486,7 +10534,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10490: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10538: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -10507,10 +10555,10 @@ rm -f conftest* - - - echo $ac_n "checking for port framework""... $ac_c" 1>&6 --echo "configure:10511: checking for port framework" >&5 -+echo "configure:10559: checking for port framework" >&5 - - cat > conftest.$ac_ext < -@@ -10526,7 +10574,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10530: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10578: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -10547,10 +10595,10 @@ rm -f conftest* - - - echo $ac_n "checking for /dev/poll""... $ac_c" 1>&6 --echo "configure:10551: checking for /dev/poll" >&5 -+echo "configure:10599: checking for /dev/poll" >&5 - - cat > conftest.$ac_ext < -@@ -10568,7 +10616,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10572: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10620: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -10589,10 +10637,10 @@ rm -f conftest* - - - echo $ac_n "checking for epoll""... $ac_c" 1>&6 --echo "configure:10593: checking for epoll" >&5 -+echo "configure:10641: checking for epoll" >&5 - - cat > conftest.$ac_ext < -@@ -10621,7 +10669,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10625: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10673: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -10642,10 +10690,10 @@ rm -f conftest* - - - echo $ac_n "checking for poll""... $ac_c" 1>&6 --echo "configure:10646: checking for poll" >&5 -+echo "configure:10694: checking for poll" >&5 - - cat > conftest.$ac_ext < -@@ -10664,7 +10712,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:10668: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10716: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -10685,10 +10733,10 @@ rm -f conftest* - - - echo $ac_n "checking for select""... $ac_c" 1>&6 --echo "configure:10689: checking for select" >&5 -+echo "configure:10737: checking for select" >&5 - - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:10764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -11090,7 +11138,7 @@ fi +@@ -10732,7 +10756,7 @@ php_with_isapi=no echo $ac_n "checking for Zeus ISAPI support""... $ac_c" 1>&6 --echo "configure:11094: checking for Zeus ISAPI support" >&5 -+echo "configure:11142: checking for Zeus ISAPI support" >&5 +-echo "configure:10736: checking for Zeus ISAPI support" >&5 ++echo "configure:10760: 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" -@@ -11344,7 +11392,7 @@ fi +@@ -10986,7 +11010,7 @@ echo $ac_n "checking for LiteSpeed support""... $ac_c" 1>&6 --echo "configure:11348: checking for LiteSpeed support" >&5 -+echo "configure:11396: checking for LiteSpeed support" >&5 +-echo "configure:10990: checking for LiteSpeed support" >&5 ++echo "configure:11014: checking for LiteSpeed support" >&5 php_with_litespeed=no -@@ -11607,7 +11655,7 @@ echo "$ac_t""$PHP_LITESPEED" 1>&6 +@@ -11249,7 +11273,7 @@ php_with_milter=no echo $ac_n "checking for Milter support""... $ac_c" 1>&6 --echo "configure:11611: checking for Milter support" >&5 -+echo "configure:11659: checking for Milter support" >&5 +-echo "configure:11253: checking for Milter support" >&5 ++echo "configure:11277: checking for Milter support" >&5 # Check whether --with-milter or --without-milter was given. if test "${with_milter+set}" = set; then withval="$with_milter" -@@ -11899,7 +11947,7 @@ fi +@@ -11541,7 +11565,7 @@ php_with_nsapi=no echo $ac_n "checking for NSAPI support""... $ac_c" 1>&6 --echo "configure:11903: checking for NSAPI support" >&5 -+echo "configure:11951: checking for NSAPI support" >&5 +-echo "configure:11545: checking for NSAPI support" >&5 ++echo "configure:11569: checking for NSAPI support" >&5 # Check whether --with-nsapi or --without-nsapi was given. if test "${with_nsapi+set}" = set; then withval="$with_nsapi" -@@ -11923,7 +11971,7 @@ if test "$PHP_NSAPI" != "no"; then +@@ -11565,7 +11589,7 @@ { echo "configure: error: Please specify the path to the root of your Netscape/iPlanet/Sun Webserver using --with-nsapi=DIR" 1>&2; exit 1; } fi echo $ac_n "checking for NSAPI include files""... $ac_c" 1>&6 --echo "configure:11927: checking for NSAPI include files" >&5 -+echo "configure:11975: checking for NSAPI include files" >&5 +-echo "configure:11569: checking for NSAPI include files" >&5 ++echo "configure:11593: checking for NSAPI include files" >&5 if test -d $PHP_NSAPI/include ; then NSAPI_INC_DIR="$PHP_NSAPI/include" echo "$ac_t""Netscape 3.x / Sun 7.x style" 1>&6 -@@ -11931,17 +11979,17 @@ echo "configure:11927: checking for NSAP +@@ -11573,17 +11597,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:11935: checking for $ac_hdr" >&5 -+echo "configure:11983: checking for $ac_hdr" >&5 +-echo "configure:11577: checking for $ac_hdr" >&5 ++echo "configure:11601: 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:11945: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:11993: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:11587: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:11611: \"$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* -@@ -11976,17 +12024,17 @@ done +@@ -11618,17 +11642,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:11980: checking for $ac_hdr" >&5 -+echo "configure:12028: checking for $ac_hdr" >&5 +-echo "configure:11622: checking for $ac_hdr" >&5 ++echo "configure:11646: 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:11990: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:12038: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:11632: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:11656: \"$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* -@@ -12259,7 +12307,7 @@ fi +@@ -11901,7 +11925,7 @@ php_with_phttpd=no echo $ac_n "checking for PHTTPD support""... $ac_c" 1>&6 --echo "configure:12263: checking for PHTTPD support" >&5 -+echo "configure:12311: checking for PHTTPD support" >&5 +-echo "configure:11905: checking for PHTTPD support" >&5 ++echo "configure:11929: checking for PHTTPD support" >&5 # Check whether --with-phttpd or --without-phttpd was given. if test "${with_phttpd+set}" = set; then withval="$with_phttpd" -@@ -12513,7 +12561,7 @@ fi +@@ -12155,7 +12179,7 @@ php_with_pi3web=no echo $ac_n "checking for Pi3Web support""... $ac_c" 1>&6 --echo "configure:12517: checking for Pi3Web support" >&5 -+echo "configure:12565: checking for Pi3Web support" >&5 +-echo "configure:12159: checking for Pi3Web support" >&5 ++echo "configure:12183: checking for Pi3Web support" >&5 # Check whether --with-pi3web or --without-pi3web was given. if test "${with_pi3web+set}" = set; then withval="$with_pi3web" -@@ -12885,7 +12933,7 @@ ext_output=$PHP_ROXEN +@@ -12527,7 +12551,7 @@ php_enable_roxen_zts=no echo $ac_n "checking whether Roxen module is build using ZTS""... $ac_c" 1>&6 --echo "configure:12889: checking whether Roxen module is build using ZTS" >&5 -+echo "configure:12937: checking whether Roxen module is build using ZTS" >&5 +-echo "configure:12531: checking whether Roxen module is build using ZTS" >&5 ++echo "configure:12555: checking whether Roxen module is build using 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" -@@ -12906,7 +12954,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -12548,7 +12572,7 @@ RESULT= echo $ac_n "checking for Roxen/Pike support""... $ac_c" 1>&6 --echo "configure:12910: checking for Roxen/Pike support" >&5 -+echo "configure:12958: checking for Roxen/Pike support" >&5 +-echo "configure:12552: checking for Roxen/Pike support" >&5 ++echo "configure:12576: checking for Roxen/Pike support" >&5 if test "$PHP_ROXEN" != "no"; then if test ! -d $PHP_ROXEN ; then { echo "configure: error: You did not specify a directory" 1>&2; exit 1; } -@@ -13192,7 +13240,7 @@ ext_output=$PHP_THTTPD +@@ -12834,7 +12858,7 @@ echo $ac_n "checking for thttpd""... $ac_c" 1>&6 --echo "configure:13196: checking for thttpd" >&5 -+echo "configure:13244: checking for thttpd" >&5 +-echo "configure:12838: checking for thttpd" >&5 ++echo "configure:12862: checking for thttpd" >&5 if test "$PHP_THTTPD" != "no"; then if test ! -d $PHP_THTTPD; then -@@ -13225,7 +13273,7 @@ if test "$PHP_THTTPD" != "no"; then +@@ -12867,7 +12891,7 @@ gcc_arg_name=ac_cv_gcc_arg_rdynamic echo $ac_n "checking whether $CC supports -rdynamic""... $ac_c" 1>&6 --echo "configure:13229: checking whether $CC supports -rdynamic" >&5 -+echo "configure:13277: checking whether $CC supports -rdynamic" >&5 +-echo "configure:12871: checking whether $CC supports -rdynamic" >&5 ++echo "configure:12895: 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 -@@ -13461,24 +13509,24 @@ ext_output=$PHP_TUX +@@ -13103,24 +13127,24 @@ echo $ac_n "checking for TUX""... $ac_c" 1>&6 --echo "configure:13465: checking for TUX" >&5 -+echo "configure:13513: checking for TUX" >&5 +-echo "configure:13107: checking for TUX" >&5 ++echo "configure:13131: checking for TUX" >&5 if test "$PHP_TUX" != "no"; then INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_SHARED $PHP_TUX/php5.tux.so" for ac_hdr in tuxmodule.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:13472: checking for $ac_hdr" >&5 -+echo "configure:13520: checking for $ac_hdr" >&5 +-echo "configure:13114: checking for $ac_hdr" >&5 ++echo "configure:13138: 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:13482: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:13530: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:13124: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:13148: \"$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* -@@ -13715,7 +13763,7 @@ ext_output=$PHP_WEBJAMES +@@ -13357,7 +13381,7 @@ echo $ac_n "checking for webjames""... $ac_c" 1>&6 --echo "configure:13719: checking for webjames" >&5 -+echo "configure:13767: checking for webjames" >&5 +-echo "configure:13361: checking for webjames" >&5 ++echo "configure:13385: checking for webjames" >&5 if test "$PHP_WEBJAMES" != "no"; then -@@ -13975,14 +14023,14 @@ ext_output=$PHP_CGI +@@ -13617,14 +13641,14 @@ if test "$PHP_SAPI" = "default"; then echo $ac_n "checking whether to build CGI binary""... $ac_c" 1>&6 --echo "configure:13979: checking whether to build CGI binary" >&5 -+echo "configure:14027: checking whether to build CGI binary" >&5 +-echo "configure:13621: checking whether to build CGI binary" >&5 ++echo "configure:13645: checking whether to build CGI binary" >&5 if test "$PHP_CGI" != "no"; then echo "$ac_t""yes" 1>&6 echo $ac_n "checking for socklen_t in sys/socket.h""... $ac_c" 1>&6 --echo "configure:13984: checking for socklen_t in sys/socket.h" >&5 -+echo "configure:14032: checking for socklen_t in sys/socket.h" >&5 +-echo "configure:13626: checking for socklen_t in sys/socket.h" >&5 ++echo "configure:13650: checking for socklen_t in sys/socket.h" >&5 cat > conftest.$ac_ext < EOF -@@ -14002,9 +14050,9 @@ rm -f conftest* +@@ -13644,9 +13668,9 @@ echo $ac_n "checking for sun_len in sys/un.h""... $ac_c" 1>&6 --echo "configure:14006: checking for sun_len in sys/un.h" >&5 -+echo "configure:14054: checking for sun_len in sys/un.h" >&5 +-echo "configure:13648: checking for sun_len in sys/un.h" >&5 ++echo "configure:13672: checking for sun_len in sys/un.h" >&5 cat > conftest.$ac_ext < EOF -@@ -14024,7 +14072,7 @@ rm -f conftest* +@@ -13666,7 +13690,7 @@ echo $ac_n "checking whether cross-process locking is required by accept()""... $ac_c" 1>&6 --echo "configure:14028: checking whether cross-process locking is required by accept()" >&5 -+echo "configure:14076: checking whether cross-process locking is required by accept()" >&5 +-echo "configure:13670: checking whether cross-process locking is required by accept()" >&5 ++echo "configure:13694: checking whether cross-process locking is required by accept()" >&5 case "`uname -sr`" in IRIX\ 5.* | SunOS\ 5.* | UNIX_System_V\ 4.0) echo "$ac_t""yes" 1>&6 -@@ -14268,7 +14316,7 @@ fi +@@ -13910,7 +13934,7 @@ echo $ac_n "checking for chosen SAPI module""... $ac_c" 1>&6 --echo "configure:14272: checking for chosen SAPI module" >&5 -+echo "configure:14320: checking for chosen SAPI module" >&5 +-echo "configure:13914: checking for chosen SAPI module" >&5 ++echo "configure:13938: checking for chosen SAPI module" >&5 echo "$ac_t""$PHP_SAPI" 1>&6 if test "$enable_maintainer_zts" = "yes"; then -@@ -14325,7 +14373,7 @@ fi +@@ -13967,7 +13991,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:14329: checking for $ac_word" >&5 -+echo "configure:14377: checking for $ac_word" >&5 +-echo "configure:13971: checking for $ac_word" >&5 ++echo "configure:13995: 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 -@@ -14364,7 +14412,7 @@ fi +@@ -14006,7 +14030,7 @@ echo $ac_n "checking whether system uses EBCDIC""... $ac_c" 1>&6 --echo "configure:14368: checking whether system uses EBCDIC" >&5 -+echo "configure:14416: checking whether system uses EBCDIC" >&5 +-echo "configure:14010: checking whether system uses EBCDIC" >&5 ++echo "configure:14034: 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 -@@ -14375,7 +14423,7 @@ else +@@ -14017,7 +14041,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:14435: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14029: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14053: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_ebcdic=yes -@@ -14411,7 +14459,7 @@ EOF +@@ -14053,7 +14077,7 @@ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 --echo "configure:14415: checking whether byte ordering is bigendian" >&5 -+echo "configure:14463: checking whether byte ordering is bigendian" >&5 +-echo "configure:14057: checking whether byte ordering is bigendian" >&5 ++echo "configure:14081: checking whether byte ordering is bigendian" >&5 if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -14421,7 +14469,7 @@ else +@@ -14063,7 +14087,7 @@ ac_cv_c_bigendian_php=unknown 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:14489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_c_bigendian_php=yes else -@@ -14463,7 +14511,7 @@ EOF +@@ -14105,7 +14129,7 @@ echo $ac_n "checking whether writing to stdout works""... $ac_c" 1>&6 --echo "configure:14467: checking whether writing to stdout works" >&5 -+echo "configure:14515: checking whether writing to stdout works" >&5 +-echo "configure:14109: checking whether writing to stdout works" >&5 ++echo "configure:14133: checking whether writing to stdout works" >&5 if eval "test \"`echo '$''{'ac_cv_write_stdout'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -14474,7 +14522,7 @@ else +@@ -14116,7 +14140,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:14544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_write_stdout=yes -@@ -14567,12 +14615,12 @@ test -d /usr/ucblib && +@@ -14209,12 +14233,12 @@ unset found echo $ac_n "checking for socket""... $ac_c" 1>&6 --echo "configure:14571: checking for socket" >&5 -+echo "configure:14619: checking for socket" >&5 +-echo "configure:14213: checking for socket" >&5 ++echo "configure:14237: checking for socket" >&5 if eval "test \"`echo '$''{'ac_cv_func_socket'+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:14647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14241: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socket=yes" else -@@ -14613,12 +14661,12 @@ if eval "test \"`echo '$ac_cv_func_'sock +@@ -14255,12 +14279,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socket""... $ac_c" 1>&6 --echo "configure:14617: checking for __socket" >&5 -+echo "configure:14665: checking for __socket" >&5 +-echo "configure:14259: checking for __socket" >&5 ++echo "configure:14283: checking for __socket" >&5 if eval "test \"`echo '$''{'ac_cv_func___socket'+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:14693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14311: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___socket=yes" else -@@ -14679,7 +14727,7 @@ EOF +@@ -14321,7 +14345,7 @@ unset ac_cv_lib_socket___socket unset found echo $ac_n "checking for socket in -lsocket""... $ac_c" 1>&6 --echo "configure:14683: checking for socket in -lsocket" >&5 -+echo "configure:14731: checking for socket in -lsocket" >&5 +-echo "configure:14325: checking for socket in -lsocket" >&5 ++echo "configure:14349: 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 -@@ -14687,7 +14735,7 @@ else +@@ -14329,7 +14353,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:14750: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14368: \"$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 -@@ -14718,7 +14766,7 @@ else +@@ -14360,7 +14384,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socket in -lsocket""... $ac_c" 1>&6 --echo "configure:14722: checking for __socket in -lsocket" >&5 -+echo "configure:14770: checking for __socket in -lsocket" >&5 +-echo "configure:14364: checking for __socket in -lsocket" >&5 ++echo "configure:14388: 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 -@@ -14726,7 +14774,7 @@ else +@@ -14368,7 +14392,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:14789: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14383: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14407: \"$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 -@@ -14769,11 +14817,11 @@ fi +@@ -14411,11 +14435,11 @@ found=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:14825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14419: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -14824,12 +14872,12 @@ EOF +@@ -14466,12 +14490,12 @@ unset found echo $ac_n "checking for socketpair""... $ac_c" 1>&6 --echo "configure:14828: checking for socketpair" >&5 -+echo "configure:14876: checking for socketpair" >&5 +-echo "configure:14470: checking for socketpair" >&5 ++echo "configure:14494: checking for socketpair" >&5 if eval "test \"`echo '$''{'ac_cv_func_socketpair'+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:14904: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_socketpair=yes" else -@@ -14870,12 +14918,12 @@ if eval "test \"`echo '$ac_cv_func_'sock +@@ -14512,12 +14536,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socketpair""... $ac_c" 1>&6 --echo "configure:14874: checking for __socketpair" >&5 -+echo "configure:14922: checking for __socketpair" >&5 +-echo "configure:14516: checking for __socketpair" >&5 ++echo "configure:14540: checking for __socketpair" >&5 if eval "test \"`echo '$''{'ac_cv_func___socketpair'+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:14950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14544: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___socketpair=yes" else -@@ -14936,7 +14984,7 @@ EOF +@@ -14578,7 +14602,7 @@ unset ac_cv_lib_socket___socketpair unset found echo $ac_n "checking for socketpair in -lsocket""... $ac_c" 1>&6 --echo "configure:14940: checking for socketpair in -lsocket" >&5 -+echo "configure:14988: checking for socketpair in -lsocket" >&5 +-echo "configure:14582: checking for socketpair in -lsocket" >&5 ++echo "configure:14606: checking for socketpair in -lsocket" >&5 ac_lib_var=`echo socket'_'socketpair | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14944,7 +14992,7 @@ else +@@ -14586,7 +14610,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:15007: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14625: \"$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 -@@ -14975,7 +15023,7 @@ else +@@ -14617,7 +14641,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __socketpair in -lsocket""... $ac_c" 1>&6 --echo "configure:14979: checking for __socketpair in -lsocket" >&5 -+echo "configure:15027: checking for __socketpair in -lsocket" >&5 +-echo "configure:14621: checking for __socketpair in -lsocket" >&5 ++echo "configure:14645: checking for __socketpair in -lsocket" >&5 ac_lib_var=`echo socket'_'__socketpair | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -14983,7 +15031,7 @@ else +@@ -14625,7 +14649,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:15046: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14664: \"$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 -@@ -15026,11 +15074,11 @@ fi +@@ -14668,11 +14692,11 @@ found=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:15082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14676: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15081,12 +15129,12 @@ EOF +@@ -14723,12 +14747,12 @@ unset found echo $ac_n "checking for htonl""... $ac_c" 1>&6 --echo "configure:15085: checking for htonl" >&5 -+echo "configure:15133: checking for htonl" >&5 +-echo "configure:14727: checking for htonl" >&5 ++echo "configure:14751: checking for htonl" >&5 if eval "test \"`echo '$''{'ac_cv_func_htonl'+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:15161: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14755: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_htonl=yes" else -@@ -15127,12 +15175,12 @@ if eval "test \"`echo '$ac_cv_func_'hton +@@ -14769,12 +14793,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __htonl""... $ac_c" 1>&6 --echo "configure:15131: checking for __htonl" >&5 -+echo "configure:15179: checking for __htonl" >&5 +-echo "configure:14773: checking for __htonl" >&5 ++echo "configure:14797: checking for __htonl" >&5 if eval "test \"`echo '$''{'ac_cv_func___htonl'+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:15207: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14801: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___htonl=yes" else -@@ -15193,7 +15241,7 @@ EOF +@@ -14835,7 +14859,7 @@ unset ac_cv_lib_socket___htonl unset found echo $ac_n "checking for htonl in -lsocket""... $ac_c" 1>&6 --echo "configure:15197: checking for htonl in -lsocket" >&5 -+echo "configure:15245: checking for htonl in -lsocket" >&5 +-echo "configure:14839: checking for htonl in -lsocket" >&5 ++echo "configure:14863: 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 -@@ -15201,7 +15249,7 @@ else +@@ -14843,7 +14867,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:15264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14858: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14882: \"$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 -@@ -15232,7 +15280,7 @@ else +@@ -14874,7 +14898,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __htonl in -lsocket""... $ac_c" 1>&6 --echo "configure:15236: checking for __htonl in -lsocket" >&5 -+echo "configure:15284: checking for __htonl in -lsocket" >&5 +-echo "configure:14878: checking for __htonl in -lsocket" >&5 ++echo "configure:14902: 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 -@@ -15240,7 +15288,7 @@ else +@@ -14882,7 +14906,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:15303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:14897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:14921: \"$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 -@@ -15283,11 +15331,11 @@ fi +@@ -14925,11 +14949,11 @@ found=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:15339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:14933: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:14957: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15338,12 +15386,12 @@ EOF +@@ -14980,12 +15004,12 @@ unset found echo $ac_n "checking for gethostname""... $ac_c" 1>&6 --echo "configure:15342: checking for gethostname" >&5 -+echo "configure:15390: checking for gethostname" >&5 +-echo "configure:14984: checking for gethostname" >&5 ++echo "configure:15008: checking for gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostname'+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:15418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostname=yes" else -@@ -15384,12 +15432,12 @@ if eval "test \"`echo '$ac_cv_func_'geth +@@ -15026,12 +15050,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 --echo "configure:15388: checking for __gethostname" >&5 -+echo "configure:15436: checking for __gethostname" >&5 +-echo "configure:15030: checking for __gethostname" >&5 ++echo "configure:15054: checking for __gethostname" >&5 if eval "test \"`echo '$''{'ac_cv_func___gethostname'+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:15464: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15082: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___gethostname=yes" else -@@ -15450,7 +15498,7 @@ EOF +@@ -15092,7 +15116,7 @@ unset ac_cv_lib_nsl___gethostname unset found echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 --echo "configure:15454: checking for gethostname in -lnsl" >&5 -+echo "configure:15502: checking for gethostname in -lnsl" >&5 +-echo "configure:15096: checking for gethostname in -lnsl" >&5 ++echo "configure:15120: 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 -@@ -15458,7 +15506,7 @@ else +@@ -15100,7 +15124,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:15521: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15139: \"$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 -@@ -15489,7 +15537,7 @@ else +@@ -15131,7 +15155,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 --echo "configure:15493: checking for __gethostname in -lnsl" >&5 -+echo "configure:15541: checking for __gethostname in -lnsl" >&5 +-echo "configure:15135: checking for __gethostname in -lnsl" >&5 ++echo "configure:15159: 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 -@@ -15497,7 +15545,7 @@ else +@@ -15139,7 +15163,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:15560: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15154: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15178: \"$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 -@@ -15540,11 +15588,11 @@ fi +@@ -15182,11 +15206,11 @@ found=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:15596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:15190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15595,12 +15643,12 @@ EOF +@@ -15237,12 +15261,12 @@ unset found echo $ac_n "checking for gethostbyaddr""... $ac_c" 1>&6 --echo "configure:15599: checking for gethostbyaddr" >&5 -+echo "configure:15647: checking for gethostbyaddr" >&5 +-echo "configure:15241: checking for gethostbyaddr" >&5 ++echo "configure:15265: checking for gethostbyaddr" >&5 if eval "test \"`echo '$''{'ac_cv_func_gethostbyaddr'+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:15675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_gethostbyaddr=yes" else -@@ -15641,12 +15689,12 @@ if eval "test \"`echo '$ac_cv_func_'geth +@@ -15283,12 +15307,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostbyaddr""... $ac_c" 1>&6 --echo "configure:15645: checking for __gethostbyaddr" >&5 -+echo "configure:15693: checking for __gethostbyaddr" >&5 +-echo "configure:15287: checking for __gethostbyaddr" >&5 ++echo "configure:15311: checking for __gethostbyaddr" >&5 if eval "test \"`echo '$''{'ac_cv_func___gethostbyaddr'+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:15721: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15339: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___gethostbyaddr=yes" else -@@ -15707,7 +15755,7 @@ EOF +@@ -15349,7 +15373,7 @@ unset ac_cv_lib_nsl___gethostbyaddr unset found echo $ac_n "checking for gethostbyaddr in -lnsl""... $ac_c" 1>&6 --echo "configure:15711: checking for gethostbyaddr in -lnsl" >&5 -+echo "configure:15759: checking for gethostbyaddr in -lnsl" >&5 +-echo "configure:15353: checking for gethostbyaddr in -lnsl" >&5 ++echo "configure:15377: 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 -@@ -15715,7 +15763,7 @@ else +@@ -15357,7 +15381,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:15778: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15372: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15396: \"$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 -@@ -15746,7 +15794,7 @@ else +@@ -15388,7 +15412,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __gethostbyaddr in -lnsl""... $ac_c" 1>&6 --echo "configure:15750: checking for __gethostbyaddr in -lnsl" >&5 -+echo "configure:15798: checking for __gethostbyaddr in -lnsl" >&5 +-echo "configure:15392: checking for __gethostbyaddr in -lnsl" >&5 ++echo "configure:15416: 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 -@@ -15754,7 +15802,7 @@ else +@@ -15396,7 +15420,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:15817: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15435: \"$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 -@@ -15797,11 +15845,11 @@ fi +@@ -15439,11 +15463,11 @@ found=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:15853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:15447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -15852,12 +15900,12 @@ EOF +@@ -15494,12 +15518,12 @@ unset found echo $ac_n "checking for yp_get_default_domain""... $ac_c" 1>&6 --echo "configure:15856: checking for yp_get_default_domain" >&5 -+echo "configure:15904: checking for yp_get_default_domain" >&5 +-echo "configure:15498: checking for yp_get_default_domain" >&5 ++echo "configure:15522: 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:15932: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15526: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15550: \"$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 -@@ -15898,12 +15946,12 @@ if eval "test \"`echo '$ac_cv_func_'yp_g +@@ -15540,12 +15564,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __yp_get_default_domain""... $ac_c" 1>&6 --echo "configure:15902: checking for __yp_get_default_domain" >&5 -+echo "configure:15950: checking for __yp_get_default_domain" >&5 +-echo "configure:15544: checking for __yp_get_default_domain" >&5 ++echo "configure:15568: 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:15978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15596: \"$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 -@@ -15964,7 +16012,7 @@ EOF +@@ -15606,7 +15630,7 @@ unset ac_cv_lib_nsl___yp_get_default_domain unset found echo $ac_n "checking for yp_get_default_domain in -lnsl""... $ac_c" 1>&6 --echo "configure:15968: checking for yp_get_default_domain in -lnsl" >&5 -+echo "configure:16016: checking for yp_get_default_domain in -lnsl" >&5 +-echo "configure:15610: checking for yp_get_default_domain in -lnsl" >&5 ++echo "configure:15634: checking for yp_get_default_domain in -lnsl" >&5 ac_lib_var=`echo nsl'_'yp_get_default_domain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -15972,7 +16020,7 @@ else +@@ -15614,7 +15638,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:16035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15629: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15653: \"$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 -@@ -16003,7 +16051,7 @@ else +@@ -15645,7 +15669,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __yp_get_default_domain in -lnsl""... $ac_c" 1>&6 --echo "configure:16007: checking for __yp_get_default_domain in -lnsl" >&5 -+echo "configure:16055: checking for __yp_get_default_domain in -lnsl" >&5 +-echo "configure:15649: checking for __yp_get_default_domain in -lnsl" >&5 ++echo "configure:15673: checking for __yp_get_default_domain in -lnsl" >&5 ac_lib_var=`echo nsl'_'__yp_get_default_domain | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -16011,7 +16059,7 @@ else +@@ -15653,7 +15677,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:16074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15668: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15692: \"$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 -@@ -16054,11 +16102,11 @@ fi +@@ -15696,11 +15720,11 @@ found=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:16110: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:15704: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15728: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16110,12 +16158,12 @@ EOF +@@ -15752,12 +15776,12 @@ unset found echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:16114: checking for dlopen" >&5 -+echo "configure:16162: checking for dlopen" >&5 +-echo "configure:15756: checking for dlopen" >&5 ++echo "configure:15780: 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:16190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15784: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15808: \"$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 -@@ -16156,12 +16204,12 @@ if eval "test \"`echo '$ac_cv_func_'dlop +@@ -15798,12 +15822,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dlopen""... $ac_c" 1>&6 --echo "configure:16160: checking for __dlopen" >&5 -+echo "configure:16208: checking for __dlopen" >&5 +-echo "configure:15802: checking for __dlopen" >&5 ++echo "configure:15826: 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:16236: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15830: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15854: \"$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 -@@ -16222,7 +16270,7 @@ EOF +@@ -15864,7 +15888,7 @@ unset ac_cv_lib_dl___dlopen unset found echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:16226: checking for dlopen in -ldl" >&5 -+echo "configure:16274: checking for dlopen in -ldl" >&5 +-echo "configure:15868: checking for dlopen in -ldl" >&5 ++echo "configure:15892: 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 -@@ -16230,7 +16278,7 @@ else +@@ -15872,7 +15896,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:16293: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15887: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15911: \"$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 -@@ -16261,7 +16309,7 @@ else +@@ -15903,7 +15927,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:16265: checking for __dlopen in -ldl" >&5 -+echo "configure:16313: checking for __dlopen in -ldl" >&5 +-echo "configure:15907: checking for __dlopen in -ldl" >&5 ++echo "configure:15931: 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 -@@ -16269,7 +16317,7 @@ else +@@ -15911,7 +15935,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:16332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:15926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:15950: \"$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 -@@ -16312,11 +16360,11 @@ fi +@@ -15954,11 +15978,11 @@ found=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:16368: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:15962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:15986: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16368,7 +16416,7 @@ EOF +@@ -16010,7 +16034,7 @@ fi echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6 --echo "configure:16372: checking for sin in -lm" >&5 -+echo "configure:16420: checking for sin in -lm" >&5 +-echo "configure:16014: checking for sin in -lm" >&5 ++echo "configure:16038: 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 -@@ -16376,7 +16424,7 @@ else +@@ -16018,7 +16042,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:16439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16033: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16057: \"$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 -@@ -16421,12 +16469,12 @@ fi +@@ -16063,12 +16087,12 @@ unset found echo $ac_n "checking for inet_aton""... $ac_c" 1>&6 --echo "configure:16425: checking for inet_aton" >&5 -+echo "configure:16473: checking for inet_aton" >&5 +-echo "configure:16067: checking for inet_aton" >&5 ++echo "configure:16091: checking for inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func_inet_aton'+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:16501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16095: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16119: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_inet_aton=yes" else -@@ -16467,12 +16515,12 @@ if eval "test \"`echo '$ac_cv_func_'inet +@@ -16109,12 +16133,12 @@ else echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton""... $ac_c" 1>&6 --echo "configure:16471: checking for __inet_aton" >&5 -+echo "configure:16519: checking for __inet_aton" >&5 +-echo "configure:16113: checking for __inet_aton" >&5 ++echo "configure:16137: checking for __inet_aton" >&5 if eval "test \"`echo '$''{'ac_cv_func___inet_aton'+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:16547: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16165: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func___inet_aton=yes" else -@@ -16533,7 +16581,7 @@ EOF +@@ -16175,7 +16199,7 @@ unset ac_cv_lib_resolv___inet_aton unset found echo $ac_n "checking for inet_aton in -lresolv""... $ac_c" 1>&6 --echo "configure:16537: checking for inet_aton in -lresolv" >&5 -+echo "configure:16585: checking for inet_aton in -lresolv" >&5 +-echo "configure:16179: checking for inet_aton in -lresolv" >&5 ++echo "configure:16203: 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 -@@ -16541,7 +16589,7 @@ else +@@ -16183,7 +16207,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:16604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16198: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16222: \"$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 -@@ -16572,7 +16620,7 @@ else +@@ -16214,7 +16238,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton in -lresolv""... $ac_c" 1>&6 --echo "configure:16576: checking for __inet_aton in -lresolv" >&5 -+echo "configure:16624: checking for __inet_aton in -lresolv" >&5 +-echo "configure:16218: checking for __inet_aton in -lresolv" >&5 ++echo "configure:16242: 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 -@@ -16580,7 +16628,7 @@ else +@@ -16222,7 +16246,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:16643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16261: \"$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 -@@ -16623,11 +16671,11 @@ fi +@@ -16265,11 +16289,11 @@ found=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:16679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16669,7 +16717,7 @@ EOF +@@ -16311,7 +16335,7 @@ unset ac_cv_lib_bind___inet_aton unset found echo $ac_n "checking for inet_aton in -lbind""... $ac_c" 1>&6 --echo "configure:16673: checking for inet_aton in -lbind" >&5 -+echo "configure:16721: checking for inet_aton in -lbind" >&5 +-echo "configure:16315: checking for inet_aton in -lbind" >&5 ++echo "configure:16339: 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 -@@ -16677,7 +16725,7 @@ else +@@ -16319,7 +16343,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:16740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16334: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16358: \"$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 -@@ -16708,7 +16756,7 @@ else +@@ -16350,7 +16374,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __inet_aton in -lbind""... $ac_c" 1>&6 --echo "configure:16712: checking for __inet_aton in -lbind" >&5 -+echo "configure:16760: checking for __inet_aton in -lbind" >&5 +-echo "configure:16354: checking for __inet_aton in -lbind" >&5 ++echo "configure:16378: 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 -@@ -16716,7 +16764,7 @@ else +@@ -16358,7 +16382,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:16779: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16373: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16397: \"$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 -@@ -16759,11 +16807,11 @@ fi +@@ -16401,11 +16425,11 @@ found=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:16815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16433: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -16814,12 +16862,12 @@ EOF +@@ -16456,12 +16480,12 @@ echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:16818: checking for ANSI C header files" >&5 -+echo "configure:16866: checking for ANSI C header files" >&5 +-echo "configure:16460: checking for ANSI C header files" >&5 ++echo "configure:16484: 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 -@@ -16827,7 +16875,7 @@ else +@@ -16469,7 +16493,7 @@ #include EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:16831: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:16879: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:16473: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:16497: \"$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* -@@ -16844,7 +16892,7 @@ rm -f conftest* +@@ -16486,7 +16510,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 -@@ -16862,7 +16910,7 @@ fi +@@ -16504,7 +16528,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 -@@ -16883,7 +16931,7 @@ if test "$cross_compiling" = yes; then +@@ -16525,7 +16549,7 @@ : else cat > conftest.$ac_ext < #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -16894,7 +16942,7 @@ if (XOR (islower (i), ISLOWER (i)) || to +@@ -16536,7 +16560,7 @@ exit (0); } EOF --if { (eval echo configure:16898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:16946: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16540: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then : else -@@ -16922,12 +16970,12 @@ for ac_hdr in dirent.h sys/ndir.h sys/di +@@ -16564,12 +16588,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:16926: checking for $ac_hdr that defines DIR" >&5 -+echo "configure:16974: checking for $ac_hdr that defines DIR" >&5 +-echo "configure:16568: checking for $ac_hdr that defines DIR" >&5 ++echo "configure:16592: 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> -@@ -16935,7 +16983,7 @@ int main() { +@@ -16577,7 +16601,7 @@ DIR *dirp = 0; ; return 0; } EOF --if { (eval echo configure:16939: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:16987: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16605: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* eval "ac_cv_header_dirent_$ac_safe=yes" else -@@ -16960,7 +17008,7 @@ done +@@ -16602,7 +16626,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:16964: checking for opendir in -ldir" >&5 -+echo "configure:17012: checking for opendir in -ldir" >&5 +-echo "configure:16606: checking for opendir in -ldir" >&5 ++echo "configure:16630: 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 -@@ -16968,7 +17016,7 @@ else +@@ -16610,7 +16634,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:17031: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16649: \"$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 -@@ -17001,7 +17049,7 @@ fi +@@ -16643,7 +16667,7 @@ else echo $ac_n "checking for opendir in -lx""... $ac_c" 1>&6 --echo "configure:17005: checking for opendir in -lx" >&5 -+echo "configure:17053: checking for opendir in -lx" >&5 +-echo "configure:16647: checking for opendir in -lx" >&5 ++echo "configure:16671: 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 -@@ -17009,7 +17057,7 @@ else +@@ -16651,7 +16675,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:17072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16690: \"$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 -@@ -17102,17 +17150,17 @@ assert.h +@@ -16744,17 +16768,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:17106: checking for $ac_hdr" >&5 -+echo "configure:17154: checking for $ac_hdr" >&5 +-echo "configure:16748: checking for $ac_hdr" >&5 ++echo "configure:16772: 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:17116: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:17164: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:16758: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:16782: \"$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* -@@ -17141,12 +17189,12 @@ done +@@ -16783,12 +16807,12 @@ echo $ac_n "checking for fopencookie""... $ac_c" 1>&6 --echo "configure:17145: checking for fopencookie" >&5 -+echo "configure:17193: checking for fopencookie" >&5 +-echo "configure:16787: checking for fopencookie" >&5 ++echo "configure:16811: 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:17221: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:16815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:16839: \"$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 -@@ -17191,7 +17239,7 @@ fi +@@ -16833,7 +16857,7 @@ if test "$have_glibc_fopencookie" = "yes"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16847: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16871: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_cookie_io_functions_t=yes else -@@ -17220,7 +17268,7 @@ if test "$cross_compiling" = yes; then +@@ -16862,7 +16886,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:17304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:16898: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:16922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then cookie_io_functions_use_off64_t=yes -@@ -17272,7 +17320,7 @@ fi +@@ -16914,7 +16938,7 @@ else cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16928: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:16952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* have_IO_cookie_io_functions_t=yes else -@@ -17316,7 +17364,7 @@ EOF +@@ -16958,7 +16982,7 @@ echo $ac_n "checking for broken getcwd""... $ac_c" 1>&6 --echo "configure:17320: checking for broken getcwd" >&5 -+echo "configure:17368: checking for broken getcwd" >&5 +-echo "configure:16962: checking for broken getcwd" >&5 ++echo "configure:16986: checking for broken getcwd" >&5 os=`uname -sr 2>/dev/null` case $os in SunOS*) -@@ -17331,14 +17379,14 @@ EOF +@@ -16973,14 +16997,14 @@ echo $ac_n "checking for broken libc stdio""... $ac_c" 1>&6 --echo "configure:17335: checking for broken libc stdio" >&5 -+echo "configure:17383: checking for broken libc stdio" >&5 +-echo "configure:16977: checking for broken libc stdio" >&5 ++echo "configure:17001: checking for broken libc stdio" >&5 if eval "test \"`echo '$''{'_cv_have_broken_glibc_fopen_append'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test "$cross_compiling" = yes; then cat > conftest.$ac_ext < -@@ -17351,7 +17399,7 @@ choke me +@@ -16993,7 +17017,7 @@ ; return 0; } EOF --if { (eval echo configure:17355: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17403: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:16997: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17021: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* _cv_have_broken_glibc_fopen_append=yes else -@@ -17364,7 +17412,7 @@ rm -f conftest* +@@ -17006,7 +17030,7 @@ else cat > conftest.$ac_ext < -@@ -17392,7 +17440,7 @@ int main(int argc, char *argv[]) +@@ -17034,7 +17058,7 @@ } EOF --if { (eval echo configure:17396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17444: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17038: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17062: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then _cv_have_broken_glibc_fopen_append=no else -@@ -17420,12 +17468,12 @@ EOF +@@ -17062,12 +17086,12 @@ echo $ac_n "checking whether struct tm is in sys/time.h or time.h""... $ac_c" 1>&6 --echo "configure:17424: checking whether struct tm is in sys/time.h or time.h" >&5 -+echo "configure:17472: checking whether struct tm is in sys/time.h or time.h" >&5 +-echo "configure:17066: checking whether struct tm is in sys/time.h or time.h" >&5 ++echo "configure:17090: 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 -@@ -17433,7 +17481,7 @@ int main() { +@@ -17075,7 +17099,7 @@ struct tm *tp; tp->tm_sec; ; return 0; } EOF --if { (eval echo configure:17437: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17485: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17079: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17103: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm=time.h else -@@ -17454,12 +17502,12 @@ EOF +@@ -17096,12 +17120,12 @@ fi echo $ac_n "checking for tm_zone in struct tm""... $ac_c" 1>&6 --echo "configure:17458: checking for tm_zone in struct tm" >&5 -+echo "configure:17506: checking for tm_zone in struct tm" >&5 +-echo "configure:17100: checking for tm_zone in struct tm" >&5 ++echo "configure:17124: 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> -@@ -17467,7 +17515,7 @@ int main() { +@@ -17109,7 +17133,7 @@ struct tm tm; tm.tm_zone; ; return 0; } EOF --if { (eval echo configure:17471: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17519: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17137: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_zone=yes else -@@ -17487,12 +17535,12 @@ EOF +@@ -17129,12 +17153,12 @@ else echo $ac_n "checking for tzname""... $ac_c" 1>&6 --echo "configure:17491: checking for tzname" >&5 -+echo "configure:17539: checking for tzname" >&5 +-echo "configure:17133: checking for tzname" >&5 ++echo "configure:17157: 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. */ -@@ -17502,7 +17550,7 @@ int main() { +@@ -17144,7 +17168,7 @@ atoi(*tzname); ; return 0; } EOF --if { (eval echo configure:17506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:17554: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:17148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:17172: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_var_tzname=yes else -@@ -17526,16 +17574,16 @@ fi +@@ -17168,16 +17192,16 @@ echo $ac_n "checking for missing declarations of reentrant functions""... $ac_c" 1>&6 --echo "configure:17530: checking for missing declarations of reentrant functions" >&5 -+echo "configure:17578: checking for missing declarations of reentrant functions" >&5 +-echo "configure:17172: checking for missing declarations of reentrant functions" >&5 ++echo "configure:17196: 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:17539: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17181: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17205: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17553,14 +17601,14 @@ EOF +@@ -17195,14 +17219,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { struct tm *(*func)() = gmtime_r ; return 0; } EOF --if { (eval echo configure:17564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17612: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17206: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17230: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17578,14 +17626,14 @@ EOF +@@ -17220,14 +17244,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { char *(*func)() = asctime_r ; return 0; } EOF --if { (eval echo configure:17589: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17637: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17231: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17255: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17603,14 +17651,14 @@ EOF +@@ -17245,14 +17269,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { char *(*func)() = ctime_r ; return 0; } EOF --if { (eval echo configure:17614: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17662: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17256: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17280: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17628,14 +17676,14 @@ EOF +@@ -17270,14 +17294,14 @@ fi rm -f conftest* cat > conftest.$ac_ext < int main() { char *(*func)() = strtok_r ; return 0; } EOF --if { (eval echo configure:17639: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17687: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17281: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17305: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* : -@@ -17656,16 +17704,16 @@ rm -f conftest* +@@ -17298,16 +17322,16 @@ echo $ac_n "checking for fclose declaration""... $ac_c" 1>&6 --echo "configure:17660: checking for fclose declaration" >&5 -+echo "configure:17708: checking for fclose declaration" >&5 +-echo "configure:17302: checking for fclose declaration" >&5 ++echo "configure:17326: checking for fclose declaration" >&5 cat > conftest.$ac_ext < int main() { int (*func)() = fclose ; return 0; } EOF --if { (eval echo configure:17669: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17717: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17311: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17335: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* cat >> confdefs.h <<\EOF -@@ -17691,12 +17739,12 @@ rm -f conftest* +@@ -17333,12 +17357,12 @@ echo $ac_n "checking for tm_gmtoff in struct tm""... $ac_c" 1>&6 --echo "configure:17695: checking for tm_gmtoff in struct tm" >&5 -+echo "configure:17743: checking for tm_gmtoff in struct tm" >&5 +-echo "configure:17337: checking for tm_gmtoff in struct tm" >&5 ++echo "configure:17361: 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> -@@ -17704,7 +17752,7 @@ int main() { +@@ -17346,7 +17370,7 @@ struct tm tm; tm.tm_gmtoff; ; return 0; } EOF --if { (eval echo configure:17708: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17756: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17374: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_tm_gmtoff=yes else -@@ -17727,12 +17775,12 @@ fi +@@ -17369,12 +17393,12 @@ echo $ac_n "checking for struct flock""... $ac_c" 1>&6 --echo "configure:17731: checking for struct flock" >&5 -+echo "configure:17779: checking for struct flock" >&5 +-echo "configure:17373: checking for struct flock" >&5 ++echo "configure:17397: 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 < -@@ -17742,7 +17790,7 @@ int main() { +@@ -17384,7 +17408,7 @@ struct flock x; ; return 0; } EOF --if { (eval echo configure:17746: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17388: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17412: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_flock=yes -@@ -17769,12 +17817,12 @@ fi +@@ -17411,12 +17435,12 @@ echo $ac_n "checking for socklen_t""... $ac_c" 1>&6 --echo "configure:17773: checking for socklen_t" >&5 -+echo "configure:17821: checking for socklen_t" >&5 +-echo "configure:17415: checking for socklen_t" >&5 ++echo "configure:17439: 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 < -@@ -17786,7 +17834,7 @@ socklen_t x; +@@ -17428,7 +17452,7 @@ ; return 0; } EOF --if { (eval echo configure:17790: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:17838: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17432: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17456: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_socklen_t=yes -@@ -17812,7 +17860,7 @@ fi +@@ -17454,7 +17478,7 @@ echo $ac_n "checking size of size_t""... $ac_c" 1>&6 --echo "configure:17816: checking size of size_t" >&5 -+echo "configure:17864: checking size of size_t" >&5 +-echo "configure:17458: checking size of size_t" >&5 ++echo "configure:17482: checking size of size_t" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_size_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -17820,9 +17868,10 @@ else +@@ -17462,18 +17486,19 @@ ac_cv_sizeof_size_t=8 else cat > conftest.$ac_ext < +-int main() +#include - main() ++main() { FILE *f=fopen("conftestval", "w"); -@@ -17831,7 +17880,7 @@ main() - exit(0); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(size_t)); +- return(0); ++ exit(0); } EOF --if { (eval echo configure:17835: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17477: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_sizeof_size_t=`cat conftestval` else -@@ -17851,7 +17900,7 @@ EOF +@@ -17493,7 +17518,7 @@ echo $ac_n "checking size of long long""... $ac_c" 1>&6 --echo "configure:17855: checking size of long long" >&5 -+echo "configure:17904: checking size of long long" >&5 +-echo "configure:17497: checking size of long long" >&5 ++echo "configure:17522: 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 -@@ -17859,9 +17908,10 @@ else +@@ -17501,18 +17526,19 @@ ac_cv_sizeof_long_long=8 else cat > conftest.$ac_ext < +-int main() +#include - main() ++main() { FILE *f=fopen("conftestval", "w"); -@@ -17870,7 +17920,7 @@ main() - exit(0); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long long)); +- return(0); ++ exit(0); } EOF --if { (eval echo configure:17874: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17924: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17542: \"$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 -@@ -17890,7 +17940,7 @@ EOF +@@ -17532,7 +17558,7 @@ echo $ac_n "checking size of long long int""... $ac_c" 1>&6 --echo "configure:17894: checking size of long long int" >&5 -+echo "configure:17944: checking size of long long int" >&5 +-echo "configure:17536: checking size of long long int" >&5 ++echo "configure:17562: checking size of long long int" >&5 if eval "test \"`echo '$''{'ac_cv_sizeof_long_long_int'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -17898,9 +17948,10 @@ else +@@ -17540,18 +17566,19 @@ ac_cv_sizeof_long_long_int=8 else cat > conftest.$ac_ext < +-int main() +#include - main() ++main() { FILE *f=fopen("conftestval", "w"); -@@ -17909,7 +17960,7 @@ main() - exit(0); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long long int)); +- return(0); ++ exit(0); } EOF --if { (eval echo configure:17913: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:17964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17555: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17582: \"$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_int=`cat conftestval` else -@@ -17929,7 +17980,7 @@ EOF +@@ -17571,7 +17598,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:17933: checking size of long" >&5 -+echo "configure:17984: checking size of long" >&5 +-echo "configure:17575: checking size of long" >&5 ++echo "configure:17602: 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 -@@ -17937,9 +17988,10 @@ else +@@ -17579,18 +17606,19 @@ ac_cv_sizeof_long=8 else cat > conftest.$ac_ext < +-int main() +#include - main() ++main() { FILE *f=fopen("conftestval", "w"); -@@ -17948,7 +18000,7 @@ main() - exit(0); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long)); +- return(0); ++ exit(0); } EOF --if { (eval echo configure:17952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17622: \"$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 -@@ -17968,7 +18020,7 @@ EOF +@@ -17610,7 +17638,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:17972: checking size of int" >&5 -+echo "configure:18024: checking size of int" >&5 +-echo "configure:17614: checking size of int" >&5 ++echo "configure:17642: 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 -@@ -17976,9 +18028,10 @@ else +@@ -17618,18 +17646,19 @@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < +-int main() +#include - main() ++main() { FILE *f=fopen("conftestval", "w"); -@@ -17987,7 +18040,7 @@ main() - exit(0); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int)); +- return(0); ++ exit(0); } EOF --if { (eval echo configure:17991: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18044: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17662: \"$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 -@@ -18009,7 +18062,7 @@ EOF +@@ -17651,7 +17680,7 @@ echo $ac_n "checking size of intmax_t""... $ac_c" 1>&6 --echo "configure:18013: checking size of intmax_t" >&5 -+echo "configure:18066: checking size of intmax_t" >&5 +-echo "configure:17655: checking size of intmax_t" >&5 ++echo "configure:17684: checking size of intmax_t" >&5 php_cache_value=php_cv_sizeof_intmax_t if eval "test \"`echo '$''{'php_cv_sizeof_intmax_t'+set}'`\" = set"; then -@@ -18026,7 +18079,7 @@ else +@@ -17668,7 +17697,7 @@ else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -18050,7 +18103,7 @@ int main() +@@ -17692,7 +17721,7 @@ } EOF --if { (eval echo configure:18054: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18107: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17696: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -18089,7 +18142,7 @@ EOF +@@ -17731,7 +17760,7 @@ echo $ac_n "checking size of ssize_t""... $ac_c" 1>&6 --echo "configure:18093: checking size of ssize_t" >&5 -+echo "configure:18146: checking size of ssize_t" >&5 +-echo "configure:17735: checking size of ssize_t" >&5 ++echo "configure:17764: checking size of ssize_t" >&5 php_cache_value=php_cv_sizeof_ssize_t if eval "test \"`echo '$''{'php_cv_sizeof_ssize_t'+set}'`\" = set"; then -@@ -18106,7 +18159,7 @@ else +@@ -17748,7 +17777,7 @@ else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -18130,7 +18183,7 @@ int main() +@@ -17772,7 +17801,7 @@ } EOF --if { (eval echo configure:18134: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18187: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17776: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -18169,7 +18222,7 @@ EOF +@@ -17811,7 +17840,7 @@ echo $ac_n "checking size of ptrdiff_t""... $ac_c" 1>&6 --echo "configure:18173: checking size of ptrdiff_t" >&5 -+echo "configure:18226: checking size of ptrdiff_t" >&5 +-echo "configure:17815: checking size of ptrdiff_t" >&5 ++echo "configure:17844: checking size of ptrdiff_t" >&5 php_cache_value=php_cv_sizeof_ptrdiff_t if eval "test \"`echo '$''{'php_cv_sizeof_ptrdiff_t'+set}'`\" = set"; then -@@ -18186,7 +18239,7 @@ else +@@ -17828,7 +17857,7 @@ else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -18210,7 +18263,7 @@ int main() +@@ -17852,7 +17881,7 @@ } EOF --if { (eval echo configure:18214: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:18267: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:17856: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:17885: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then eval $php_cache_value=`cat conftestval` -@@ -18249,12 +18302,12 @@ EOF +@@ -17891,12 +17920,12 @@ echo $ac_n "checking for st_blksize in struct stat""... $ac_c" 1>&6 --echo "configure:18253: checking for st_blksize in struct stat" >&5 -+echo "configure:18306: checking for st_blksize in struct stat" >&5 +-echo "configure:17895: checking for st_blksize in struct stat" >&5 ++echo "configure:17924: 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 -@@ -18262,7 +18315,7 @@ int main() { +@@ -17904,7 +17933,7 @@ struct stat s; s.st_blksize; ; return 0; } EOF --if { (eval echo configure:18266: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18319: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17908: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17937: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blksize=yes else -@@ -18284,12 +18337,12 @@ fi +@@ -17926,12 +17955,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:18288: checking for st_blocks in struct stat" >&5 -+echo "configure:18341: checking for st_blocks in struct stat" >&5 +-echo "configure:17930: checking for st_blocks in struct stat" >&5 ++echo "configure:17959: 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 -@@ -18297,7 +18350,7 @@ int main() { +@@ -17939,7 +17968,7 @@ struct stat s; s.st_blocks; ; return 0; } EOF --if { (eval echo configure:18301: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18354: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17943: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:17972: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_blocks=yes else -@@ -18324,12 +18377,12 @@ else +@@ -17966,12 +17995,12 @@ WARNING_LEVEL=0 fi echo $ac_n "checking for st_rdev in struct stat""... $ac_c" 1>&6 --echo "configure:18328: checking for st_rdev in struct stat" >&5 -+echo "configure:18381: checking for st_rdev in struct stat" >&5 +-echo "configure:17970: checking for st_rdev in struct stat" >&5 ++echo "configure:17999: 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 -@@ -18337,7 +18390,7 @@ int main() { +@@ -17979,7 +18008,7 @@ struct stat s; s.st_rdev; ; return 0; } EOF --if { (eval echo configure:18341: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18394: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:17983: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18012: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_struct_st_rdev=yes else -@@ -18359,12 +18412,12 @@ fi +@@ -18001,12 +18030,12 @@ echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:18363: checking for size_t" >&5 -+echo "configure:18416: checking for size_t" >&5 +-echo "configure:18005: checking for size_t" >&5 ++echo "configure:18034: 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 -@@ -18392,12 +18445,12 @@ EOF +@@ -18034,12 +18063,12 @@ fi echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 --echo "configure:18396: checking for uid_t in sys/types.h" >&5 -+echo "configure:18449: checking for uid_t in sys/types.h" >&5 +-echo "configure:18038: checking for uid_t in sys/types.h" >&5 ++echo "configure:18067: 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 -@@ -18428,12 +18481,12 @@ fi +@@ -18070,12 +18099,12 @@ echo $ac_n "checking for struct sockaddr_storage""... $ac_c" 1>&6 --echo "configure:18432: checking for struct sockaddr_storage" >&5 -+echo "configure:18485: checking for struct sockaddr_storage" >&5 +-echo "configure:18074: checking for struct sockaddr_storage" >&5 ++echo "configure:18103: checking for struct sockaddr_storage" >&5 if eval "test \"`echo '$''{'ac_cv_sockaddr_storage'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -18441,7 +18494,7 @@ int main() { +@@ -18083,7 +18112,7 @@ struct sockaddr_storage s; s ; return 0; } EOF --if { (eval echo configure:18445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18498: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:18087: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18116: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_storage=yes else -@@ -18462,13 +18515,13 @@ EOF +@@ -18104,13 +18133,13 @@ fi echo $ac_n "checking for field sa_len in struct sockaddr""... $ac_c" 1>&6 --echo "configure:18466: checking for field sa_len in struct sockaddr" >&5 -+echo "configure:18519: checking for field sa_len in struct sockaddr" >&5 +-echo "configure:18108: checking for field sa_len in struct sockaddr" >&5 ++echo "configure:18137: checking for field sa_len in struct sockaddr" >&5 if eval "test \"`echo '$''{'ac_cv_sockaddr_sa_len'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -18476,7 +18529,7 @@ int main() { +@@ -18118,7 +18147,7 @@ static struct sockaddr sa; int n = (int) sa.sa_len; return n; ; return 0; } EOF --if { (eval echo configure:18480: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:18533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:18122: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:18151: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_sockaddr_sa_len=yes else -@@ -18499,12 +18552,12 @@ EOF +@@ -18141,12 +18170,12 @@ echo $ac_n "checking for IPv6 support""... $ac_c" 1>&6 --echo "configure:18503: checking for IPv6 support" >&5 -+echo "configure:18556: checking for IPv6 support" >&5 +-echo "configure:18145: checking for IPv6 support" >&5 ++echo "configure:18174: 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 -@@ -18513,7 +18566,7 @@ int main() { +@@ -18155,7 +18184,7 @@ struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] = 0; ; return 0; } EOF --if { (eval echo configure:18517: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* ac_cv_ipv6_support=yes else -@@ -18529,12 +18582,12 @@ echo "$ac_t""$ac_cv_ipv6_support" 1>&6 +@@ -18171,12 +18200,12 @@ echo $ac_n "checking for vprintf""... $ac_c" 1>&6 --echo "configure:18533: checking for vprintf" >&5 -+echo "configure:18586: checking for vprintf" >&5 +-echo "configure:18175: checking for vprintf" >&5 ++echo "configure:18204: 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:18614: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18232: \"$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 -@@ -18581,12 +18634,12 @@ fi +@@ -18223,12 +18252,12 @@ if test "$ac_cv_func_vprintf" != yes; then echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 --echo "configure:18585: checking for _doprnt" >&5 -+echo "configure:18638: checking for _doprnt" >&5 +-echo "configure:18227: checking for _doprnt" >&5 ++echo "configure:18256: 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:18666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18255: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18284: \"$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 -@@ -18718,12 +18771,12 @@ nanosleep \ +@@ -18359,12 +18388,12 @@ do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:18722: checking for $ac_func" >&5 -+echo "configure:18775: checking for $ac_func" >&5 +-echo "configure:18363: checking for $ac_func" >&5 ++echo "configure:18392: 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:18803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18391: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18420: \"$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 -@@ -18777,7 +18830,7 @@ done +@@ -18418,7 +18447,7 @@ unset ac_cv_lib_rt___nanosleep unset found echo $ac_n "checking for nanosleep in -lrt""... $ac_c" 1>&6 --echo "configure:18781: checking for nanosleep in -lrt" >&5 -+echo "configure:18834: checking for nanosleep in -lrt" >&5 +-echo "configure:18422: checking for nanosleep in -lrt" >&5 ++echo "configure:18451: checking for nanosleep in -lrt" >&5 ac_lib_var=`echo rt'_'nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -18785,7 +18838,7 @@ else +@@ -18426,7 +18455,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18470: \"$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 -@@ -18816,7 +18869,7 @@ else +@@ -18457,7 +18486,7 @@ echo "$ac_t""no" 1>&6 echo $ac_n "checking for __nanosleep in -lrt""... $ac_c" 1>&6 --echo "configure:18820: checking for __nanosleep in -lrt" >&5 -+echo "configure:18873: checking for __nanosleep in -lrt" >&5 +-echo "configure:18461: checking for __nanosleep in -lrt" >&5 ++echo "configure:18490: checking for __nanosleep in -lrt" >&5 ac_lib_var=`echo rt'_'__nanosleep | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -18824,7 +18877,7 @@ else +@@ -18465,7 +18494,7 @@ ac_save_LIBS="$LIBS" LIBS="-lrt $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18892: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18509: \"$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 -@@ -18867,11 +18920,11 @@ fi +@@ -18508,11 +18537,11 @@ found=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:18928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:18516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then found=yes else -@@ -18915,25 +18968,25 @@ EOF +@@ -18556,25 +18585,25 @@ echo $ac_n "checking for getaddrinfo""... $ac_c" 1>&6 --echo "configure:18919: checking for getaddrinfo" >&5 -+echo "configure:18972: checking for getaddrinfo" >&5 +-echo "configure:18560: checking for getaddrinfo" >&5 ++echo "configure:18589: 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:18931: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:18984: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* if test "$cross_compiling" = yes; then ac_cv_func_getaddrinfo=no else cat > conftest.$ac_ext < -@@ -18973,7 +19026,7 @@ int main(void) { +@@ -18614,7 +18643,7 @@ } EOF --if { (eval echo configure:18977: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19030: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:18618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18647: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then ac_cv_func_getaddrinfo=yes else -@@ -19003,19 +19056,19 @@ EOF - fi - - echo $ac_n "checking for __sync_fetch_and_add""... $ac_c" 1>&6 --echo "configure:19007: checking for __sync_fetch_and_add" >&5 -+echo "configure:19060: checking for __sync_fetch_and_add" >&5 - if eval "test \"`echo '$''{'ac_cv_func_sync_fetch_and_add'+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:19072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cv_func_sync_fetch_and_add=yes - else -@@ -19038,12 +19091,12 @@ fi +@@ -18646,12 +18675,12 @@ for ac_func in strlcat strlcpy getopt do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:19042: checking for $ac_func" >&5 -+echo "configure:19095: checking for $ac_func" >&5 +-echo "configure:18650: checking for $ac_func" >&5 ++echo "configure:18679: 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:19123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18707: \"$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 -@@ -19093,7 +19146,7 @@ done +@@ -18701,7 +18730,7 @@ echo $ac_n "checking whether utime accepts a null argument""... $ac_c" 1>&6 --echo "configure:19097: checking whether utime accepts a null argument" >&5 -+echo "configure:19150: checking whether utime accepts a null argument" >&5 +-echo "configure:18705: checking whether utime accepts a null argument" >&5 ++echo "configure:18734: 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 -@@ -19103,7 +19156,7 @@ if test "$cross_compiling" = yes; then +@@ -18711,7 +18740,7 @@ ac_cv_func_utime_null=no else cat > conftest.$ac_ext < #include -@@ -19114,7 +19167,7 @@ exit(!(stat ("conftestdata", &s) == 0 && +@@ -18722,7 +18751,7 @@ && t.st_mtime - s.st_mtime < 120)); } EOF --if { (eval echo configure:19118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19171: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:18726: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18755: \"$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 -@@ -19140,19 +19193,19 @@ fi +@@ -18748,19 +18777,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:19144: checking for working alloca.h" >&5 -+echo "configure:19197: checking for working alloca.h" >&5 +-echo "configure:18752: checking for working alloca.h" >&5 ++echo "configure:18781: 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:19156: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:19209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18793: \"$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 -@@ -19173,12 +19226,12 @@ EOF +@@ -18781,12 +18810,12 @@ fi echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:19177: checking for alloca" >&5 -+echo "configure:19230: checking for alloca" >&5 +-echo "configure:18785: checking for alloca" >&5 ++echo "configure:18814: 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:19263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18847: \"$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 -@@ -19238,12 +19291,12 @@ EOF +@@ -18846,12 +18875,12 @@ echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:19242: checking whether alloca needs Cray hooks" >&5 -+echo "configure:19295: checking whether alloca needs Cray hooks" >&5 +-echo "configure:18850: checking whether alloca needs Cray hooks" >&5 ++echo "configure:18879: 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 +@@ -18876,12 +18905,12 @@ if test $ac_cv_os_cray = yes; then for ac_func in _getb67 GETB67 getb67; do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:19272: checking for $ac_func" >&5 -+echo "configure:19325: checking for $ac_func" >&5 +-echo "configure:18880: checking for $ac_func" >&5 ++echo "configure:18909: 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:19353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:18908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:18937: \"$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 -@@ -19323,7 +19376,7 @@ done +@@ -18931,7 +18960,7 @@ fi echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:19327: checking stack direction for C alloca" >&5 -+echo "configure:19380: checking stack direction for C alloca" >&5 +-echo "configure:18935: checking stack direction for C alloca" >&5 ++echo "configure:18964: 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 -@@ -19331,7 +19384,7 @@ else +@@ -18939,7 +18968,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:19407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:18962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:18991: \"$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 -@@ -19373,13 +19426,13 @@ fi +@@ -18981,13 +19010,13 @@ echo $ac_n "checking for declared timezone""... $ac_c" 1>&6 --echo "configure:19377: checking for declared timezone" >&5 -+echo "configure:19430: checking for declared timezone" >&5 +-echo "configure:18985: checking for declared timezone" >&5 ++echo "configure:19014: 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 < -@@ -19394,7 +19447,7 @@ int main() { +@@ -19002,7 +19031,7 @@ ; return 0; } EOF --if { (eval echo configure:19398: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19006: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19035: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_declared_timezone=yes -@@ -19420,7 +19473,7 @@ EOF +@@ -19028,7 +19057,7 @@ echo $ac_n "checking for type of reentrant time-related functions""... $ac_c" 1>&6 --echo "configure:19424: checking for type of reentrant time-related functions" >&5 -+echo "configure:19477: checking for type of reentrant time-related functions" >&5 +-echo "configure:19032: checking for type of reentrant time-related functions" >&5 ++echo "configure:19061: 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 -@@ -19431,7 +19484,7 @@ if test "$cross_compiling" = yes; then +@@ -19039,7 +19068,7 @@ else cat > conftest.$ac_ext < -@@ -19449,7 +19502,7 @@ return (1); +@@ -19057,7 +19086,7 @@ } EOF --if { (eval echo configure:19453: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19061: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19090: \"$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 -@@ -19465,7 +19518,7 @@ else +@@ -19073,7 +19102,7 @@ else cat > conftest.$ac_ext < -@@ -19481,7 +19534,7 @@ main() { +@@ -19089,7 +19118,7 @@ } EOF --if { (eval echo configure:19485: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:19538: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19122: \"$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=irix -@@ -19519,12 +19572,12 @@ EOF +@@ -19127,12 +19156,12 @@ echo $ac_n "checking for readdir_r""... $ac_c" 1>&6 --echo "configure:19523: checking for readdir_r" >&5 -+echo "configure:19576: checking for readdir_r" >&5 +-echo "configure:19131: checking for readdir_r" >&5 ++echo "configure:19160: 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:19604: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19188: \"$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 -@@ -19569,7 +19622,7 @@ fi +@@ -19177,7 +19206,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:19573: checking for type of readdir_r" >&5 -+echo "configure:19626: checking for type of readdir_r" >&5 +-echo "configure:19181: checking for type of readdir_r" >&5 ++echo "configure:19210: 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 -@@ -19580,7 +19633,7 @@ else +@@ -19188,7 +19217,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:19662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:19217: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:19246: \"$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 -@@ -19616,7 +19669,7 @@ else +@@ -19224,7 +19253,7 @@ rm -fr conftest* cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:19683: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:19238: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:19267: \"$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* -@@ -19668,12 +19721,12 @@ EOF +@@ -19276,12 +19305,12 @@ echo $ac_n "checking for in_addr_t""... $ac_c" 1>&6 --echo "configure:19672: checking for in_addr_t" >&5 -+echo "configure:19725: checking for in_addr_t" >&5 +-echo "configure:19280: checking for in_addr_t" >&5 ++echo "configure:19309: checking for in_addr_t" >&5 if eval "test \"`echo '$''{'ac_cv_type_in_addr_t'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #if STDC_HEADERS -@@ -19707,12 +19760,12 @@ fi +@@ -19315,12 +19344,12 @@ for ac_func in crypt_r do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:19711: checking for $ac_func" >&5 -+echo "configure:19764: checking for $ac_func" >&5 +-echo "configure:19319: checking for $ac_func" >&5 ++echo "configure:19348: 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:19792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:19347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:19376: \"$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 -@@ -19763,14 +19816,14 @@ done +@@ -19371,14 +19400,14 @@ if test "x$php_crypt_r" = "x1"; then echo $ac_n "checking which data struct is used by crypt_r""... $ac_c" 1>&6 --echo "configure:19767: checking which data struct is used by crypt_r" >&5 -+echo "configure:19820: checking which data struct is used by crypt_r" >&5 +-echo "configure:19375: checking which data struct is used by crypt_r" >&5 ++echo "configure:19404: checking which data struct is used by crypt_r" >&5 if eval "test \"`echo '$''{'php_cv_crypt_r_style'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else php_cv_crypt_r_style=none cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19840: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19424: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_crypt_r_style=cryptd else -@@ -19794,7 +19847,7 @@ rm -f conftest* +@@ -19402,7 +19431,7 @@ if test "$php_cv_crypt_r_style" = "none"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19864: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19419: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19448: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_crypt_r_style=struct_crypt_data else -@@ -19819,7 +19872,7 @@ rm -f conftest* +@@ -19427,7 +19456,7 @@ if test "$php_cv_crypt_r_style" = "none"; then cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:19890: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:19445: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:19474: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* php_cv_crypt_r_style=struct_crypt_data_gnu_source else -@@ -19892,7 +19945,7 @@ fi +@@ -19500,7 +19529,7 @@ php_enable_gcov=no echo $ac_n "checking whether to include gcov symbols""... $ac_c" 1>&6 --echo "configure:19896: checking whether to include gcov symbols" >&5 -+echo "configure:19949: checking whether to include gcov symbols" >&5 +-echo "configure:19504: checking whether to include gcov symbols" >&5 ++echo "configure:19533: checking whether to include gcov symbols" >&5 # Check whether --enable-gcov or --disable-gcov was given. if test "${enable_gcov+set}" = set; then enableval="$enable_gcov" -@@ -19931,7 +19984,7 @@ if test "$PHP_GCOV" = "yes"; then +@@ -19539,7 +19568,7 @@ # Extract the first word of "lcov", so it can be a program name with args. set dummy lcov; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:19935: checking for $ac_word" >&5 -+echo "configure:19988: checking for $ac_word" >&5 +-echo "configure:19543: checking for $ac_word" >&5 ++echo "configure:19572: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LTP'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -19960,7 +20013,7 @@ fi +@@ -19568,7 +19597,7 @@ # Extract the first word of "genhtml", so it can be a program name with args. set dummy genhtml; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:19964: checking for $ac_word" >&5 -+echo "configure:20017: checking for $ac_word" >&5 +-echo "configure:19572: checking for $ac_word" >&5 ++echo "configure:19601: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_LTP_GENHTML'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -19995,7 +20048,7 @@ fi +@@ -19603,7 +19632,7 @@ if test "$LTP"; then echo $ac_n "checking for ltp version""... $ac_c" 1>&6 --echo "configure:19999: checking for ltp version" >&5 -+echo "configure:20052: checking for ltp version" >&5 +-echo "configure:19607: checking for ltp version" >&5 ++echo "configure:19636: checking for ltp version" >&5 if eval "test \"`echo '$''{'php_cv_ltp_version'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -20052,7 +20105,7 @@ fi +@@ -19660,7 +19689,7 @@ php_enable_debug=no echo $ac_n "checking whether to include debugging symbols""... $ac_c" 1>&6 --echo "configure:20056: checking whether to include debugging symbols" >&5 -+echo "configure:20109: checking whether to include debugging symbols" >&5 +-echo "configure:19664: checking whether to include debugging symbols" >&5 ++echo "configure:19693: 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" -@@ -20100,7 +20153,7 @@ fi +@@ -19708,7 +19737,7 @@ php_with_layout=PHP echo $ac_n "checking layout of installed files""... $ac_c" 1>&6 --echo "configure:20104: checking layout of installed files" >&5 -+echo "configure:20157: checking layout of installed files" >&5 +-echo "configure:19712: checking layout of installed files" >&5 ++echo "configure:19741: checking layout of installed files" >&5 # Check whether --with-layout or --without-layout was given. if test "${with_layout+set}" = set; then withval="$with_layout" -@@ -20132,7 +20185,7 @@ esac +@@ -19740,7 +19769,7 @@ php_with_config_file_path=DEFAULT echo $ac_n "checking path to configuration file""... $ac_c" 1>&6 --echo "configure:20136: checking path to configuration file" >&5 -+echo "configure:20189: checking path to configuration file" >&5 +-echo "configure:19744: checking path to configuration file" >&5 ++echo "configure:19773: checking path to 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" -@@ -20163,7 +20216,7 @@ if test "$PHP_CONFIG_FILE_PATH" = "DEFAU +@@ -19771,7 +19800,7 @@ fi echo $ac_n "checking where to scan for configuration files""... $ac_c" 1>&6 --echo "configure:20167: checking where to scan for configuration files" >&5 -+echo "configure:20220: checking where to scan for configuration files" >&5 +-echo "configure:19775: checking where to scan for configuration files" >&5 ++echo "configure:19804: checking where to scan for configuration files" >&5 php_with_config_file_scan_dir=DEFAULT -@@ -20196,7 +20249,7 @@ test -n "$DEBUG_CFLAGS" && CFLAGS="$CFLA +@@ -19804,7 +19833,7 @@ php_enable_safe_mode=no echo $ac_n "checking whether to enable safe mode by default""... $ac_c" 1>&6 --echo "configure:20200: checking whether to enable safe mode by default" >&5 -+echo "configure:20253: checking whether to enable safe mode by default" >&5 +-echo "configure:19808: checking whether to enable safe mode by default" >&5 ++echo "configure:19837: 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" -@@ -20228,7 +20281,7 @@ EOF +@@ -19836,7 +19865,7 @@ fi echo $ac_n "checking for safe mode exec dir""... $ac_c" 1>&6 --echo "configure:20232: checking for safe mode exec dir" >&5 -+echo "configure:20285: checking for safe mode exec dir" >&5 +-echo "configure:19840: checking for safe mode exec dir" >&5 ++echo "configure:19869: checking for safe mode exec dir" >&5 php_with_exec_dir=no -@@ -20269,7 +20322,7 @@ fi +@@ -19877,7 +19906,7 @@ php_enable_sigchild=no echo $ac_n "checking whether to enable PHP's own SIGCHLD handler""... $ac_c" 1>&6 --echo "configure:20273: checking whether to enable PHP's own SIGCHLD handler" >&5 -+echo "configure:20326: checking whether to enable PHP's own SIGCHLD handler" >&5 +-echo "configure:19881: checking whether to enable PHP's own SIGCHLD handler" >&5 ++echo "configure:19910: 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" -@@ -20304,7 +20357,7 @@ fi +@@ -19912,7 +19941,7 @@ php_enable_magic_quotes=no echo $ac_n "checking whether to enable magic quotes by default""... $ac_c" 1>&6 --echo "configure:20308: checking whether to enable magic quotes by default" >&5 -+echo "configure:20361: checking whether to enable magic quotes by default" >&5 +-echo "configure:19916: checking whether to enable magic quotes by default" >&5 ++echo "configure:19945: 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" -@@ -20339,7 +20392,7 @@ fi +@@ -19947,7 +19976,7 @@ php_enable_libgcc=no echo $ac_n "checking whether to explicitly link against libgcc""... $ac_c" 1>&6 --echo "configure:20343: checking whether to explicitly link against libgcc" >&5 -+echo "configure:20396: checking whether to explicitly link against libgcc" >&5 +-echo "configure:19951: checking whether to explicitly link against libgcc" >&5 ++echo "configure:19980: 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" -@@ -20416,7 +20469,7 @@ fi +@@ -20024,7 +20053,7 @@ php_enable_short_tags=yes echo $ac_n "checking whether to enable short tags by default""... $ac_c" 1>&6 --echo "configure:20420: checking whether to enable short tags by default" >&5 -+echo "configure:20473: checking whether to enable short tags by default" >&5 +-echo "configure:20028: checking whether to enable short tags by default" >&5 ++echo "configure:20057: 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" -@@ -20451,7 +20504,7 @@ fi +@@ -20059,7 +20088,7 @@ php_enable_dmalloc=no echo $ac_n "checking whether to enable dmalloc""... $ac_c" 1>&6 --echo "configure:20455: checking whether to enable dmalloc" >&5 -+echo "configure:20508: checking whether to enable dmalloc" >&5 +-echo "configure:20063: checking whether to enable dmalloc" >&5 ++echo "configure:20092: 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" -@@ -20472,7 +20525,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -20080,7 +20109,7 @@ if test "$PHP_DMALLOC" = "yes"; then echo $ac_n "checking for dmalloc_error in -ldmalloc""... $ac_c" 1>&6 --echo "configure:20476: checking for dmalloc_error in -ldmalloc" >&5 -+echo "configure:20529: checking for dmalloc_error in -ldmalloc" >&5 +-echo "configure:20084: checking for dmalloc_error in -ldmalloc" >&5 ++echo "configure:20113: checking for dmalloc_error in -ldmalloc" >&5 ac_lib_var=`echo dmalloc'_'dmalloc_error | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -20480,7 +20533,7 @@ else +@@ -20088,7 +20117,7 @@ ac_save_LIBS="$LIBS" LIBS="-ldmalloc $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:20548: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:20103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:20132: \"$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 -@@ -20536,7 +20589,7 @@ fi +@@ -20144,7 +20173,7 @@ php_enable_ipv6=yes echo $ac_n "checking whether to enable IPv6 support""... $ac_c" 1>&6 --echo "configure:20540: checking whether to enable IPv6 support" >&5 -+echo "configure:20593: checking whether to enable IPv6 support" >&5 +-echo "configure:20148: checking whether to enable IPv6 support" >&5 ++echo "configure:20177: checking whether to enable IPv6 support" >&5 # Check whether --enable-ipv6 or --disable-ipv6 was given. if test "${enable_ipv6+set}" = set; then enableval="$enable_ipv6" -@@ -20563,7 +20616,7 @@ EOF +@@ -20171,7 +20200,7 @@ fi echo $ac_n "checking how big to make fd sets""... $ac_c" 1>&6 --echo "configure:20567: checking how big to make fd sets" >&5 -+echo "configure:20620: checking how big to make fd sets" >&5 +-echo "configure:20175: checking how big to make fd sets" >&5 ++echo "configure:20204: checking how big to make fd sets" >&5 php_enable_fd_setsize=no -@@ -20631,7 +20684,7 @@ fi +@@ -20239,7 +20268,7 @@ echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:20635: checking size of long" >&5 -+echo "configure:20688: checking size of long" >&5 +-echo "configure:20243: checking size of long" >&5 ++echo "configure:20272: 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 -@@ -20639,9 +20692,10 @@ else +@@ -20247,18 +20276,19 @@ ac_cv_sizeof_long=8 else cat > conftest.$ac_ext < +-int main() +#include - main() ++main() { FILE *f=fopen("conftestval", "w"); -@@ -20650,7 +20704,7 @@ main() - exit(0); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long)); +- return(0); ++ exit(0); } EOF --if { (eval echo configure:20654: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:20708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:20262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:20292: \"$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 -@@ -20670,7 +20724,7 @@ EOF +@@ -20278,7 +20308,7 @@ echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:20674: checking size of int" >&5 -+echo "configure:20728: checking size of int" >&5 +-echo "configure:20282: checking size of int" >&5 ++echo "configure:20312: 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 -@@ -20678,9 +20732,10 @@ else +@@ -20286,18 +20316,19 @@ ac_cv_sizeof_int=4 else cat > conftest.$ac_ext < +-int main() +#include - main() ++main() { FILE *f=fopen("conftestval", "w"); -@@ -20689,7 +20744,7 @@ main() - exit(0); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int)); +- return(0); ++ exit(0); } EOF --if { (eval echo configure:20693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:20748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:20301: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:20332: \"$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 -@@ -20710,13 +20765,13 @@ EOF +@@ -20318,13 +20349,13 @@ echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:20714: checking for int32_t" >&5 -+echo "configure:20769: checking for int32_t" >&5 +-echo "configure:20322: checking for int32_t" >&5 ++echo "configure:20353: checking for int32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int_type_int32_t'+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:20794: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:20347: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20378: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int_type_int32_t=yes else -@@ -20758,13 +20813,13 @@ fi +@@ -20366,13 +20397,13 @@ echo $ac_n "checking for uint32_t""... $ac_c" 1>&6 --echo "configure:20762: checking for uint32_t" >&5 -+echo "configure:20817: checking for uint32_t" >&5 +-echo "configure:20370: checking for uint32_t" >&5 ++echo "configure:20401: checking for uint32_t" >&5 if eval "test \"`echo '$''{'ac_cv_int_type_uint32_t'+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:20842: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:20395: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:20426: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_int_type_uint32_t=yes else -@@ -20815,17 +20870,17 @@ stdlib.h +@@ -20423,17 +20454,17 @@ do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:20819: checking for $ac_hdr" >&5 -+echo "configure:20874: checking for $ac_hdr" >&5 +-echo "configure:20427: checking for $ac_hdr" >&5 ++echo "configure:20458: 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:20829: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:20884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +-{ (eval echo configure:20437: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:20468: \"$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* -@@ -20855,12 +20910,12 @@ done +@@ -20463,12 +20494,12 @@ for ac_func in strtoll atoll strftime do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:20859: checking for $ac_func" >&5 -+echo "configure:20914: checking for $ac_func" >&5 +-echo "configure:20467: checking for $ac_func" >&5 ++echo "configure:20498: 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:20942: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:20495: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:20526: \"$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 -@@ -20909,6 +20964,44 @@ done - - - -+php_with_system_tzdata=no -+ -+echo $ac_n "checking for use of system timezone data""... $ac_c" 1>&6 -+echo "configure:20971: checking for use of system timezone data" >&5 -+# Check whether --with-system-tzdata or --without-system-tzdata was given. -+if test "${with_system_tzdata+set}" = set; then -+ withval="$with_system_tzdata" -+ PHP_SYSTEM_TZDATA=$withval -+else -+ -+ PHP_SYSTEM_TZDATA=no -+ -+ -+fi -+ -+ -+ext_output=$PHP_SYSTEM_TZDATA -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_SYSTEM_TZDATA" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_SYSTEM_TZDATA 1 -+EOF -+ -+ -+ if test "$PHP_SYSTEM_TZDATA" != "yes"; then -+ cat >> confdefs.h <&6 --echo "configure:21349: checking which regex library to use" >&5 -+echo "configure:21442: checking which regex library to use" >&5 +-echo "configure:20957: checking which regex library to use" >&5 ++echo "configure:20988: checking which regex library to use" >&5 echo "$ac_t""$REGEX_TYPE" 1>&6 if test "$REGEX_TYPE" = "php"; then -@@ -21722,13 +21815,13 @@ elif test "$REGEX_TYPE" = "system"; then +@@ -21330,13 +21361,13 @@ EOF echo $ac_n "checking whether field re_magic exists in struct regex_t""... $ac_c" 1>&6 --echo "configure:21726: checking whether field re_magic exists in struct regex_t" >&5 -+echo "configure:21819: checking whether field re_magic exists in struct regex_t" >&5 +-echo "configure:21334: checking whether field re_magic exists in struct regex_t" >&5 ++echo "configure:21365: checking whether field re_magic exists in struct regex_t" >&5 if eval "test \"`echo '$''{'ac_cv_regex_t_re_magic'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < #include -@@ -21736,7 +21829,7 @@ int main() { +@@ -21344,7 +21375,7 @@ regex_t rt; rt.re_magic; ; return 0; } EOF --if { (eval echo configure:21740: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:21833: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:21348: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:21379: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* ac_cv_regex_t_re_magic=yes else -@@ -21762,7 +21855,7 @@ fi +@@ -21370,7 +21401,7 @@ php_enable_libxml=yes echo $ac_n "checking whether to enable LIBXML support""... $ac_c" 1>&6 --echo "configure:21766: checking whether to enable LIBXML support" >&5 -+echo "configure:21859: checking whether to enable LIBXML support" >&5 +-echo "configure:21374: checking whether to enable LIBXML support" >&5 ++echo "configure:21405: checking whether to enable LIBXML support" >&5 # Check whether --enable-libxml or --disable-libxml was given. if test "${enable_libxml+set}" = set; then enableval="$enable_libxml" -@@ -21807,7 +21900,7 @@ if test -z "$PHP_LIBXML_DIR"; then +@@ -21415,7 +21446,7 @@ php_with_libxml_dir=no echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:21811: checking libxml2 install dir" >&5 -+echo "configure:21904: checking libxml2 install dir" >&5 +-echo "configure:21419: checking libxml2 install dir" >&5 ++echo "configure:21450: checking libxml2 install dir" >&5 # Check whether --with-libxml-dir or --without-libxml-dir was given. if test "${with_libxml_dir+set}" = set; then withval="$with_libxml_dir" -@@ -21833,7 +21926,7 @@ if test "$PHP_LIBXML" != "no"; then +@@ -21441,7 +21472,7 @@ echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:21837: checking for xml2-config path" >&5 -+echo "configure:21930: checking for xml2-config path" >&5 +-echo "configure:21445: checking for xml2-config path" >&5 ++echo "configure:21476: checking for xml2-config path" >&5 if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -21991,7 +22084,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path +@@ -21599,7 +21630,7 @@ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:21995: checking whether libxml build works" >&5 -+echo "configure:22088: checking whether libxml build works" >&5 +-echo "configure:21603: checking whether libxml build works" >&5 ++echo "configure:21634: checking whether libxml build works" >&5 if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -22007,7 +22100,7 @@ else +@@ -21615,7 +21646,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:22115: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +-if { (eval echo configure:21630: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:21661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null then LIBS=$old_LIBS -@@ -22383,7 +22476,7 @@ fi +@@ -21991,7 +22022,7 @@ php_with_openssl=no echo $ac_n "checking for OpenSSL support""... $ac_c" 1>&6 --echo "configure:22387: checking for OpenSSL support" >&5 -+echo "configure:22480: checking for OpenSSL support" >&5 +-echo "configure:21995: checking for OpenSSL support" >&5 ++echo "configure:22026: checking for OpenSSL support" >&5 # Check whether --with-openssl or --without-openssl was given. if test "${with_openssl+set}" = set; then withval="$with_openssl" -@@ -22427,7 +22520,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -22035,7 +22066,7 @@ php_with_kerberos=no echo $ac_n "checking for Kerberos support""... $ac_c" 1>&6 --echo "configure:22431: checking for Kerberos support" >&5 -+echo "configure:22524: checking for Kerberos support" >&5 +-echo "configure:22039: checking for Kerberos support" >&5 ++echo "configure:22070: checking for Kerberos support" >&5 # Check whether --with-kerberos or --without-kerberos was given. if test "${with_kerberos+set}" = set; then withval="$with_kerberos" -@@ -22753,7 +22846,7 @@ EOF +@@ -22361,7 +22392,7 @@ # Extract the first word of "krb5-config", so it can be a program name with args. set dummy krb5-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:22757: checking for $ac_word" >&5 -+echo "configure:22850: checking for $ac_word" >&5 +-echo "configure:22365: checking for $ac_word" >&5 ++echo "configure:22396: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -23113,7 +23206,7 @@ fi +@@ -22721,7 +22752,7 @@ fi echo $ac_n "checking for DSA_get_default_method in -lssl""... $ac_c" 1>&6 --echo "configure:23117: checking for DSA_get_default_method in -lssl" >&5 -+echo "configure:23210: checking for DSA_get_default_method in -lssl" >&5 +-echo "configure:22725: checking for DSA_get_default_method in -lssl" >&5 ++echo "configure:22756: checking for DSA_get_default_method in -lssl" >&5 ac_lib_var=`echo ssl'_'DSA_get_default_method | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -23121,7 +23214,7 @@ else +@@ -22729,7 +22760,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:23229: \"$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 -@@ -23156,7 +23249,7 @@ else - fi - - echo $ac_n "checking for X509_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:23160: checking for X509_free in -lcrypto" >&5 -+echo "configure:23253: checking for X509_free in -lcrypto" >&5 - ac_lib_var=`echo crypto'_'X509_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 -@@ -23164,7 +23257,7 @@ else - 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:23272: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:22744: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:22775: \"$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 -@@ -23217,7 +23310,7 @@ fi +@@ -22782,7 +22813,7 @@ # Extract the first word of "pkg-config", so it can be a program name with args. set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:23221: checking for $ac_word" >&5 -+echo "configure:23314: checking for $ac_word" >&5 +-echo "configure:22786: checking for $ac_word" >&5 ++echo "configure:22817: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -23422,9 +23515,9 @@ fi +@@ -22987,9 +23018,9 @@ old_CPPFLAGS=$CPPFLAGS CPPFLAGS=-I$OPENSSL_INCDIR echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 --echo "configure:23426: checking for OpenSSL version" >&5 -+echo "configure:23519: checking for OpenSSL version" >&5 +-echo "configure:22991: checking for OpenSSL version" >&5 ++echo "configure:23022: checking for OpenSSL version" >&5 cat > conftest.$ac_ext < -@@ -23579,7 +23672,7 @@ rm -f conftest* +@@ -23144,7 +23175,7 @@ done echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:23583: checking for CRYPTO_free in -lcrypto" >&5 -+echo "configure:23676: checking for CRYPTO_free in -lcrypto" >&5 +-echo "configure:23148: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:23179: 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 -@@ -23587,7 +23680,7 @@ else +@@ -23152,7 +23183,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:23695: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:23167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:23198: \"$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 -@@ -23755,7 +23848,7 @@ fi +@@ -23320,7 +23351,7 @@ done echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 --echo "configure:23759: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+echo "configure:23852: checking for SSL_CTX_set_ssl_version in -lssl" >&5 +-echo "configure:23324: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:23355: 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 -@@ -23763,7 +23856,7 @@ else +@@ -23328,7 +23359,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:23871: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:23343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:23374: \"$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 -@@ -23939,7 +24032,7 @@ ext_output=$PHP_PCRE_REGEX +@@ -23481,7 +23512,7 @@ if test "$PHP_PCRE_REGEX" != "yes" && test "$PHP_PCRE_REGEX" != "no"; then echo $ac_n "checking for PCRE headers location""... $ac_c" 1>&6 --echo "configure:23943: checking for PCRE headers location" >&5 -+echo "configure:24036: checking for PCRE headers location" >&5 +-echo "configure:23485: checking for PCRE headers location" >&5 ++echo "configure:23516: checking for PCRE headers location" >&5 for i in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/include $PHP_PCRE_REGEX/include/pcre $PHP_PCRE_REGEX/local/include; do test -f $i/pcre.h && PCRE_INCDIR=$i done -@@ -23950,7 +24043,7 @@ echo "configure:23943: checking for PCRE +@@ -23492,7 +23523,7 @@ echo "$ac_t""$PCRE_INCDIR" 1>&6 echo $ac_n "checking for PCRE library location""... $ac_c" 1>&6 --echo "configure:23954: checking for PCRE library location" >&5 -+echo "configure:24047: checking for PCRE library location" >&5 +-echo "configure:23496: checking for PCRE library location" >&5 ++echo "configure:23527: checking for PCRE library location" >&5 for j in $PHP_PCRE_REGEX $PHP_PCRE_REGEX/$PHP_LIBDIR; do test -f $j/libpcre.a || test -f $j/libpcre.$SHLIB_SUFFIX_NAME && PCRE_LIBDIR=$j done -@@ -24372,7 +24465,7 @@ EOF +@@ -23914,7 +23945,7 @@ else echo $ac_n "checking for PCRE library to use""... $ac_c" 1>&6 --echo "configure:24376: checking for PCRE library to use" >&5 -+echo "configure:24469: checking for PCRE library to use" >&5 +-echo "configure:23918: checking for PCRE library to use" >&5 ++echo "configure:23949: checking for PCRE library to use" >&5 echo "$ac_t""bundled" 1>&6 pcrelib_sources="pcrelib/pcre_chartables.c pcrelib/pcre_ucd.c \ pcrelib/pcre_compile.c pcrelib/pcre_config.c pcrelib/pcre_exec.c \ -@@ -24709,7 +24802,7 @@ EOF +@@ -24251,7 +24282,7 @@ php_with_sqlite3=yes echo $ac_n "checking whether to enable the SQLite3 extension""... $ac_c" 1>&6 --echo "configure:24713: checking whether to enable the SQLite3 extension" >&5 -+echo "configure:24806: checking whether to enable the SQLite3 extension" >&5 +-echo "configure:24255: checking whether to enable the SQLite3 extension" >&5 ++echo "configure:24286: checking whether to enable the SQLite3 extension" >&5 # Check whether --with-sqlite3 or --without-sqlite3 was given. if test "${with_sqlite3+set}" = set; then withval="$with_sqlite3" -@@ -24764,7 +24857,7 @@ if test $PHP_SQLITE3 != "no"; then +@@ -24306,7 +24337,7 @@ if test $PHP_SQLITE3 != "yes"; then echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 --echo "configure:24768: checking for sqlite3 files in default path" >&5 -+echo "configure:24861: checking for sqlite3 files in default path" >&5 +-echo "configure:24310: checking for sqlite3 files in default path" >&5 ++echo "configure:24341: checking for sqlite3 files in default path" >&5 for i in $PHP_SQLITE3 /usr/local /usr; do if test -r $i/include/sqlite3.h; then SQLITE3_DIR=$i -@@ -24779,7 +24872,7 @@ echo "configure:24768: checking for sqli +@@ -24321,7 +24352,7 @@ fi echo $ac_n "checking for SQLite 3.3.9+""... $ac_c" 1>&6 --echo "configure:24783: checking for SQLite 3.3.9+" >&5 -+echo "configure:24876: checking for SQLite 3.3.9+" >&5 +-echo "configure:24325: checking for SQLite 3.3.9+" >&5 ++echo "configure:24356: checking for SQLite 3.3.9+" >&5 save_old_LDFLAGS=$LDFLAGS ac_stuff=" -@@ -24878,7 +24971,7 @@ echo "configure:24783: checking for SQLi +@@ -24420,7 +24451,7 @@ done echo $ac_n "checking for sqlite3_prepare_v2 in -lsqlite3""... $ac_c" 1>&6 --echo "configure:24882: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 -+echo "configure:24975: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 +-echo "configure:24424: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 ++echo "configure:24455: checking for sqlite3_prepare_v2 in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_prepare_v2 | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -24886,7 +24979,7 @@ else +@@ -24428,7 +24459,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:24994: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:24443: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:24474: \"$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 -@@ -25157,7 +25250,7 @@ fi +@@ -24699,7 +24730,7 @@ done echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 --echo "configure:25161: checking for sqlite3_key in -lsqlite3" >&5 -+echo "configure:25254: checking for sqlite3_key in -lsqlite3" >&5 +-echo "configure:24703: checking for sqlite3_key in -lsqlite3" >&5 ++echo "configure:24734: checking for sqlite3_key in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -25165,7 +25258,7 @@ else +@@ -24707,7 +24738,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:25273: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:24722: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:24753: \"$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 -@@ -25308,7 +25401,7 @@ fi +@@ -24850,7 +24881,7 @@ done echo $ac_n "checking for sqlite3_load_extension in -lsqlite3""... $ac_c" 1>&6 --echo "configure:25312: checking for sqlite3_load_extension in -lsqlite3" >&5 -+echo "configure:25405: checking for sqlite3_load_extension in -lsqlite3" >&5 +-echo "configure:24854: checking for sqlite3_load_extension in -lsqlite3" >&5 ++echo "configure:24885: checking for sqlite3_load_extension in -lsqlite3" >&5 ac_lib_var=`echo sqlite3'_'sqlite3_load_extension | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -25316,7 +25409,7 @@ else +@@ -24858,7 +24889,7 @@ ac_save_LIBS="$LIBS" LIBS="-lsqlite3 $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:25424: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:24873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:24904: \"$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 -@@ -25364,7 +25457,7 @@ fi +@@ -24906,7 +24937,7 @@ else echo $ac_n "checking bundled sqlite3 library""... $ac_c" 1>&6 --echo "configure:25368: checking bundled sqlite3 library" >&5 -+echo "configure:25461: checking bundled sqlite3 library" >&5 +-echo "configure:24910: checking bundled sqlite3 library" >&5 ++echo "configure:24941: checking bundled sqlite3 library" >&5 echo "$ac_t""yes" 1>&6 sqlite3_extra_sources="libsqlite/sqlite3.c" -@@ -25720,7 +25813,7 @@ fi +@@ -25262,7 +25293,7 @@ php_with_zlib=no echo $ac_n "checking for ZLIB support""... $ac_c" 1>&6 --echo "configure:25724: checking for ZLIB support" >&5 -+echo "configure:25817: checking for ZLIB support" >&5 +-echo "configure:25266: checking for ZLIB support" >&5 ++echo "configure:25297: checking for ZLIB support" >&5 # Check whether --with-zlib or --without-zlib was given. if test "${with_zlib+set}" = set; then withval="$with_zlib" -@@ -25764,7 +25857,7 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -25306,7 +25337,7 @@ php_with_zlib_dir=no echo $ac_n "checking if the location of ZLIB install directory is defined""... $ac_c" 1>&6 --echo "configure:25768: checking if the location of ZLIB install directory is defined" >&5 -+echo "configure:25861: checking if the location of ZLIB install directory is defined" >&5 +-echo "configure:25310: checking if the location of ZLIB install directory is defined" >&5 ++echo "configure:25341: checking if the location of ZLIB install directory is defined" >&5 # Check whether --with-zlib-dir or --without-zlib-dir was given. if test "${with_zlib_dir+set}" = set; then withval="$with_zlib_dir" -@@ -26207,7 +26300,7 @@ EOF +@@ -25749,7 +25780,7 @@ done echo $ac_n "checking for gzgets in -lz""... $ac_c" 1>&6 --echo "configure:26211: checking for gzgets in -lz" >&5 -+echo "configure:26304: checking for gzgets in -lz" >&5 +-echo "configure:25753: checking for gzgets in -lz" >&5 ++echo "configure:25784: 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 -@@ -26215,7 +26308,7 @@ else +@@ -25757,7 +25788,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:26323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:25772: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:25803: \"$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 -@@ -26363,18 +26456,18 @@ fi +@@ -25905,10 +25936,999 @@ --php_enable_bcmath=no +php_enable_apc=no - --echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6 --echo "configure:26370: checking whether to enable 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" -- PHP_BCMATH=$enableval ++ +echo $ac_n "checking whether to enable APC support""... $ac_c" 1>&6 -+echo "configure:26463: checking whether to enable APC support" >&5 ++echo "configure:25943: checking whether to enable APC support" >&5 +# Check whether --enable-apc or --disable-apc was given. +if test "${enable_apc+set}" = set; then + enableval="$enable_apc" + PHP_APC=$enableval - else - -- PHP_BCMATH=no -- test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL ++else ++ + PHP_APC=no + test "$PHP_ENABLE_ALL" && PHP_APC=$PHP_ENABLE_ALL - - fi - -@@ -26382,12 +26475,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_BCMATH in ++ ++fi ++ ++ ++ ++ext_output="yes, shared" ++ext_shared=yes +case $PHP_APC in - shared,*) -- PHP_BCMATH=`echo "$PHP_BCMATH"|$SED 's/^shared,//'` ++shared,*) + PHP_APC=`echo "$PHP_APC"|$SED 's/^shared,//'` - ;; - shared) -- PHP_BCMATH=yes ++ ;; ++shared) + PHP_APC=yes - ;; - no) - ext_output=no -@@ -26406,396 +26499,481 @@ echo "$ac_t""$ext_output" 1>&6 - - - --if test "$PHP_BCMATH" != "no"; then ++ ;; ++no) ++ ext_output=no ++ ext_shared=no ++ ;; ++*) ++ ext_output=yes ++ ext_shared=no ++ ;; ++esac ++ ++ ++ ++echo "$ac_t""$ext_output" 1>&6 ++ ++ ++ ++ +# Check whether --enable-apc-debug or --disable-apc-debug was given. +if test "${enable_apc_debug+set}" = set; then + enableval="$enable_apc_debug" - -- ext_builddir=ext/bcmath -- ext_srcdir=$abs_srcdir/ext/bcmath ++ + PHP_APC_DEBUG=yes - -- ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` -- -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_BCMATH_SHARED=no -- -- -- case ext/bcmath in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- ++ +else - ++ + PHP_APC_DEBUG=no - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo ++ +fi - - -- old_IFS=$IFS -- for ac_src in bcmath.c \ --libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ --libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ --libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ --libbcmath/src/rmzero.c libbcmath/src/str2num.c; do ++ ++ +echo $ac_n "checking whether we should enable cache request file info""... $ac_c" 1>&6 -+echo "configure:26517: checking whether we should enable cache request file info" >&5 ++echo "configure:25997: checking whether we should enable cache request file info" >&5 +# Check whether --enable-apc-filehits or --disable-apc-filehits was given. +if test "${enable_apc_filehits+set}" = set; then + enableval="$enable_apc_filehits" - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ + PHP_APC_FILEHITS=$enableval + echo "$ac_t""$enableval" 1>&6 - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac ++ +else + + PHP_APC_FILEHITS=no + echo "$ac_t""no" 1>&6 - -- cat >>Makefile.objects<&6 -+echo "configure:26534: checking whether we should use mmap" >&5 ++echo "configure:26014: checking whether we should use mmap" >&5 +# Check whether --enable-apc-mmap or --disable-apc-mmap was given. +if test "${enable_apc_mmap+set}" = set; then + enableval="$enable_apc_mmap" - ++ + PHP_APC_MMAP=$enableval + echo "$ac_t""$enableval" 1>&6 + +else - ++ + PHP_APC_MMAP=yes + echo "$ac_t""yes" 1>&6 - -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo ++ +fi - - -- old_IFS=$IFS -- for ac_src in bcmath.c \ --libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ --libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ --libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ --libbcmath/src/rmzero.c libbcmath/src/str2num.c; do ++ ++ +echo $ac_n "checking whether we should use semaphore locking instead of fcntl""... $ac_c" 1>&6 -+echo "configure:26551: checking whether we should use semaphore locking instead of fcntl" >&5 ++echo "configure:26031: checking whether we should use semaphore locking instead of fcntl" >&5 +# Check whether --enable-apc-sem or --disable-apc-sem was given. +if test "${enable_apc_sem+set}" = set; then + enableval="$enable_apc_sem" - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac ++ + PHP_APC_SEM=$enableval + echo "$ac_t""$enableval" 1>&6 - -- cat >>Makefile.objects<&6 - -- case $host_alias in -- *netware*) -- -- install_modules="install-modules" ++ +fi - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpbcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(PHPBCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpbcmath.so '$ext_builddir'/phpbcmath.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBCMATH, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(PHPBCMATH_SHARED_LIBADD)' -- ;; -- esac - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix" -- fi ++ ++ +echo $ac_n "checking whether we should use pthread mutex locking""... $ac_c" 1>&6 -+echo "configure:26568: checking whether we should use pthread mutex locking" >&5 ++echo "configure:26048: checking whether we should use pthread mutex locking" >&5 +# Check whether --enable-apc-pthreadmutex or --disable-apc-pthreadmutex was given. +if test "${enable_apc_pthreadmutex+set}" = set; then + enableval="$enable_apc_pthreadmutex" - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" -- -- cat >>Makefile.objects<&6 - --EOF ++ +else + + PHP_APC_PTHREADMUTEX=yes + echo "$ac_t""yes" 1>&6 - -- ;; -- *) -- -- install_modules="install-modules" ++ +fi - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/bcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(BCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/bcmath.so '$ext_builddir'/bcmath.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(BCMATH, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(BCMATH_SHARED_LIBADD)' -- ;; -- esac - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix" -- fi ++ ++ +if test "$PHP_APC_PTHREADMUTEX" != "no"; then + orig_LIBS="$LIBS" + LIBS="$LIBS -lpthread" + if test "$cross_compiling" = yes; then - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" ++ + + + case pthread in @@ -5502,20 +5063,15 @@ + LIBS="-lpthread $LIBS" + ;; + esac - -- cat >>Makefile.objects< conftest.$ac_ext < + #include + main() { @@ -5547,8 +5103,8 @@ + return 0; + } + - EOF -+if { (eval echo configure:26638: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++EOF ++if { (eval echo configure:26118: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null +then + + @@ -5558,15 +5114,8 @@ + LIBS="-lpthread $LIBS" + ;; + esac - -- ;; -- esac -- cat >> confdefs.h <&5 @@ -5578,149 +5127,66 @@ +fi +rm -fr conftest* +fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_BCMATH_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -- -- case ext/bcmath in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac ++ + LIBS="$orig_LIBS" +fi + +echo $ac_n "checking whether we should use spin locks""... $ac_c" 1>&6 -+echo "configure:26666: checking whether we should use spin locks" >&5 ++echo "configure:26146: checking whether we should use spin locks" >&5 +# Check whether --enable-apc-spinlocks or --disable-apc-spinlocks was given. +if test "${enable_apc_spinlocks+set}" = set; then + enableval="$enable_apc_spinlocks" - ++ + PHP_APC_SPINLOCKS=$enableval + echo "$ac_t""$enableval" 1>&6 + +else - ++ + PHP_APC_SPINLOCKS=no + echo "$ac_t""no" 1>&6 - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo ++ +fi - - -- old_IFS=$IFS -- for ac_src in bcmath.c \ --libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ --libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ --libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ --libbcmath/src/rmzero.c libbcmath/src/str2num.c; do ++ ++ +echo $ac_n "checking whether we should enable memory protection""... $ac_c" 1>&6 -+echo "configure:26683: checking whether we should enable memory protection" >&5 ++echo "configure:26163: checking whether we should enable memory protection" >&5 +# Check whether --enable-apc-memprotect or --disable-apc-memprotect was given. +if test "${enable_apc_memprotect+set}" = set; then + enableval="$enable_apc_memprotect" - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ + PHP_APC_MEMPROTECT=$enableval + echo "$ac_t""$enableval" 1>&6 - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac ++ +else + + PHP_APC_MEMPROTECT=no + echo "$ac_t""no" 1>&6 - -- cat >>Makefile.objects<> confdefs.h <<\EOF +#define APC_MMAP 1 +EOF - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo ++ + test "$PHP_APC_FILEHITS" != "no" && cat >> confdefs.h <<\EOF +#define APC_FILEHITS 1 +EOF - - -- old_IFS=$IFS -- for ac_src in bcmath.c \ --libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ --libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ --libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ --libbcmath/src/rmzero.c libbcmath/src/str2num.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" ++ ++ + if test "$PHP_APC_DEBUG" != "no"; then + cat >> confdefs.h <<\EOF +#define __DEBUG_APC__ 1 +EOF - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac ++ + fi - -- cat >>Makefile.objects<> confdefs.h <<\EOF +#define APC_SEM_LOCKS 1 - EOF -- done - ++EOF ++ + elif test "$PHP_APC_SPINLOCKS" != "no"; then + cat >> confdefs.h <<\EOF +#define APC_SPIN_LOCKS 1 @@ -5730,36 +5196,23 @@ + cat >> confdefs.h <<\EOF +#define APC_PTHREADMUTEX_LOCKS 1 +EOF - -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath" -- fi -- -- -- BUILD_DIR="$BUILD_DIR $ext_builddir" -- ++ + else + cat >> confdefs.h <<\EOF +#define APC_FCNTL_LOCKS 1 +EOF - ++ + fi + + if test "$PHP_APC_MEMPROTECT" != "no"; then + cat >> confdefs.h <<\EOF +#define APC_MEMPROTECT 1 +EOF - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=bcmath -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" ++ + fi - -- fi ++ + echo $ac_n "checking for zend_set_lookup_function_hook""... $ac_c" 1>&6 -+echo "configure:26746: checking for zend_set_lookup_function_hook" >&5 ++echo "configure:26226: checking for zend_set_lookup_function_hook" >&5 +if eval "test \"`echo '$''{'php_cv_zend_set_lookup_function_hook'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else @@ -5767,9 +5220,9 @@ + orig_cflags=$CFLAGS + CFLAGS="$INCLUDES $EXTRA_INCLUDES" + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:26246: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* - ++ + php_cv_zend_set_lookup_function_hook=yes + +else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* - -- BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src" ++ + php_cv_zend_set_lookup_function_hook=no + +fi +rm -f conftest* + CFLAGS=$orig_cflags - ++ +fi - -- cat >> confdefs.h <<\EOF --#define HAVE_BCMATH 1 ++ +echo "$ac_t""$php_cv_zend_set_lookup_function_hook" 1>&6 + if test "$php_cv_zend_set_lookup_function_hook" = "yes"; then + cat >> confdefs.h <<\EOF +#define APC_HAVE_LOOKUP_HOOKS 1 - EOF - --fi ++EOF ++ + else + cat >> confdefs.h <<\EOF +#define APC_HAVE_LOOKUP_HOOKS 0 +EOF + + fi - ++ + for ac_func in sigaction +do +echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:26800: checking for $ac_func" >&5 ++echo "configure:26280: 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 <&6 --echo "configure:26735: checking for BZip2 support" >&5 --# Check whether --with-bz2 or --without-bz2 was given. --if test "${with_bz2+set}" = set; then -- withval="$with_bz2" -- PHP_BZ2=$withval ++ +; return 0; } +EOF -+if { (eval echo configure:26828: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:26308: \"$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 @@ -5877,17 +5319,15 @@ +done + + echo $ac_n "checking for union semun""... $ac_c" 1>&6 -+echo "configure:26853: checking for union semun" >&5 ++echo "configure:26333: checking for union semun" >&5 +if eval "test \"`echo '$''{'php_cv_semun'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 - else - -- PHP_BZ2=no -- test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL ++else ++ + cat > conftest.$ac_ext < +#include +#include @@ -5896,7 +5336,7 @@ +union semun x; x.val=1 +; return 0; } +EOF -+if { (eval echo configure:26870: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:26350: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + php_cv_semun=yes @@ -5911,45 +5351,23 @@ +fi +rm -f conftest* + - fi - ++fi ++ +echo "$ac_t""$php_cv_semun" 1>&6 + if test "$php_cv_semun" = "yes"; then + cat >> confdefs.h <<\EOF +#define HAVE_SEMUN 1 +EOF - ++ + else + cat >> confdefs.h <<\EOF +#define HAVE_SEMUN 0 +EOF - --ext_output="yes, shared" --ext_shared=yes --case $PHP_BZ2 in --shared,*) -- PHP_BZ2=`echo "$PHP_BZ2"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_BZ2=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 ++ + fi - ++ + echo $ac_n "checking whether we should enable valgrind support""... $ac_c" 1>&6 -+echo "configure:26901: checking whether we should enable valgrind support" >&5 ++echo "configure:26381: checking whether we should enable valgrind support" >&5 + # Check whether --enable-valgrind-checks or --disable-valgrind-checks was given. +if test "${enable_valgrind_checks+set}" = set; then + enableval="$enable_valgrind_checks" @@ -5963,17 +5381,17 @@ + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "valgrind/memcheck.h" | sed 'y%./+-%__p_%'` +echo $ac_n "checking for valgrind/memcheck.h""... $ac_c" 1>&6 -+echo "configure:26915: checking for valgrind/memcheck.h" >&5 ++echo "configure:26395: checking for valgrind/memcheck.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:26925: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:26405: \"$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* @@ -5992,33 +5410,15 @@ + cat >> confdefs.h <<\EOF +#define HAVE_VALGRIND_MEMCHECK_H 1 +EOF - ++ +else + echo "$ac_t""no" 1>&6 +fi - ++ + +fi - --if test "$PHP_BZ2" != "no"; then -- if test -r $PHP_BZ2/include/bzlib.h; then -- BZIP_DIR=$PHP_BZ2 -- else -- echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 --echo "configure:26780: 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 -- echo "$ac_t""found in $i" 1>&6 -- break -- fi -- done -- fi - -- if test -z "$BZIP_DIR"; then -- echo "$ac_t""not found" 1>&6 -- { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; } -- fi ++ ++ + apc_sources="apc.c php_apc.c \ + apc_cache.c \ + apc_compile.c \ @@ -6040,460 +5440,467 @@ + apc_iterator.c \ + apc_bin.c \ + apc_string.c " - - - save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$BZIP_DIR/$PHP_LIBDIR -- " ++ ++ ++ save_old_LDFLAGS=$LDFLAGS + ac_stuff="" - - save_ext_shared=$ext_shared - ext_shared=yes -@@ -26888,27 +27066,27 @@ echo "configure:26780: checking for BZip - esac - done - -- echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 --echo "configure:26893: checking for BZ2_bzerror in -lbz2" >&5 --ac_lib_var=`echo bz2'_'BZ2_bzerror | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for shm_open in -lrt""... $ac_c" 1>&6 -+echo "configure:27071: checking for shm_open in -lrt" >&5 -+ac_lib_var=`echo rt'_'shm_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="-lbz2 $LIBS" -+LIBS="-lrt $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:27090: \"$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 -@@ -26927,167 +27105,53 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -- -- if test "$BZIP_DIR/include" != "/usr/include"; then -- -- if test -z "$BZIP_DIR/include" || echo "$BZIP_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$BZIP_DIR/include -- else -- -- ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -- -- -- -- if test "$ext_shared" = "yes"; then -- BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD" -- if test -n "$BZIP_DIR/$PHP_LIBDIR"; then -- -- if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$BZIP_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- BZ2_SHARED_LIBADD="-L$ai_p $BZ2_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && BZ2_SHARED_LIBADD="$ld_runpath_switch$ai_p $BZ2_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 "$BZIP_DIR/$PHP_LIBDIR"; then -- -- if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$BZIP_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`" -- fi -- -- -+ case rt in ++ ++ save_ext_shared=$ext_shared ++ ext_shared=yes ++ ++ for ac_i in $ac_stuff; do ++ case $ac_i in ++ -pthread) ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="$LDFLAGS -pthread" ++ else ++ ++ ++ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` ++ ++ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" ++ if test -n "$unique" && test "`eval $cmd`" = "" ; then ++ eval "EXTRA_LDFLAGS$unique=set" ++ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" ++ fi ++ ++ fi ++ ;; ++ -l*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ ++ case $ac_ii in + c|c_r|pthread*) ;; + *) + if test "$ext_shared" = "yes"; then -+ APC_SHARED_LIBADD="-lrt $APC_SHARED_LIBADD" ++ LDFLAGS="$LDFLAGS -l$ac_ii" + 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 -- -- -- case bz2 in -+ case rt in - c|c_r|pthread*) ;; - *) -- LIBS="-lbz2 $LIBS" -+ LIBS="-lrt $LIBS" - ;; - esac - - ++ ++ ++ case $ac_ii in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="$LIBS -l$ac_ii" ++ ;; ++ esac ++ ++ + fi + ;; + esac - - -- fi -- -- -- cat >> confdefs.h <<\EOF --#define HAVE_BZ2 1 --EOF -- -- - - else - echo "$ac_t""no" 1>&6 - - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_bz2_BZ2_bzerror ++ ++ ++ ;; ++ -L*) ++ ac_ii=`echo $ac_i|cut -c 3-` ++ ++ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then ++ ++ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then ++ ai_p=$ac_ii ++ else ++ ++ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" ++ ++ ep_realdir="`(cd \"$ep_dir\" && pwd)`" ++ ai_p="$ep_realdir/`basename \"$ac_ii\"`" ++ fi ++ ++ ++ if test "$ext_shared" = "yes"; then ++ LDFLAGS="-L$ai_p $LDFLAGS" ++ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" ++ 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 ++ ++ ;; ++ esac ++ done ++ ++ echo $ac_n "checking for shm_open in -lrt""... $ac_c" 1>&6 ++echo "configure:26551: checking for shm_open in -lrt" >&5 ++ac_lib_var=`echo rt'_'shm_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="-lrt $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 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared ++ ++ ++ case rt in ++ c|c_r|pthread*) ;; ++ *) ++ if test "$ext_shared" = "yes"; then ++ APC_SHARED_LIBADD="-lrt $APC_SHARED_LIBADD" ++ else ++ ++ ++ case rt in ++ c|c_r|pthread*) ;; ++ *) ++ LIBS="-lrt $LIBS" ++ ;; ++ esac ++ ++ ++ fi ++ ;; ++ esac ++ ++ ++ ++else ++ echo "$ac_t""no" 1>&6 ++ ++ LDFLAGS=$save_old_LDFLAGS ++ ext_shared=$save_ext_shared + unset ac_cv_lib_rt_shm_open - -- { echo "configure: error: bz2 module requires libbz2 >= 1.0.0" 1>&2; exit 1; } -- - - fi - -- - -- ext_builddir=ext/bz2 -- ext_srcdir=$abs_srcdir/ext/bz2 ++ ++ ++fi ++ ++ + ext_builddir=ext/apc + ext_srcdir=$abs_srcdir/ext/apc - -- ac_extra= ++ + ac_extra=`echo "\\$(APC_CFLAGS)"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_BZ2_SHARED=no ++ ++ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then + PHP_APC_SHARED=no - - -- case ext/bz2 in ++ ++ + case ext/apc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; ++ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; + /*) ac_srcdir=`echo "ext/apc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; + *) ac_srcdir="$abs_srcdir/ext/apc/"; ac_bdir="ext/apc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -27102,7 +27166,7 @@ fi - - - old_IFS=$IFS -- for ac_src in bz2.c bz2_filter.c; do ++ esac ++ ++ ++ ++ b_c_pre=$php_c_pre ++ b_cxx_pre=$php_cxx_pre ++ b_c_meta=$php_c_meta ++ b_cxx_meta=$php_cxx_meta ++ b_c_post=$php_c_post ++ b_cxx_post=$php_cxx_post ++ b_lo=$php_lo ++ ++ ++ old_IFS=$IFS + for ac_src in $apc_sources; do - - IFS=. - set $ac_src -@@ -27125,18 +27189,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC bz2" ++ ++ IFS=. ++ set $ac_src ++ ac_obj=$1 ++ IFS=$old_IFS ++ ++ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" ++ ++ case $ac_src in ++ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; ++ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; ++ esac ++ ++ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <>Makefile.objects<>Makefile.objects<> confdefs.h <<\EOF +#define HAVE_APC 1 +EOF - - fi - - - --php_enable_calendar=no - --echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6 --echo "configure:27380: 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" -- PHP_CALENDAR=$enableval -+php_enable_bcmath=no + -+echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6 -+echo "configure:27452: checking whether to enable 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" -+ PHP_BCMATH=$enableval - else - -- PHP_CALENDAR=no -- test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL -+ PHP_BCMATH=no -+ test "$PHP_ENABLE_ALL" && PHP_BCMATH=$PHP_ENABLE_ALL - - fi - -@@ -27392,12 +27464,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_CALENDAR in -+case $PHP_BCMATH in - shared,*) -- PHP_CALENDAR=`echo "$PHP_CALENDAR"|$SED 's/^shared,//'` -+ PHP_BCMATH=`echo "$PHP_BCMATH"|$SED 's/^shared,//'` - ;; - shared) -- PHP_CALENDAR=yes -+ PHP_BCMATH=yes - ;; - no) - ext_output=no -@@ -27416,25 +27488,21 @@ echo "$ac_t""$ext_output" 1>&6 - - - --if test "$PHP_CALENDAR" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_CALENDAR 1 --EOF -- -+if test "$PHP_BCMATH" != "no"; then - -- ext_builddir=ext/calendar -- ext_srcdir=$abs_srcdir/ext/calendar -+ ext_builddir=ext/bcmath -+ ext_srcdir=$abs_srcdir/ext/bcmath - -- ac_extra= -+ ac_extra=`echo "-I@ext_srcdir@/libbcmath/src"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_CALENDAR_SHARED=no -+ PHP_BCMATH_SHARED=no - - -- case ext/calendar in -+ case ext/bcmath in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -27449,7 +27517,11 @@ EOF ++fi ++ ++ ++ ++ + php_enable_bcmath=no + echo $ac_n "checking whether to enable bc style precision math functions""... $ac_c" 1>&6 +-echo "configure:25912: checking whether to enable bc style precision math functions" >&5 ++echo "configure:26932: checking whether to enable 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" +@@ -26273,7 +27293,7 @@ + php_with_bz2=no - old_IFS=$IFS -- for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do -+ for ac_src in bcmath.c \ -+libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ -+libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ -+libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ -+libbcmath/src/rmzero.c libbcmath/src/str2num.c; do - - IFS=. - set $ac_src -@@ -27472,18 +27544,18 @@ EOF + echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6 +-echo "configure:26277: checking for BZip2 support" >&5 ++echo "configure:27297: checking for BZip2 support" >&5 + # Check whether --with-bz2 or --without-bz2 was given. + if test "${with_bz2+set}" = set; then + withval="$with_bz2" +@@ -26318,7 +27338,7 @@ + BZIP_DIR=$PHP_BZ2 + else + echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 +-echo "configure:26322: checking for BZip2 in default path" >&5 ++echo "configure:27342: 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 +@@ -26431,7 +27451,7 @@ done - -- EXT_STATIC="$EXT_STATIC calendar" -+ EXT_STATIC="$EXT_STATIC bcmath" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC calendar" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath" - fi + echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 +-echo "configure:26435: checking for BZ2_bzerror in -lbz2" >&5 ++echo "configure:27455: 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 +@@ -26439,7 +27459,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:27474: \"$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 +@@ -26918,7 +27938,7 @@ + php_enable_calendar=no + + echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6 +-echo "configure:26922: checking whether to enable calendar conversion support" >&5 ++echo "configure:27942: 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" +@@ -27262,7 +28282,7 @@ + php_enable_ctype=yes + + echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6 +-echo "configure:27266: checking whether to enable ctype functions" >&5 ++echo "configure:28286: checking whether to enable ctype functions" >&5 + # Check whether --enable-ctype or --disable-ctype was given. + if test "${enable_ctype+set}" = set; then + enableval="$enable_ctype" +@@ -27606,7 +28626,7 @@ + php_with_curl=no + + echo $ac_n "checking for cURL support""... $ac_c" 1>&6 +-echo "configure:27610: checking for cURL support" >&5 ++echo "configure:28630: checking for cURL support" >&5 + # Check whether --with-curl or --without-curl was given. + if test "${with_curl+set}" = set; then + withval="$with_curl" +@@ -27650,7 +28670,7 @@ + php_with_curlwrappers=no + + echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6 +-echo "configure:27654: checking if we should use cURL for url streams" >&5 ++echo "configure:28674: checking if we should use cURL for url streams" >&5 + # Check whether --with-curlwrappers or --without-curlwrappers was given. + if test "${with_curlwrappers+set}" = set; then + withval="$with_curlwrappers" +@@ -27674,7 +28694,7 @@ + CURL_DIR=$PHP_CURL else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_CALENDAR_SHARED=yes -+ PHP_BCMATH_SHARED=yes - -- case ext/calendar in -+ case ext/bcmath in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -27498,14 +27570,18 @@ EOF - - - old_IFS=$IFS -- for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do -+ for ac_src in bcmath.c \ -+libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ -+libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ -+libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ -+libbcmath/src/rmzero.c libbcmath/src/str2num.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo" -+ shared_objects_bcmath="$shared_objects_bcmath $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -27528,31 +27604,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpcalendar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) $(PHPCALENDAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpcalendar.so '$ext_builddir'/phpcalendar.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpbcmath.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(PHPBCMATH_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpbcmath.so '$ext_builddir'/phpbcmath.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCALENDAR, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPBCMATH, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_calendar) $(PHPCALENDAR_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_bcmath) $(PHPBCMATH_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpcalendar.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpbcmath.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpcalendar.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpbcmath.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" - - cat >>Makefile.objects<&6 +-echo "configure:27678: checking for cURL in default path" >&5 ++echo "configure:28698: 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 +@@ -27692,7 +28712,7 @@ + + CURL_CONFIG="curl-config" + echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6 +-echo "configure:27696: checking for cURL 7.10.5 or greater" >&5 ++echo "configure:28716: checking for cURL 7.10.5 or greater" >&5 + + if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then + CURL_CONFIG=${CURL_DIR}/bin/curl-config +@@ -27930,7 +28950,7 @@ + + + echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 +-echo "configure:27934: checking for SSL support in libcurl" >&5 ++echo "configure:28954: checking for SSL support in libcurl" >&5 + CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` + if test "$CURL_SSL" = "SSL"; then + echo "$ac_t""yes" 1>&6 +@@ -27943,7 +28963,7 @@ + CFLAGS="`$CURL_CONFIG --cflags`" + + echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 +-echo "configure:27947: checking how to run the C preprocessor" >&5 ++echo "configure:28967: checking how to run the C preprocessor" >&5 + # On Suns, sometimes $CPP names a directory. + if test -n "$CPP" && test -d "$CPP"; then + CPP= +@@ -27958,13 +28978,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:27968: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:28988: \"$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 + : +@@ -27975,13 +28995,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:27985: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29005: \"$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 + : +@@ -27992,13 +29012,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:28002: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29022: \"$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 + : +@@ -28023,14 +29043,14 @@ + echo "$ac_t""$CPP" 1>&6 - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/calendar.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/bcmath.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/calendar.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/bcmath.$suffix" - fi + echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 +-echo "configure:28027: checking for openssl support in libcurl" >&5 ++echo "configure:29047: checking for openssl support in libcurl" >&5 + if test "$cross_compiling" = yes; then -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bcmath" - - cat >>Makefile.objects<&6 + + else + cat > conftest.$ac_ext < +@@ -28049,7 +29069,7 @@ + } + EOF -@@ -27597,22 +27673,22 @@ EOF - ;; - esac - cat >> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:29073: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + echo "$ac_t""yes" 1>&6 +@@ -28057,17 +29077,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:28061: checking for $ac_hdr" >&5 ++echo "configure:29081: 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:28071: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29091: \"$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* +@@ -28112,14 +29132,14 @@ - fi - fi - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_CALENDAR_SHARED=no -+ PHP_BCMATH_SHARED=no - case "$PHP_SAPI" in - cgi|embed) - - -- case ext/calendar in -+ case ext/bcmath in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - + + echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 +-echo "configure:28116: checking for gnutls support in libcurl" >&5 ++echo "configure:29136: checking for gnutls support in libcurl" >&5 + if test "$cross_compiling" = yes; then -@@ -27627,7 +27703,11 @@ EOF + echo "$ac_t""no" 1>&6 + + else + cat > conftest.$ac_ext < +@@ -28138,23 +29158,23 @@ + } - old_IFS=$IFS -- for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do -+ for ac_src in bcmath.c \ -+libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ -+libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ -+libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ -+libbcmath/src/rmzero.c libbcmath/src/str2num.c; do + EOF +-if { (eval echo configure:28142: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:29162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then - IFS=. - set $ac_src -@@ -27650,15 +27730,15 @@ EOF + echo "$ac_t""yes" 1>&6 + ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 +-echo "configure:28148: checking for gcrypt.h" >&5 ++echo "configure:29168: checking for gcrypt.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:28158: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:29178: \"$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* +@@ -28296,7 +29316,7 @@ done + echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 +-echo "configure:28300: checking for curl_easy_perform in -lcurl" >&5 ++echo "configure:29320: 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 +@@ -28304,7 +29324,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:29339: \"$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 +@@ -28451,7 +29471,7 @@ + done -- EXT_STATIC="$EXT_STATIC calendar" -+ EXT_STATIC="$EXT_STATIC bcmath" - ;; - *) - - -- case ext/calendar in -+ case ext/bcmath in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/bcmath"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/bcmath/"; ac_bdir="ext/bcmath/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -27673,7 +27753,11 @@ EOF + echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6 +-echo "configure:28455: checking for curl_version_info in -lcurl" >&5 ++echo "configure:29475: checking for curl_version_info in -lcurl" >&5 + ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -28459,7 +29479,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:29494: \"$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 +@@ -28604,7 +29624,7 @@ + done + echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 +-echo "configure:28608: checking for curl_easy_strerror in -lcurl" >&5 ++echo "configure:29628: checking for curl_easy_strerror in -lcurl" >&5 + ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -28612,7 +29632,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:29647: \"$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 +@@ -28757,7 +29777,7 @@ + done - old_IFS=$IFS -- for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do -+ for ac_src in bcmath.c \ -+libbcmath/src/add.c libbcmath/src/div.c libbcmath/src/init.c libbcmath/src/neg.c libbcmath/src/outofmem.c libbcmath/src/raisemod.c libbcmath/src/rt.c libbcmath/src/sub.c \ -+libbcmath/src/compare.c libbcmath/src/divmod.c libbcmath/src/int2num.c libbcmath/src/num2long.c libbcmath/src/output.c libbcmath/src/recmul.c \ -+libbcmath/src/sqrt.c libbcmath/src/zero.c libbcmath/src/debug.c libbcmath/src/doaddsub.c libbcmath/src/nearzero.c libbcmath/src/num2str.c libbcmath/src/raise.c \ -+libbcmath/src/rmzero.c libbcmath/src/str2num.c; do - - IFS=. - set $ac_src -@@ -27698,7 +27782,7 @@ EOF + echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 +-echo "configure:28761: checking for curl_multi_strerror in -lcurl" >&5 ++echo "configure:29781: checking for curl_multi_strerror in -lcurl" >&5 + ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -28765,7 +29785,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:29800: \"$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 +@@ -29462,7 +30482,7 @@ + done - ;; - esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC calendar" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC bcmath" + echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6 +-echo "configure:29466: checking for dpopen in -l$LIB" >&5 ++echo "configure:30486: checking for dpopen in -l$LIB" >&5 + ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -29470,7 +30490,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:30505: \"$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 +@@ -29650,7 +30670,7 @@ + THIS_FULL_NAME="$THIS_NAME" fi - - -@@ -27707,28 +27791,37 @@ EOF - - - if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=calendar -+ PHP_PECL_EXTENSION=bcmath - - PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:29654: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:30674: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } fi +@@ -29678,7 +30698,7 @@ + THIS_FULL_NAME="$THIS_NAME" + fi + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:29682: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:30702: checking for $THIS_FULL_NAME support" >&5 + if test -n "You cannot combine --with-gdbm with --with-qdbm"; then + { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; } + fi +@@ -29797,7 +30817,7 @@ + done -+ -+ -+ BUILD_DIR="$BUILD_DIR $ext_builddir/libbcmath/src" -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_BCMATH 1 -+EOF -+ - fi - - - --php_enable_ctype=yes -+php_with_bz2=no - --echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6 --echo "configure:27724: checking whether to enable ctype functions" >&5 --# Check whether --enable-ctype or --disable-ctype was given. --if test "${enable_ctype+set}" = set; then -- enableval="$enable_ctype" -- PHP_CTYPE=$enableval -+echo $ac_n "checking for BZip2 support""... $ac_c" 1>&6 -+echo "configure:27817: checking for BZip2 support" >&5 -+# Check whether --with-bz2 or --without-bz2 was given. -+if test "${with_bz2+set}" = set; then -+ withval="$with_bz2" -+ PHP_BZ2=$withval + echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 +-echo "configure:29801: checking for gdbm_open in -lgdbm" >&5 ++echo "configure:30821: 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 +@@ -29805,7 +30825,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:30840: \"$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 - -- PHP_CTYPE=yes -- test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL -+ PHP_BZ2=no -+ test "$PHP_ENABLE_ALL" && PHP_BZ2=$PHP_ENABLE_ALL - - fi - -@@ -27736,12 +27829,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_CTYPE in -+case $PHP_BZ2 in - shared,*) -- PHP_CTYPE=`echo "$PHP_CTYPE"|$SED 's/^shared,//'` -+ PHP_BZ2=`echo "$PHP_BZ2"|$SED 's/^shared,//'` - ;; - shared) -- PHP_CTYPE=yes -+ PHP_BZ2=yes - ;; - no) - ext_output=no -@@ -27760,54 +27853,352 @@ echo "$ac_t""$ext_output" 1>&6 +@@ -29981,7 +31001,7 @@ + THIS_FULL_NAME="$THIS_NAME" + fi + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:29985: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31005: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } + fi +@@ -30110,7 +31130,7 @@ + done + echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6 +-echo "configure:30114: checking for dbm_open in -l$LIB" >&5 ++echo "configure:31134: 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 +@@ -30118,7 +31138,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:31153: \"$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 +@@ -30298,7 +31318,7 @@ + THIS_FULL_NAME="$THIS_NAME" + fi + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:30302: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31322: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } + fi +@@ -30382,7 +31402,7 @@ + LIBS="-l$LIB $LIBS" + + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31417: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + cat > conftest.$ac_ext <> confdefs.h <<\EOF --#define HAVE_CTYPE 1 --EOF -- -- -- ext_builddir=ext/ctype -- ext_srcdir=$abs_srcdir/ext/ctype -+if test "$PHP_BZ2" != "no"; then -+ if test -r $PHP_BZ2/include/bzlib.h; then -+ BZIP_DIR=$PHP_BZ2 -+ else -+ echo $ac_n "checking for BZip2 in default path""... $ac_c" 1>&6 -+echo "configure:27862: 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 -+ echo "$ac_t""found in $i" 1>&6 -+ break -+ fi -+ done -+ fi + #include "$THIS_INCLUDE" +@@ -30434,14 +31454,14 @@ + done + if test -z "$THIS_LIBS"; then + echo $ac_n "checking for DB4 major version""... $ac_c" 1>&6 +-echo "configure:30438: checking for DB4 major version" >&5 ++echo "configure:31458: checking for DB4 major version" >&5 + { echo "configure: error: Header contains different version" 1>&2; exit 1; } + fi + if test "4" = "4"; then + echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 +-echo "configure:30443: checking for DB4 minor version and patch level" >&5 ++echo "configure:31463: checking for DB4 minor version and patch level" >&5 + cat > conftest.$ac_ext <&6 -+ { echo "configure: error: Please reinstall the BZip2 distribution" 1>&2; exit 1; } -+ fi + #include "$THIS_INCLUDE" +@@ -30467,9 +31487,9 @@ + fi + if test "$ext_shared" = "yes"; then + echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 +-echo "configure:30471: checking if dba can be used as shared extension" >&5 ++echo "configure:31491: checking if dba can be used as shared extension" >&5 + cat > conftest.$ac_ext <&6 +-echo "configure:30630: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31650: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } + fi +@@ -30654,7 +31674,7 @@ + THIS_FULL_NAME="$THIS_NAME" + fi + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:30658: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31678: checking for $THIS_FULL_NAME support" >&5 + if test -n "You cannot combine --with-db3 with --with-db4"; then + { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; } + fi +@@ -30705,7 +31725,7 @@ + LIBS="-l$LIB $LIBS" -- case ext/ctype in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$BZIP_DIR/$PHP_LIBDIR -+ " + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:31740: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -+ save_ext_shared=$ext_shared -+ ext_shared=yes + cat > conftest.$ac_ext <&6 +-echo "configure:30761: checking for DB3 major version" >&5 ++echo "configure:31781: checking for DB3 major version" >&5 + { echo "configure: error: Header contains different version" 1>&2; exit 1; } + fi + if test "3" = "4"; then + echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 +-echo "configure:30766: checking for DB4 minor version and patch level" >&5 ++echo "configure:31786: checking for DB4 minor version and patch level" >&5 + cat > conftest.$ac_ext <&6 +-echo "configure:30794: checking if dba can be used as shared extension" >&5 ++echo "configure:31814: checking if dba can be used as shared extension" >&5 + cat > conftest.$ac_ext <&6 +-echo "configure:30953: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:31973: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } + fi +@@ -30977,7 +31997,7 @@ + THIS_FULL_NAME="$THIS_NAME" + fi + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:30981: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32001: checking for $THIS_FULL_NAME support" >&5 + if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then + { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; } + fi +@@ -31028,7 +32048,7 @@ + LIBS="-l$LIB $LIBS" -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in ctype.c; do -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:32063: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi + cat > conftest.$ac_ext </dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 -+ -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for BZ2_bzerror in -lbz2""... $ac_c" 1>&6 -+echo "configure:27975: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbz2 $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ if test "$BZIP_DIR/include" != "/usr/include"; then -+ -+ if test -z "$BZIP_DIR/include" || echo "$BZIP_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$BZIP_DIR/include -+ else -+ -+ ep_dir="`echo $BZIP_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$BZIP_DIR/include\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ BZ2_SHARED_LIBADD="-lbz2 $BZ2_SHARED_LIBADD" -+ if test -n "$BZIP_DIR/$PHP_LIBDIR"; then -+ -+ if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$BZIP_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ BZ2_SHARED_LIBADD="-L$ai_p $BZ2_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && BZ2_SHARED_LIBADD="$ld_runpath_switch$ai_p $BZ2_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 "$BZIP_DIR/$PHP_LIBDIR"; then -+ -+ if test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$BZIP_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$BZIP_DIR/$PHP_LIBDIR" || echo "$BZIP_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$BZIP_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $BZIP_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$BZIP_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ -+ -+ -+ 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 -+ -+ -+ case bz2 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lbz2 $LIBS" -+ ;; -+ esac -+ -+ -+ -+ -+ fi -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_BZ2 1 -+EOF -+ -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_bz2_BZ2_bzerror -+ -+ { echo "configure: error: bz2 module requires libbz2 >= 1.0.0" 1>&2; exit 1; } -+ -+ -+fi -+ -+ -+ -+ ext_builddir=ext/bz2 -+ ext_srcdir=$abs_srcdir/ext/bz2 -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_BZ2_SHARED=no -+ -+ -+ case ext/bz2 in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in bz2.c bz2_filter.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - - cat >>Makefile.objects<&6 +-echo "configure:31084: checking for DB2 major version" >&5 ++echo "configure:32104: checking for DB2 major version" >&5 + { echo "configure: error: Header contains different version" 1>&2; exit 1; } fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_bz2" - - cat >>Makefile.objects<&6 +-echo "configure:31089: checking for DB4 minor version and patch level" >&5 ++echo "configure:32109: checking for DB4 minor version and patch level" >&5 + cat > conftest.$ac_ext <>Makefile.objects<> confdefs.h <&6 +-echo "configure:31117: checking if dba can be used as shared extension" >&5 ++echo "configure:32137: checking if dba can be used as shared extension" >&5 + cat > conftest.$ac_ext <&6 +-echo "configure:31276: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32296: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } + fi +@@ -31292,7 +32312,7 @@ + unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_CTYPE_SHARED=no -+ PHP_BZ2_SHARED=no - case "$PHP_SAPI" in - cgi|embed) - - -- case ext/ctype in -+ case ext/bz2 in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -27971,7 +28362,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in ctype.c; do -+ for ac_src in bz2.c bz2_filter.c; do - - IFS=. - set $ac_src -@@ -27994,15 +28385,15 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC ctype" -+ EXT_STATIC="$EXT_STATIC bz2" - ;; - *) - - -- case ext/ctype in -+ case ext/bz2 in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/bz2"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/bz2/"; ac_bdir="ext/bz2/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - + echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6 +-echo "configure:31296: checking for DB1 in library" >&5 ++echo "configure:32316: checking for DB1 in library" >&5 + if test "$HAVE_DB4" = "1"; then + THIS_VERSION=4 + THIS_LIBS=$DB4_LIBS +@@ -31340,7 +32360,7 @@ + fi + echo "$ac_t""$THIS_LIBS" 1>&6 + echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6 +-echo "configure:31344: checking for DB1 in header" >&5 ++echo "configure:32364: checking for DB1 in header" >&5 + echo "$ac_t""$THIS_INCLUDE" 1>&6 + if test -n "$THIS_INCLUDE"; then + +@@ -31350,7 +32370,7 @@ + LIBS="-l$THIS_LIBS $LIBS" -@@ -28017,7 +28408,7 @@ EOF - + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:32385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* - IFS=. - set $ac_src -@@ -28042,7 +28433,7 @@ EOF - - ;; - esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC ctype" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC bz2" + cat >> confdefs.h <&6 +-echo "configure:31515: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32535: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } fi +@@ -31539,7 +32559,7 @@ + THIS_FULL_NAME="$THIS_NAME" + fi + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:31543: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32563: checking for $THIS_FULL_NAME support" >&5 + if test -n "You cannot combine --with-dbm with --with-qdbm"; then + { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; } + fi +@@ -31663,7 +32683,7 @@ + done -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST BZ2_SHARED_LIBADD" -+ - fi - - - --php_with_curl=no -+php_enable_calendar=no + echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6 +-echo "configure:31667: checking for dbminit in -l$LIB" >&5 ++echo "configure:32687: 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 +@@ -31671,7 +32691,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:32706: \"$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 +@@ -31702,7 +32722,7 @@ + ext_shared=$save_ext_shared + + echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6 +-echo "configure:31706: checking for DBM using GDBM" >&5 ++echo "configure:32726: checking for DBM using GDBM" >&5 + cat >> confdefs.h <&6 +-echo "configure:31870: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:32890: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } + fi +@@ -32078,7 +33098,7 @@ + done --echo $ac_n "checking for cURL support""... $ac_c" 1>&6 --echo "configure:28068: checking for cURL support" >&5 --# Check whether --with-curl or --without-curl was given. --if test "${with_curl+set}" = set; then -- withval="$with_curl" -- PHP_CURL=$withval -+echo $ac_n "checking whether to enable calendar conversion support""... $ac_c" 1>&6 -+echo "configure:28462: 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" -+ PHP_CALENDAR=$enableval + echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6 +-echo "configure:32082: checking for cdb_read in -l$LIB" >&5 ++echo "configure:33102: checking for cdb_read in -l$LIB" >&5 + ac_lib_var=`echo $LIB'_'cdb_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 +@@ -32086,7 +33106,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:33121: \"$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 - -- PHP_CURL=no -- test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL -+ PHP_CALENDAR=no -+ test "$PHP_ENABLE_ALL" && PHP_CALENDAR=$PHP_ENABLE_ALL +@@ -32266,7 +33286,7 @@ + THIS_FULL_NAME="$THIS_NAME" + fi + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:32270: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33290: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } + fi +@@ -32297,7 +33317,7 @@ + THIS_FULL_NAME="$THIS_NAME" + fi + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:32301: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33321: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } + fi +@@ -32328,7 +33348,7 @@ + THIS_FULL_NAME="$THIS_NAME" + fi + echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 +-echo "configure:32332: checking for $THIS_FULL_NAME support" >&5 ++echo "configure:33352: checking for $THIS_FULL_NAME support" >&5 + if test -n ""; then + { echo "configure: error: " 1>&2; exit 1; } + fi +@@ -32343,7 +33363,7 @@ - fi -@@ -28080,12 +28474,12 @@ fi + echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6 +-echo "configure:32347: checking whether to enable DBA interface" >&5 ++echo "configure:33367: checking whether to enable DBA interface" >&5 + if test "$HAVE_DBA" = "1"; then + if test "$ext_shared" = "yes"; then + echo "$ac_t""yes, shared" 1>&6 +@@ -32673,7 +33693,7 @@ + php_enable_dom=yes + + echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6 +-echo "configure:32677: checking whether to enable DOM support" >&5 ++echo "configure:33697: checking whether to enable DOM support" >&5 + # Check whether --enable-dom or --disable-dom was given. + if test "${enable_dom+set}" = set; then + enableval="$enable_dom" +@@ -32718,7 +33738,7 @@ + php_with_libxml_dir=no - ext_output="yes, shared" - ext_shared=yes --case $PHP_CURL in -+case $PHP_CALENDAR in - shared,*) -- PHP_CURL=`echo "$PHP_CURL"|$SED 's/^shared,//'` -+ PHP_CALENDAR=`echo "$PHP_CALENDAR"|$SED 's/^shared,//'` - ;; - shared) -- PHP_CURL=yes -+ PHP_CALENDAR=yes - ;; - no) - ext_output=no -@@ -28104,572 +28498,796 @@ echo "$ac_t""$ext_output" 1>&6 + echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:32722: checking libxml2 install dir" >&5 ++echo "configure:33742: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -32746,7 +33766,7 @@ + + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:32750: checking for xml2-config path" >&5 ++echo "configure:33770: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -32904,7 +33924,7 @@ -+if test "$PHP_CALENDAR" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_CALENDAR 1 -+EOF + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:32908: checking whether libxml build works" >&5 ++echo "configure:33928: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -32920,7 +33940,7 @@ + + else + cat > conftest.$ac_ext <&6 --echo "configure:28112: checking if we should use cURL for url streams" >&5 --# Check whether --with-curlwrappers or --without-curlwrappers was given. --if test "${with_curlwrappers+set}" = set; then -- withval="$with_curlwrappers" -- PHP_CURLWRAPPERS=$withval --else -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_CALENDAR_SHARED=no -+ -+ -+ case ext/calendar in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac + +@@ -32931,7 +33951,7 @@ + } -- PHP_CURLWRAPPERS=no + EOF +-if { (eval echo configure:32935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:33955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + LIBS=$old_LIBS +@@ -33354,7 +34374,7 @@ + php_with_enchant=no --fi -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo + echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6 +-echo "configure:33358: checking for ENCHANT support" >&5 ++echo "configure:34378: checking for ENCHANT support" >&5 + # Check whether --with-enchant or --without-enchant was given. + if test "${with_enchant+set}" = set; then + withval="$with_enchant" +@@ -33939,7 +34959,7 @@ + done + echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6 +-echo "configure:33943: checking for enchant_broker_set_param in -lenchant" >&5 ++echo "configure:34963: checking for enchant_broker_set_param in -lenchant" >&5 + ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -33947,7 +34967,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lenchant $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:34982: \"$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 +@@ -34005,7 +35025,7 @@ + php_enable_exif=no --ext_output=$PHP_CURLWRAPPERS --echo "$ac_t""$ext_output" 1>&6 -+ old_IFS=$IFS -+ for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6 +-echo "configure:34009: checking whether to enable EXIF (metadata from images) support" >&5 ++echo "configure:35029: checking whether to enable EXIF (metadata from images) support" >&5 + # Check whether --enable-exif or --disable-exif was given. + if test "${enable_exif+set}" = set; then + enableval="$enable_exif" +@@ -34349,7 +35369,7 @@ + php_enable_fileinfo=yes -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac + echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6 +-echo "configure:34353: checking for fileinfo support" >&5 ++echo "configure:35373: checking for fileinfo support" >&5 + # Check whether --enable-fileinfo or --disable-fileinfo was given. + if test "${enable_fileinfo+set}" = set; then + enableval="$enable_fileinfo" +@@ -34699,12 +35719,12 @@ + for ac_func in utimes strndup + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:34703: checking for $ac_func" >&5 ++echo "configure:35723: 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 <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:35751: \"$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 +@@ -34765,7 +35785,7 @@ + php_enable_filter=yes + echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6 +-echo "configure:34769: checking whether to enable input filter support" >&5 ++echo "configure:35789: checking whether to enable input filter support" >&5 + # Check whether --enable-filter or --disable-filter was given. + if test "${enable_filter+set}" = set; then + enableval="$enable_filter" +@@ -34809,7 +35829,7 @@ + php_with_pcre_dir=no --if test "$PHP_CURL" != "no"; then -- if test -r $PHP_CURL/include/curl/easy.h; then -- CURL_DIR=$PHP_CURL -+ EXT_STATIC="$EXT_STATIC calendar" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC calendar" -+ fi - else -- echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6 --echo "configure:28136: 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 -- echo "$ac_t""found in $i" 1>&6 -- break -- fi -- done -- fi -- -- if test -z "$CURL_DIR"; then -- echo "$ac_t""not found" 1>&6 -- { echo "configure: error: Please reinstall the libcurl distribution - -- easy.h should be in /include/curl/" 1>&2; exit 1; } -- fi -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_CALENDAR_SHARED=yes -+ -+ case ext/calendar in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/calendar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/calendar/"; ac_bdir="ext/calendar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ + echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 +-echo "configure:34813: checking pcre install prefix" >&5 ++echo "configure:35833: checking pcre install prefix" >&5 + # Check whether --with-pcre-dir or --without-pcre-dir was given. + if test "${with_pcre_dir+set}" = set; then + withval="$with_pcre_dir" +@@ -34836,7 +35856,7 @@ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$INCLUDES + cat > conftest.$ac_ext <&6 --echo "configure:28154: checking for cURL 7.10.5 or greater" >&5 -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo + #include
+@@ -34855,7 +35875,7 @@ + rm -rf conftest* + + cat > conftest.$ac_ext < /dev/null 2>&1; then -- CURL_CONFIG=${CURL_DIR}/bin/curl-config -- else -- if ${CURL_DIR}/curl-config --libs > /dev/null 2>&1; then -- CURL_CONFIG=${CURL_DIR}/curl-config -- fi -- fi -- -- curl_version_full=`$CURL_CONFIG --version` -- curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -- if test "$curl_version" -ge 7010005; then -- echo "$ac_t""$curl_version_full" 1>&6 -- CURL_LIBS=`$CURL_CONFIG --libs` -- else -- { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; } -- fi + #include
+@@ -35225,7 +36245,7 @@ + php_enable_ftp=no -+ old_IFS=$IFS -+ for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do - -- if test "$CURL_DIR/include" != "/usr/include"; then -- -- if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$CURL_DIR/include -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_calendar="$shared_objects_calendar $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<&6 +-echo "configure:35229: checking whether to enable FTP support" >&5 ++echo "configure:36249: 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" +@@ -35269,7 +36289,7 @@ + php_with_openssl_dir=no -+ ;; -+ *) -+ -+ install_modules="install-modules" + echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6 +-echo "configure:35273: checking OpenSSL dir for FTP" >&5 ++echo "configure:36293: checking OpenSSL dir for FTP" >&5 + # Check whether --with-openssl-dir or --without-openssl-dir was given. + if test "${with_openssl_dir+set}" = set; then + withval="$with_openssl_dir" +@@ -35607,7 +36627,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:35611: checking for $ac_word" >&5 ++echo "configure:36631: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -35812,9 +36832,9 @@ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=-I$OPENSSL_INCDIR + echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 +-echo "configure:35816: checking for OpenSSL version" >&5 ++echo "configure:36836: checking for OpenSSL version" >&5 + cat > conftest.$ac_ext < +@@ -35969,7 +36989,7 @@ + done -- -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/calendar.$suffix" - else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/calendar.$suffix" - fi -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_calendar" + echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 +-echo "configure:35973: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:36993: 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 +@@ -35977,7 +36997,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:37012: \"$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 +@@ -36145,7 +37165,7 @@ + done -- -- if test "$ext_shared" = "yes"; then -- CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD" -- else -+ cat >>Makefile.objects<> confdefs.h <&6 +-echo "configure:36149: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:37169: 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 +@@ -36153,7 +37173,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:37188: \"$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 +@@ -36283,7 +37303,7 @@ + php_with_gd=no -- fi -- -- fi -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo + echo $ac_n "checking for GD support""... $ac_c" 1>&6 +-echo "configure:36287: checking for GD support" >&5 ++echo "configure:37307: checking for GD support" >&5 + # Check whether --with-gd or --without-gd was given. + if test "${with_gd+set}" = set; then + withval="$with_gd" +@@ -36328,7 +37348,7 @@ + php_with_jpeg_dir=no -- ;; -- esac -- done + echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6 +-echo "configure:36332: checking for the location of libjpeg" >&5 ++echo "configure:37352: checking for the location of libjpeg" >&5 + # Check whether --with-jpeg-dir or --without-jpeg-dir was given. + if test "${with_jpeg_dir+set}" = set; then + withval="$with_jpeg_dir" +@@ -36353,7 +37373,7 @@ + php_with_png_dir=no -+ old_IFS=$IFS -+ for ac_src in calendar.c dow.c french.c gregor.c jewish.c julian.c easter.c cal_unix.c; do - -- -- if test "$ext_shared" = "yes"; then -- CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD" -- if test -n "$CURL_DIR/$PHP_LIBDIR"; then -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$CURL_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" -- fi -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6 +-echo "configure:36357: checking for the location of libpng" >&5 ++echo "configure:37377: checking for the location of libpng" >&5 + # Check whether --with-png-dir or --without-png-dir was given. + if test "${with_png_dir+set}" = set; then + withval="$with_png_dir" +@@ -36378,7 +37398,7 @@ + php_with_zlib_dir=no -- -- if test "$ext_shared" = "yes"; then -- CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD" -- else -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&6 +-echo "configure:36382: checking for the location of libz" >&5 ++echo "configure:37402: checking for the location of libz" >&5 + # Check whether --with-zlib-dir or --without-zlib-dir was given. + if test "${with_zlib_dir+set}" = set; then + withval="$with_zlib_dir" +@@ -36402,7 +37422,7 @@ + php_with_xpm_dir=no -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac + echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6 +-echo "configure:36406: checking for the location of libXpm" >&5 ++echo "configure:37426: checking for the location of libXpm" >&5 + # Check whether --with-xpm-dir or --without-xpm-dir was given. + if test "${with_xpm_dir+set}" = set; then + withval="$with_xpm_dir" +@@ -36425,7 +37445,7 @@ + php_with_freetype_dir=no -- fi -- -- fi -+ cat >>Makefile.objects<&6 +-echo "configure:36429: checking for FreeType 2" >&5 ++echo "configure:37449: checking for FreeType 2" >&5 + # Check whether --with-freetype-dir or --without-freetype-dir was given. + if test "${with_freetype_dir+set}" = set; then + withval="$with_freetype_dir" +@@ -36448,7 +37468,7 @@ + php_with_t1lib=no -- fi -- else -- - -- if test -n "$CURL_DIR/$PHP_LIBDIR"; then -- -- if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$CURL_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC calendar" - fi -- -- -- - - -- 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" -+ BUILD_DIR="$BUILD_DIR $ext_builddir" - -- fi + echo $ac_n "checking for T1lib support""... $ac_c" 1>&6 +-echo "configure:36452: checking for T1lib support" >&5 ++echo "configure:37472: checking for T1lib support" >&5 + # Check whether --with-t1lib or --without-t1lib was given. + if test "${with_t1lib+set}" = set; then + withval="$with_t1lib" +@@ -36471,7 +37491,7 @@ + php_enable_gd_native_ttf=no + echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6 +-echo "configure:36475: checking whether to enable truetype string function in GD" >&5 ++echo "configure:37495: 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" +@@ -36494,7 +37514,7 @@ + php_enable_gd_jis_conv=no -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=calendar - -- fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" + echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6 +-echo "configure:36498: checking whether to enable JIS-mapped Japanese font support in GD" >&5 ++echo "configure:37518: checking whether to enable JIS-mapped Japanese font support in GD" >&5 + # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given. + if test "${enable_gd_jis_conv+set}" = set; then + enableval="$enable_gd_jis_conv" +@@ -36546,12 +37566,12 @@ + for ac_func in fabsf floorf + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:36550: checking for $ac_func" >&5 ++echo "configure:37570: 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:37598: \"$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 +@@ -36746,7 +37766,7 @@ + done + echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 +-echo "configure:36750: checking for jpeg_read_header in -ljpeg" >&5 ++echo "configure:37770: 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 +@@ -36754,7 +37774,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:37789: \"$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 +@@ -37047,7 +38067,7 @@ + done -- fi + echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 +-echo "configure:37051: checking for png_write_image in -lpng" >&5 ++echo "configure:38071: checking for png_write_image in -lpng" >&5 + ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -37055,7 +38075,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:38090: \"$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 +@@ -37446,7 +38466,7 @@ + done -+php_enable_ctype=yes + echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 +-echo "configure:37450: checking for XpmFreeXpmImage in -lXpm" >&5 ++echo "configure:38470: 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 +@@ -37454,7 +38474,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:38489: \"$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 +@@ -37840,7 +38860,7 @@ + done -+echo $ac_n "checking whether to enable ctype functions""... $ac_c" 1>&6 -+echo "configure:28806: checking whether to enable ctype functions" >&5 -+# Check whether --enable-ctype or --disable-ctype was given. -+if test "${enable_ctype+set}" = set; then -+ enableval="$enable_ctype" -+ PHP_CTYPE=$enableval -+else - -- echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 --echo "configure:28392: checking for SSL support in libcurl" >&5 -- CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` -- if test "$CURL_SSL" = "SSL"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_CURL_SSL 1 --EOF -+ PHP_CTYPE=yes -+ test "$PHP_ENABLE_ALL" && PHP_CTYPE=$PHP_ENABLE_ALL - -- -- save_CFLAGS="$CFLAGS" -- CFLAGS="`$CURL_CONFIG --cflags`" -- -- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 --echo "configure:28405: checking how to run the C preprocessor" >&5 --# On Suns, sometimes $CPP names a directory. --if test -n "$CPP" && test -d "$CPP"; then -- CPP= - fi --if test -z "$CPP"; then --if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- # This must be in double quotes, not single quotes, because CPP may get -- # substituted into the Makefile and "${CC-cc}" will confuse make. -- CPP="${CC-cc} -E" -- # 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:28426: \"$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 -- : --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- 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:28443: \"$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 -- : --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- CPP="${CC-cc} -nologo -E" -- cat > conftest.$ac_ext < --Syntax Error -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_CTYPE in -+shared,*) -+ PHP_CTYPE=`echo "$PHP_CTYPE"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_CTYPE=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_CTYPE" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_CTYPE 1 + echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 +-echo "configure:37844: checking for FT_New_Face in -lfreetype" >&5 ++echo "configure:38864: checking for FT_New_Face in -lfreetype" >&5 + ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -37848,7 +38868,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lfreetype $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_try) 2>&5; } --ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` --if test -z "$ac_err"; then -- : --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- CPP=/lib/cpp --fi --rm -f conftest* --fi --rm -f conftest* --fi --rm -f conftest* -- ac_cv_prog_CPP="$CPP" --fi -- CPP="$ac_cv_prog_CPP" --else -- ac_cv_prog_CPP="$CPP" --fi --echo "$ac_t""$CPP" 1>&6 +-if { (eval echo configure:37863: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:38883: \"$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 +@@ -38176,7 +39196,7 @@ + done -- echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 --echo "configure:28485: checking for openssl support in libcurl" >&5 -- if test "$cross_compiling" = yes; then - -- echo "$ac_t""no" 1>&6 -+ ext_builddir=ext/ctype -+ ext_srcdir=$abs_srcdir/ext/ctype -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_CTYPE_SHARED=no - --else -- cat > conftest.$ac_ext <&6 +-echo "configure:38180: checking for T1_StrError in -lt1" >&5 ++echo "configure:39200: checking for T1_StrError in -lt1" >&5 + ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -38184,7 +39204,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:39219: \"$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 +@@ -38638,7 +39658,7 @@ + done --#include -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo + echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 +-echo "configure:38642: checking for jpeg_read_header in -ljpeg" >&5 ++echo "configure:39662: 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 +@@ -38646,7 +39666,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:39681: \"$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 +@@ -38939,7 +39959,7 @@ + done --int main(int argc, char *argv[]) --{ -- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); + echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 +-echo "configure:38943: checking for png_write_image in -lpng" >&5 ++echo "configure:39963: checking for png_write_image in -lpng" >&5 + ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -38947,7 +39967,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:39982: \"$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 +@@ -39338,7 +40358,7 @@ + done -- if (data && data->ssl_version && *data->ssl_version) { -- const char *ptr = data->ssl_version; -+ old_IFS=$IFS -+ for ac_src in ctype.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 +-echo "configure:39342: checking for XpmFreeXpmImage in -lXpm" >&5 ++echo "configure:40362: 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 +@@ -39346,7 +40366,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:40381: \"$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 +@@ -39732,7 +40752,7 @@ + done -- while(*ptr == ' ') ++ptr; -- return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1); -- } -- return 1; --} -- -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&6 +-echo "configure:39736: checking for FT_New_Face in -lfreetype" >&5 ++echo "configure:40756: checking for FT_New_Face in -lfreetype" >&5 + ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -39740,7 +40760,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lfreetype $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -+ done -+ -+ -+ EXT_STATIC="$EXT_STATIC ctype" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC ctype" -+ fi -+ else -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_CTYPE_SHARED=yes -+ -+ case ext/ctype in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- echo "$ac_t""yes" 1>&6 -- for ac_hdr in openssl/crypto.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:28519: 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:28529: \"$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* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <>Makefile.objects<> confdefs.h <<\EOF --#define HAVE_CURL_OPENSSL 1 -+ done -+ -+ case $host_alias in -+ *netware*) -+ -+ install_modules="install-modules" -+ -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpctype.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) $(PHPCTYPE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpctype.so '$ext_builddir'/phpctype.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPCTYPE, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) $(PHPCTYPE_SHARED_LIBADD)' -+ ;; -+ esac -+ -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpctype.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpctype.$suffix" -+ fi -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype" -+ -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:40775: \"$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 +@@ -40068,7 +41088,7 @@ + done + + echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 +-echo "configure:40072: checking for T1_StrError in -lt1" >&5 ++echo "configure:41092: checking for T1_StrError in -lt1" >&5 + ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -40076,7 +41096,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:41111: \"$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 +@@ -40462,7 +41482,7 @@ + done -- --else -- echo "$ac_t""no" 1>&6 --fi --done -+ ;; -+ *) -+ -+ install_modules="install-modules" + echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6 +-echo "configure:40466: checking for gdImageString16 in -lgd" >&5 ++echo "configure:41486: 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 +@@ -40470,7 +41490,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:41505: \"$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 +@@ -40610,7 +41630,7 @@ + done -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/ctype.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) $(CTYPE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/ctype.so '$ext_builddir'/ctype.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(CTYPE, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_ctype) $(CTYPE_SHARED_LIBADD)' -+ ;; -+ esac -+ -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/ctype.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/ctype.$suffix" -+ fi - -- echo "$ac_t""no" 1>&6 -- --fi --rm -fr conftest* --fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_ctype" + echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6 +-echo "configure:40614: checking for gdImagePaletteCopy in -lgd" >&5 ++echo "configure:41634: 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 +@@ -40618,7 +41638,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:41653: \"$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 +@@ -40758,7 +41778,7 @@ + done -- -- echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 --echo "configure:28574: checking for gnutls support in libcurl" >&5 -- if test "$cross_compiling" = yes; then -+ cat >>Makefile.objects<> confdefs.h <&6 -- --else -- cat > conftest.$ac_ext <&6 +-echo "configure:40762: checking for gdImageCreateFromPng in -lgd" >&5 ++echo "configure:41782: 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 +@@ -40766,7 +41786,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:41801: \"$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 +@@ -40906,7 +41926,7 @@ + done --#include -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo + echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6 +-echo "configure:40910: checking for gdImageCreateFromGif in -lgd" >&5 ++echo "configure:41930: 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 +@@ -40914,7 +41934,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:41949: \"$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 +@@ -41054,7 +42074,7 @@ + done --int main(int argc, char *argv[]) --{ -- curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); -+ -+ old_IFS=$IFS -+ for ac_src in ctype.c; do - -- if (data && data->ssl_version && *data->ssl_version) { -- const char *ptr = data->ssl_version; -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" + echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6 +-echo "configure:41058: checking for gdImageGif in -lgd" >&5 ++echo "configure:42078: checking for gdImageGif in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -41062,7 +42082,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:42097: \"$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 +@@ -41202,7 +42222,7 @@ + done -- while(*ptr == ' ') ++ptr; -- return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1); -- } -- return 1; --} -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -+ cat >>Makefile.objects<&6 +-echo "configure:41206: checking for gdImageWBMP in -lgd" >&5 ++echo "configure:42226: 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 +@@ -41210,7 +42230,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lgd $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -+ done -+ -+ -+ EXT_STATIC="$EXT_STATIC ctype" -+ ;; -+ *) -+ - -- echo "$ac_t""yes" 1>&6 -- ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 --echo "configure:28606: checking for gcrypt.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:28616: \"$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* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+ case ext/ctype in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/ctype"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/ctype/"; ac_bdir="ext/ctype/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_CURL_GNUTLS 1 --EOF -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ - -+ old_IFS=$IFS -+ for ac_src in ctype.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - --else -- echo "$ac_t""no" 1>&6 --fi -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:42245: \"$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 +@@ -41350,7 +42370,7 @@ + done -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=ctype - -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ -+ fi -+ -+fi -+ -+ -+ -+php_with_curl=no -+ -+echo $ac_n "checking for cURL support""... $ac_c" 1>&6 -+echo "configure:29150: checking for cURL support" >&5 -+# Check whether --with-curl or --without-curl was given. -+if test "${with_curl+set}" = set; then -+ withval="$with_curl" -+ PHP_CURL=$withval + echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6 +-echo "configure:41354: checking for gdImageCreateFromJpeg in -lgd" >&5 ++echo "configure:42374: 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 +@@ -41358,7 +42378,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:42393: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* - -- echo "$ac_t""no" 1>&6 -- -+ PHP_CURL=no -+ test "$PHP_ENABLE_ALL" && PHP_CURL=$PHP_ENABLE_ALL -+ - fi --rm -fr conftest* -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_CURL in -+shared,*) -+ PHP_CURL=`echo "$PHP_CURL"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_CURL=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_with_curlwrappers=no -+ -+echo $ac_n "checking if we should use cURL for url streams""... $ac_c" 1>&6 -+echo "configure:29194: checking if we should use cURL for url streams" >&5 -+# Check whether --with-curlwrappers or --without-curlwrappers was given. -+if test "${with_curlwrappers+set}" = set; then -+ withval="$with_curlwrappers" -+ PHP_CURLWRAPPERS=$withval -+else -+ -+ PHP_CURLWRAPPERS=no -+ -+ - fi +@@ -41498,7 +42518,7 @@ + done -- -- CFLAGS="$save_CFLAGS" -+ -+ext_output=$PHP_CURLWRAPPERS -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_CURL" != "no"; then -+ if test -r $PHP_CURL/include/curl/easy.h; then -+ CURL_DIR=$PHP_CURL - else -- echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for cURL in default path""... $ac_c" 1>&6 -+echo "configure:29218: 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 -+ echo "$ac_t""found in $i" 1>&6 -+ break -+ fi -+ done -+ fi -+ -+ if test -z "$CURL_DIR"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: Please reinstall the libcurl distribution - -+ easy.h should be in /include/curl/" 1>&2; exit 1; } -+ fi -+ -+ CURL_CONFIG="curl-config" -+ echo $ac_n "checking for cURL 7.10.5 or greater""... $ac_c" 1>&6 -+echo "configure:29236: checking for cURL 7.10.5 or greater" >&5 -+ -+ if ${CURL_DIR}/bin/curl-config --libs > /dev/null 2>&1; then -+ CURL_CONFIG=${CURL_DIR}/bin/curl-config -+ else -+ if ${CURL_DIR}/curl-config --libs > /dev/null 2>&1; then -+ CURL_CONFIG=${CURL_DIR}/curl-config -+ fi -+ fi -+ -+ curl_version_full=`$CURL_CONFIG --version` -+ curl_version=`echo ${curl_version_full} | sed -e 's/libcurl //' | $AWK 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` -+ if test "$curl_version" -ge 7010005; then -+ echo "$ac_t""$curl_version_full" 1>&6 -+ CURL_LIBS=`$CURL_CONFIG --libs` -+ else -+ { echo "configure: error: cURL version 7.10.5 or later is required to compile php with cURL support" 1>&2; exit 1; } - fi + echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6 +-echo "configure:41502: checking for gdImageCreateFromXpm in -lgd" >&5 ++echo "configure:42522: 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 +@@ -41506,7 +42526,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:42541: \"$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 +@@ -41646,7 +42666,7 @@ + done - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -- " -+ if test "$CURL_DIR/include" != "/usr/include"; then -+ -+ if test -z "$CURL_DIR/include" || echo "$CURL_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$CURL_DIR/include -+ else -+ -+ ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`" -+ fi -+ -+ - -- save_ext_shared=$ext_shared -- ext_shared=yes -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- for ac_i in $ac_stuff; do -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ -+ for ac_i in $CURL_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -+ CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -pthread" - else - - -@@ -28691,7 +29309,7 @@ fi - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -+ CURL_SHARED_LIBADD="$CURL_SHARED_LIBADD -l$ac_ii" - else - - -@@ -28726,8 +29344,8 @@ fi + echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6 +-echo "configure:41650: checking for gdImageCreateFromGd2 in -lgd" >&5 ++echo "configure:42670: checking for gdImageCreateFromGd2 in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -41654,7 +42674,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:42689: \"$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 +@@ -41794,7 +42814,7 @@ + done - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_SHARED_LIBADD" - else - - -@@ -28753,27 +29371,491 @@ fi - esac + echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6 +-echo "configure:41798: checking for gdImageCreateTrueColor in -lgd" >&5 ++echo "configure:42818: checking for gdImageCreateTrueColor in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -41802,7 +42822,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:42837: \"$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 +@@ -41942,7 +42962,7 @@ done -- echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 --echo "configure:28758: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lcurl $LIBS" --cat > conftest.$ac_ext <&6 +-echo "configure:41946: checking for gdImageSetTile in -lgd" >&5 ++echo "configure:42966: checking for gdImageSetTile in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -41950,7 +42970,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:42985: \"$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 +@@ -42090,7 +43110,7 @@ + done --int main() { --curl_easy_perform() --; return 0; } -+ if test "$ext_shared" = "yes"; then -+ CURL_SHARED_LIBADD="-lcurl $CURL_SHARED_LIBADD" -+ if test -n "$CURL_DIR/$PHP_LIBDIR"; then -+ -+ if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$CURL_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ CURL_SHARED_LIBADD="-L$ai_p $CURL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && CURL_SHARED_LIBADD="$ld_runpath_switch$ai_p $CURL_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 "$CURL_DIR/$PHP_LIBDIR"; then -+ -+ if test "$CURL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$CURL_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$CURL_DIR/$PHP_LIBDIR" || echo "$CURL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$CURL_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ -+ -+ -+ 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 -+ -+ -+ case curl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lcurl $LIBS" -+ ;; -+ esac -+ -+ -+ -+ -+ fi -+ -+ -+ -+ echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 -+echo "configure:29474: checking for SSL support in libcurl" >&5 -+ CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` -+ if test "$CURL_SSL" = "SSL"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_SSL 1 -+EOF -+ -+ -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="`$CURL_CONFIG --cflags`" -+ -+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:29487: checking how to run the C preprocessor" >&5 -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # This must be in double quotes, not single quotes, because CPP may get -+ # substituted into the Makefile and "${CC-cc}" will confuse make. -+ CPP="${CC-cc} -E" -+ # 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:29508: \"$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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ 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:29525: \"$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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ 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:29542: \"$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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP=/lib/cpp -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+ ac_cv_prog_CPP="$CPP" -+fi -+ CPP="$ac_cv_prog_CPP" -+else -+ ac_cv_prog_CPP="$CPP" -+fi -+echo "$ac_t""$CPP" 1>&6 -+ -+ echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 -+echo "configure:29567: checking for openssl support in libcurl" >&5 -+ if test "$cross_compiling" = yes; then -+ -+ echo "$ac_t""no" 1>&6 -+ -+else -+ cat > conftest.$ac_ext < -+ -+int main(int argc, char *argv[]) -+{ -+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); -+ -+ if (data && data->ssl_version && *data->ssl_version) { -+ const char *ptr = data->ssl_version; -+ -+ while(*ptr == ' ') ++ptr; -+ return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1); -+ } -+ return 1; -+} -+ -+EOF -+if { (eval echo configure:29593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ echo "$ac_t""yes" 1>&6 -+ for ac_hdr in openssl/crypto.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:29601: 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:29611: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_CURL_OPENSSL 1 -+EOF -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+done -+ -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ echo "$ac_t""no" 1>&6 -+ -+fi -+rm -fr conftest* -+fi -+ -+ -+ echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 -+echo "configure:29656: checking for gnutls support in libcurl" >&5 -+ if test "$cross_compiling" = yes; then -+ -+ echo "$ac_t""no" 1>&6 -+ -+else -+ cat > conftest.$ac_ext < -+ -+int main(int argc, char *argv[]) -+{ -+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); -+ -+ if (data && data->ssl_version && *data->ssl_version) { -+ const char *ptr = data->ssl_version; -+ -+ while(*ptr == ' ') ++ptr; -+ return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1); -+ } -+ return 1; -+} -+ -+EOF -+if { (eval echo configure:29682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ echo "$ac_t""yes" 1>&6 -+ ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 -+echo "configure:29688: checking for gcrypt.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:29698: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_GNUTLS 1 -+EOF -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ echo "$ac_t""no" 1>&6 -+ -+fi -+rm -fr conftest* -+fi -+ -+ -+ CFLAGS="$save_CFLAGS" -+ else -+ echo "$ac_t""no" 1>&6 -+ fi -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ $CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 -+ -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for curl_easy_perform in -lcurl""... $ac_c" 1>&6 -+echo "configure:29840: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lcurl $LIBS" -+cat > conftest.$ac_ext <&6 +-echo "configure:42094: checking for gdImageEllipse in -lgd" >&5 ++echo "configure:43114: checking for gdImageEllipse in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -42098,7 +43118,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:29859: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42113: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43133: \"$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 -@@ -28909,7 +29991,7 @@ fi +@@ -42238,7 +43258,7 @@ done - echo $ac_n "checking for curl_version_info in -lcurl""... $ac_c" 1>&6 --echo "configure:28913: checking for curl_version_info in -lcurl" >&5 -+echo "configure:29995: checking for curl_version_info in -lcurl" >&5 - ac_lib_var=`echo curl'_'curl_version_info | sed 'y%./+-%__p_%'` + echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6 +-echo "configure:42242: checking for gdImageSetBrush in -lgd" >&5 ++echo "configure:43262: checking for gdImageSetBrush in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -28917,7 +29999,7 @@ else +@@ -42246,7 +43266,7 @@ ac_save_LIBS="$LIBS" - LIBS="-lcurl $LIBS" + LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:30014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42261: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43281: \"$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 -@@ -29062,7 +30144,7 @@ fi +@@ -42386,7 +43406,7 @@ done - echo $ac_n "checking for curl_easy_strerror in -lcurl""... $ac_c" 1>&6 --echo "configure:29066: checking for curl_easy_strerror in -lcurl" >&5 -+echo "configure:30148: checking for curl_easy_strerror in -lcurl" >&5 - ac_lib_var=`echo curl'_'curl_easy_strerror | sed 'y%./+-%__p_%'` + echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6 +-echo "configure:42390: checking for gdImageStringTTF in -lgd" >&5 ++echo "configure:43410: checking for gdImageStringTTF in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -29070,7 +30152,7 @@ else +@@ -42394,7 +43414,7 @@ ac_save_LIBS="$LIBS" - LIBS="-lcurl $LIBS" + LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:30167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42409: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43429: \"$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 -@@ -29215,7 +30297,7 @@ fi +@@ -42534,7 +43554,7 @@ done - echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 --echo "configure:29219: checking for curl_multi_strerror in -lcurl" >&5 -+echo "configure:30301: checking for curl_multi_strerror in -lcurl" >&5 - ac_lib_var=`echo curl'_'curl_multi_strerror | sed 'y%./+-%__p_%'` + echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6 +-echo "configure:42538: checking for gdImageStringFT in -lgd" >&5 ++echo "configure:43558: checking for gdImageStringFT in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -29223,7 +30305,7 @@ else +@@ -42542,7 +43562,7 @@ ac_save_LIBS="$LIBS" - LIBS="-lcurl $LIBS" + LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:30320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42557: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43577: \"$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 -@@ -29920,7 +31002,7 @@ if test "$PHP_QDBM" != "no"; then +@@ -42682,7 +43702,7 @@ done - echo $ac_n "checking for dpopen in -l$LIB""... $ac_c" 1>&6 --echo "configure:29924: checking for dpopen in -l$LIB" >&5 -+echo "configure:31006: checking for dpopen in -l$LIB" >&5 - ac_lib_var=`echo $LIB'_'dpopen | sed 'y%./+-%__p_%'` + echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6 +-echo "configure:42686: checking for gdImageStringFTEx in -lgd" >&5 ++echo "configure:43706: checking for gdImageStringFTEx in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -29928,7 +31010,7 @@ else +@@ -42690,7 +43710,7 @@ ac_save_LIBS="$LIBS" - LIBS="-l$LIB $LIBS" + LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31025: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42705: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43725: \"$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 -@@ -30108,7 +31190,7 @@ fi - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:30112: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31194: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -30136,7 +31218,7 @@ if test "$PHP_GDBM" != "no"; then - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:30140: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31222: checking for $THIS_FULL_NAME support" >&5 - if test -n "You cannot combine --with-gdbm with --with-qdbm"; then - { echo "configure: error: You cannot combine --with-gdbm with --with-qdbm" 1>&2; exit 1; } - fi -@@ -30255,7 +31337,7 @@ echo "configure:30140: checking for $THI +@@ -42830,7 +43850,7 @@ done - echo $ac_n "checking for gdbm_open in -lgdbm""... $ac_c" 1>&6 --echo "configure:30259: checking for gdbm_open in -lgdbm" >&5 -+echo "configure:31341: checking for gdbm_open in -lgdbm" >&5 - ac_lib_var=`echo gdbm'_'gdbm_open | sed 'y%./+-%__p_%'` + echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6 +-echo "configure:42834: checking for gdImageColorClosestHWB in -lgd" >&5 ++echo "configure:43854: 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 -@@ -30263,7 +31345,7 @@ else +@@ -42838,7 +43858,7 @@ ac_save_LIBS="$LIBS" - LIBS="-lgdbm $LIBS" + LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:42853: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:43873: \"$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 -@@ -30439,7 +31521,7 @@ fi - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:30443: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31525: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -30568,7 +31650,7 @@ if test "$PHP_NDBM" != "no"; then +@@ -42978,7 +43998,7 @@ done - echo $ac_n "checking for dbm_open in -l$LIB""... $ac_c" 1>&6 --echo "configure:30572: checking for dbm_open in -l$LIB" >&5 -+echo "configure:31654: checking for dbm_open in -l$LIB" >&5 - ac_lib_var=`echo $LIB'_'dbm_open | sed 'y%./+-%__p_%'` + echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6 +-echo "configure:42982: checking for gdImageColorResolve in -lgd" >&5 ++echo "configure:44002: 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 -@@ -30576,7 +31658,7 @@ else +@@ -42986,7 +44006,7 @@ ac_save_LIBS="$LIBS" - LIBS="-l$LIB $LIBS" + LIBS="-lgd $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:31673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44021: \"$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 -@@ -30756,7 +31838,7 @@ fi - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:30760: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:31842: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -30844,7 +31926,7 @@ if test "$PHP_DB4" != "no"; then - LIBS="-l$LIB $LIBS" - - cat > conftest.$ac_ext <&6 +-echo "configure:43130: checking for gdImageGifCtx in -lgd" >&5 ++echo "configure:44150: checking for gdImageGifCtx in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -43134,7 +44154,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:31941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43149: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - cat > conftest.$ac_ext <&6 --echo "configure:30900: checking for DB4 major version" >&5 -+echo "configure:31982: checking for DB4 major version" >&5 - { echo "configure: error: Header contains different version" 1>&2; exit 1; } - fi - if test "4" = "4"; then - echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 --echo "configure:30905: checking for DB4 minor version and patch level" >&5 -+echo "configure:31987: checking for DB4 minor version and patch level" >&5 - cat > conftest.$ac_ext <&6 --echo "configure:30933: checking if dba can be used as shared extension" >&5 -+echo "configure:32015: checking if dba can be used as shared extension" >&5 - cat > conftest.$ac_ext <&6 +-echo "configure:43278: checking for gdCacheCreate in -lgd" >&5 ++echo "configure:44298: checking for gdCacheCreate in -lgd" >&5 + ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -43282,7 +44302,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:44317: \"$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 +@@ -43422,7 +44442,7 @@ + done - #include "$THIS_INCLUDE" -@@ -31088,7 +32170,7 @@ fi - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:31092: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32174: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -31116,7 +32198,7 @@ if test "$PHP_DB3" != "no"; then - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:31120: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32202: checking for $THIS_FULL_NAME support" >&5 - if test -n "You cannot combine --with-db3 with --with-db4"; then - { echo "configure: error: You cannot combine --with-db3 with --with-db4" 1>&2; exit 1; } - fi -@@ -31167,7 +32249,7 @@ echo "configure:31120: checking for $THI - LIBS="-l$LIB $LIBS" - - cat > conftest.$ac_ext <&6 +-echo "configure:43426: checking for gdFontCacheShutdown in -lgd" >&5 ++echo "configure:44446: checking for gdFontCacheShutdown in -lgd" >&5 + ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -43430,7 +44450,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:32264: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:44465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - cat > conftest.$ac_ext <&6 --echo "configure:31223: checking for DB3 major version" >&5 -+echo "configure:32305: checking for DB3 major version" >&5 - { echo "configure: error: Header contains different version" 1>&2; exit 1; } - fi - if test "3" = "4"; then - echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 --echo "configure:31228: checking for DB4 minor version and patch level" >&5 -+echo "configure:32310: checking for DB4 minor version and patch level" >&5 - cat > conftest.$ac_ext <&6 +-echo "configure:43574: checking for gdFreeFontCache in -lgd" >&5 ++echo "configure:44594: checking for gdFreeFontCache in -lgd" >&5 + ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -43578,7 +44598,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:44613: \"$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 +@@ -43718,7 +44738,7 @@ + done - #include "$THIS_INCLUDE" -@@ -31252,9 +32334,9 @@ rm -f conftest* - fi - if test "$ext_shared" = "yes"; then - echo $ac_n "checking if dba can be used as shared extension""... $ac_c" 1>&6 --echo "configure:31256: checking if dba can be used as shared extension" >&5 -+echo "configure:32338: checking if dba can be used as shared extension" >&5 - cat > conftest.$ac_ext <&6 +-echo "configure:43722: checking for gdFontCacheMutexSetup in -lgd" >&5 ++echo "configure:44742: checking for gdFontCacheMutexSetup in -lgd" >&5 + ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -43726,7 +44746,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:44761: \"$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 +@@ -43866,7 +44886,7 @@ + done - #include "$THIS_INCLUDE" -@@ -31411,7 +32493,7 @@ fi - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:31415: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32497: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -31439,7 +32521,7 @@ if test "$PHP_DB2" != "no"; then - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:31443: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32525: checking for $THIS_FULL_NAME support" >&5 - if test -n "You cannot combine --with-db2 with --with-db3 or --with-db4"; then - { echo "configure: error: You cannot combine --with-db2 with --with-db3 or --with-db4" 1>&2; exit 1; } - fi -@@ -31490,7 +32572,7 @@ echo "configure:31443: checking for $THI - LIBS="-l$LIB $LIBS" - - cat > conftest.$ac_ext <&6 +-echo "configure:43870: checking for gdNewDynamicCtxEx in -lgd" >&5 ++echo "configure:44890: checking for gdNewDynamicCtxEx in -lgd" >&5 + ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -43874,7 +44894,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:44909: \"$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 +@@ -43940,7 +44960,7 @@ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=-I$GD_INCLUDE + cat > conftest.$ac_ext < +@@ -43954,7 +44974,7 @@ + ; return 0; } EOF --if { (eval echo configure:31505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:32587: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:43958: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:44978: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - cat > conftest.$ac_ext <> confdefs.h <<\EOF +@@ -44285,7 +45305,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:45320: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -44447,7 +45467,7 @@ done - if test -z "$THIS_LIBS"; then - echo $ac_n "checking for DB2 major version""... $ac_c" 1>&6 --echo "configure:31546: checking for DB2 major version" >&5 -+echo "configure:32628: checking for DB2 major version" >&5 - { echo "configure: error: Header contains different version" 1>&2; exit 1; } - fi - if test "2" = "4"; then - echo $ac_n "checking for DB4 minor version and patch level""... $ac_c" 1>&6 --echo "configure:31551: checking for DB4 minor version and patch level" >&5 -+echo "configure:32633: checking for DB4 minor version and patch level" >&5 - cat > conftest.$ac_ext <&6 --echo "configure:31579: checking if dba can be used as shared extension" >&5 -+echo "configure:32661: checking if dba can be used as shared extension" >&5 - cat > conftest.$ac_ext <&6 --echo "configure:31738: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:32820: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -31754,7 +32836,7 @@ if test "$PHP_DB1" != "no"; then - unset THIS_INCLUDE THIS_LIBS THIS_LFLAGS THIS_PREFIX THIS_RESULT - echo $ac_n "checking for DB1 in library""... $ac_c" 1>&6 --echo "configure:31758: checking for DB1 in library" >&5 -+echo "configure:32840: checking for DB1 in library" >&5 - if test "$HAVE_DB4" = "1"; then - THIS_VERSION=4 - THIS_LIBS=$DB4_LIBS -@@ -31802,7 +32884,7 @@ EOF - fi - echo "$ac_t""$THIS_LIBS" 1>&6 - echo $ac_n "checking for DB1 in header""... $ac_c" 1>&6 --echo "configure:31806: checking for DB1 in header" >&5 -+echo "configure:32888: checking for DB1 in header" >&5 - echo "$ac_t""$THIS_INCLUDE" 1>&6 - if test -n "$THIS_INCLUDE"; then - -@@ -31812,7 +32894,7 @@ echo "configure:31806: checking for DB1 - LIBS="-l$THIS_LIBS $LIBS" - - cat > conftest.$ac_ext <&6 +-echo "configure:44451: checking for gdImageCreate in -lgd" >&5 ++echo "configure:45471: checking for gdImageCreate in -lgd" >&5 + ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -44455,7 +45475,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:32909: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:44470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - - cat >> confdefs.h <&6 --echo "configure:31977: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33059: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -32001,7 +33083,7 @@ if test "$PHP_DBM" != "no"; then - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:32005: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33087: checking for $THIS_FULL_NAME support" >&5 - if test -n "You cannot combine --with-dbm with --with-qdbm"; then - { echo "configure: error: You cannot combine --with-dbm with --with-qdbm" 1>&2; exit 1; } - fi -@@ -32125,7 +33207,7 @@ echo "configure:32005: checking for $THI - done + eval "ac_cv_lib_$ac_lib_var=yes" + else +@@ -44531,7 +45551,7 @@ + php_with_gettext=no - echo $ac_n "checking for dbminit in -l$LIB""... $ac_c" 1>&6 --echo "configure:32129: checking for dbminit in -l$LIB" >&5 -+echo "configure:33211: checking for dbminit in -l$LIB" >&5 - ac_lib_var=`echo $LIB'_'dbminit | sed 'y%./+-%__p_%'` + echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6 +-echo "configure:44535: checking for GNU gettext support" >&5 ++echo "configure:45555: checking for GNU gettext support" >&5 + # Check whether --with-gettext or --without-gettext was given. + if test "${with_gettext+set}" = set; then + withval="$with_gettext" +@@ -44586,7 +45606,7 @@ + O_LDFLAGS=$LDFLAGS + LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" + echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 +-echo "configure:44590: checking for bindtextdomain in -lintl" >&5 ++echo "configure:45610: 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 -@@ -32133,7 +33215,7 @@ else +@@ -44594,7 +45614,7 @@ ac_save_LIBS="$LIBS" - LIBS="-l$LIB $LIBS" + LIBS="-lintl $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:33230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:44609: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45629: \"$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 -@@ -32164,7 +33246,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - ext_shared=$save_ext_shared - - echo $ac_n "checking for DBM using GDBM""... $ac_c" 1>&6 --echo "configure:32168: checking for DBM using GDBM" >&5 -+echo "configure:33250: checking for DBM using GDBM" >&5 - cat >> confdefs.h <&6 + echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6 +-echo "configure:44631: checking for bindtextdomain in -lc" >&5 ++echo "configure:45651: 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 +@@ -44635,7 +45655,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lc $LIBS" + cat > conftest.$ac_ext <&6 --echo "configure:32332: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33414: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -32540,7 +33622,7 @@ elif test "$PHP_CDB" != "no"; then - done +-if { (eval echo configure:44650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:45670: \"$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 +@@ -45110,7 +46130,7 @@ - echo $ac_n "checking for cdb_read in -l$LIB""... $ac_c" 1>&6 --echo "configure:32544: checking for cdb_read in -l$LIB" >&5 -+echo "configure:33626: checking for cdb_read in -l$LIB" >&5 - ac_lib_var=`echo $LIB'_'cdb_read | sed 'y%./+-%__p_%'` + + echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 +-echo "configure:45114: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:46134: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 + ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -32548,7 +33630,7 @@ else +@@ -45118,7 +46138,7 @@ ac_save_LIBS="$LIBS" - LIBS="-l$LIB $LIBS" + LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:33645: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:45133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46153: \"$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 -@@ -32728,7 +33810,7 @@ fi - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:32732: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33814: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -32759,7 +33841,7 @@ fi - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:32763: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33845: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -32790,7 +33872,7 @@ fi - THIS_FULL_NAME="$THIS_NAME" - fi - echo $ac_n "checking for $THIS_FULL_NAME support""... $ac_c" 1>&6 --echo "configure:32794: checking for $THIS_FULL_NAME support" >&5 -+echo "configure:33876: checking for $THIS_FULL_NAME support" >&5 - if test -n ""; then - { echo "configure: error: " 1>&2; exit 1; } - fi -@@ -32805,7 +33887,7 @@ echo "configure:32794: checking for $THI +@@ -45153,7 +46173,7 @@ + fi + + echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 +-echo "configure:45157: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:46177: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 + ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -45161,7 +46181,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46196: \"$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 +@@ -45196,7 +46216,7 @@ + fi + echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 +-echo "configure:45200: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:46220: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 + ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -45204,7 +46224,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46239: \"$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 +@@ -45239,7 +46259,7 @@ + fi - echo $ac_n "checking whether to enable DBA interface""... $ac_c" 1>&6 --echo "configure:32809: checking whether to enable DBA interface" >&5 -+echo "configure:33891: checking whether to enable DBA interface" >&5 - if test "$HAVE_DBA" = "1"; then - if test "$ext_shared" = "yes"; then - echo "$ac_t""yes, shared" 1>&6 -@@ -33132,18 +34214,18 @@ fi + echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 +-echo "configure:45243: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 ++echo "configure:46263: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 + ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -45247,7 +46267,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46282: \"$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 +@@ -45289,7 +46309,7 @@ + php_with_gmp=no + + echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6 +-echo "configure:45293: checking for GNU MP support" >&5 ++echo "configure:46313: checking for GNU MP support" >&5 + # Check whether --with-gmp or --without-gmp was given. + if test "${with_gmp+set}" = set; then + withval="$with_gmp" +@@ -45437,7 +46457,7 @@ + done + + echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 +-echo "configure:45441: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 ++echo "configure:46461: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 + ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -45445,7 +46465,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lgmp $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46480: \"$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 +@@ -45581,7 +46601,7 @@ + done + + echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 +-echo "configure:45585: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 ++echo "configure:46605: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 + ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -45589,7 +46609,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lgmp $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:46624: \"$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 +@@ -46072,7 +47092,7 @@ + php_with_mhash=no + echo $ac_n "checking for mhash support""... $ac_c" 1>&6 +-echo "configure:46076: checking for mhash support" >&5 ++echo "configure:47096: checking for mhash support" >&5 + # Check whether --with-mhash or --without-mhash was given. + if test "${with_mhash+set}" = set; then + withval="$with_mhash" +@@ -46116,7 +47136,7 @@ + php_enable_hash=yes + echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6 +-echo "configure:46120: checking whether to enable hash support" >&5 ++echo "configure:47140: checking whether to enable hash support" >&5 + # Check whether --enable-hash or --disable-hash was given. + if test "${enable_hash+set}" = set; then + enableval="$enable_hash" +@@ -46174,7 +47194,7 @@ --php_enable_dom=yes -+php_enable_dio=no --echo $ac_n "checking whether to enable DOM support""... $ac_c" 1>&6 --echo "configure:33139: checking whether to enable DOM support" >&5 --# Check whether --enable-dom or --disable-dom was given. --if test "${enable_dom+set}" = set; then -- enableval="$enable_dom" -- PHP_DOM=$enableval -+echo $ac_n "checking whether to enable direct I/O support""... $ac_c" 1>&6 -+echo "configure:34221: checking whether to enable direct I/O support" >&5 -+# Check whether --enable-dio or --disable-dio was given. -+if test "${enable_dio+set}" = set; then -+ enableval="$enable_dio" -+ PHP_DIO=$enableval + echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 +-echo "configure:46178: checking whether byte ordering is bigendian" >&5 ++echo "configure:47198: checking whether byte ordering is bigendian" >&5 + if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -46184,7 +47204,7 @@ + ac_cv_c_bigendian_php=unknown 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:47224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_c_bigendian_php=yes + else +@@ -46225,7 +47245,7 @@ - fi -@@ -33151,12 +34233,12 @@ fi + echo $ac_n "checking size of short""... $ac_c" 1>&6 +-echo "configure:46229: checking size of short" >&5 ++echo "configure:47249: checking size of short" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -46233,18 +47253,19 @@ + ac_cv_sizeof_short=2 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(short)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:46248: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:47269: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_short=`cat conftestval` + else +@@ -46264,7 +47285,7 @@ - ext_output="yes, shared" - ext_shared=yes --case $PHP_DOM in -+case $PHP_DIO in - shared,*) -- PHP_DOM=`echo "$PHP_DOM"|$SED 's/^shared,//'` -+ PHP_DIO=`echo "$PHP_DIO"|$SED 's/^shared,//'` - ;; - shared) -- PHP_DOM=yes -+ PHP_DIO=yes - ;; - no) - ext_output=no -@@ -33175,30 +34257,370 @@ echo "$ac_t""$ext_output" 1>&6 + echo $ac_n "checking size of int""... $ac_c" 1>&6 +-echo "configure:46268: checking size of int" >&5 ++echo "configure:47289: 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 +@@ -46272,18 +47293,19 @@ + ac_cv_sizeof_int=4 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:46287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:47309: \"$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 +@@ -46303,7 +47325,7 @@ --if test -z "$PHP_LIBXML_DIR"; then -+if test "$PHP_DIO" != "no"; then - --php_with_libxml_dir=no -+ ext_builddir=ext/dio -+ ext_srcdir=$abs_srcdir/ext/dio - --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:33184: checking libxml2 install dir" >&5 --# Check whether --with-libxml-dir or --without-libxml-dir was given. --if test "${with_libxml_dir+set}" = set; then -- withval="$with_libxml_dir" -- PHP_LIBXML_DIR=$withval --else -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_DIO_SHARED=no -+ -+ -+ case ext/dio in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/dio"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/dio/"; ac_bdir="ext/dio/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- PHP_LIBXML_DIR=no - + echo $ac_n "checking size of long""... $ac_c" 1>&6 +-echo "configure:46307: checking size of long" >&5 ++echo "configure:47329: 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 +@@ -46311,18 +47333,19 @@ + ac_cv_sizeof_long=4 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:46326: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:47349: \"$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 +@@ -46342,7 +47365,7 @@ --fi -- -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo --ext_output=$PHP_LIBXML_DIR --echo "$ac_t""$ext_output" 1>&6 - -+ old_IFS=$IFS -+ for ac_src in dio.c dio_common.c dio_posix.c dio_stream_wrappers.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<&6 -+echo "configure:34561: checking whether to enable DOM support" >&5 -+# Check whether --enable-dom or --disable-dom was given. -+if test "${enable_dom+set}" = set; then -+ enableval="$enable_dom" -+ PHP_DOM=$enableval -+else -+ -+ PHP_DOM=yes -+ test "$PHP_ENABLE_ALL" && PHP_DOM=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_DOM in -+shared,*) -+ PHP_DOM=`echo "$PHP_DOM"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_DOM=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test -z "$PHP_LIBXML_DIR"; then -+ -+php_with_libxml_dir=no -+ -+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:34606: checking libxml2 install dir" >&5 -+# Check whether --with-libxml-dir or --without-libxml-dir was given. -+if test "${with_libxml_dir+set}" = set; then -+ withval="$with_libxml_dir" -+ PHP_LIBXML_DIR=$withval -+else -+ -+ PHP_LIBXML_DIR=no -+ -+ -+fi -+ -+ -+ext_output=$PHP_LIBXML_DIR -+echo "$ac_t""$ext_output" 1>&6 - - --fi -+ -+fi - - if test "$PHP_DOM" != "no"; then - -@@ -33208,7 +34630,7 @@ if test "$PHP_DOM" != "no"; then - - - echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:33212: checking for xml2-config path" >&5 -+echo "configure:34634: checking for xml2-config path" >&5 - if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -33366,7 +34788,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:33370: checking whether libxml build works" >&5 -+echo "configure:34792: checking whether libxml build works" >&5 - if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -33382,7 +34804,7 @@ else - - 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:34819: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBS=$old_LIBS -@@ -33816,7 +35238,7 @@ fi - php_with_enchant=no - - echo $ac_n "checking for ENCHANT support""... $ac_c" 1>&6 --echo "configure:33820: checking for ENCHANT support" >&5 -+echo "configure:35242: checking for ENCHANT support" >&5 - # Check whether --with-enchant or --without-enchant was given. - if test "${with_enchant+set}" = set; then - withval="$with_enchant" -@@ -34401,7 +35823,7 @@ EOF - done - - echo $ac_n "checking for enchant_broker_set_param in -lenchant""... $ac_c" 1>&6 --echo "configure:34405: checking for enchant_broker_set_param in -lenchant" >&5 -+echo "configure:35827: checking for enchant_broker_set_param in -lenchant" >&5 - ac_lib_var=`echo enchant'_'enchant_broker_set_param | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -34409,7 +35831,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lenchant $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:35846: \"$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 -@@ -34467,7 +35889,7 @@ fi - php_enable_exif=no - - echo $ac_n "checking whether to enable EXIF (metadata from images) support""... $ac_c" 1>&6 --echo "configure:34471: checking whether to enable EXIF (metadata from images) support" >&5 -+echo "configure:35893: checking whether to enable EXIF (metadata from images) support" >&5 - # Check whether --enable-exif or --disable-exif was given. - if test "${enable_exif+set}" = set; then - enableval="$enable_exif" -@@ -34811,7 +36233,7 @@ fi - php_enable_fileinfo=yes - - echo $ac_n "checking for fileinfo support""... $ac_c" 1>&6 --echo "configure:34815: checking for fileinfo support" >&5 -+echo "configure:36237: checking for fileinfo support" >&5 - # Check whether --enable-fileinfo or --disable-fileinfo was given. - if test "${enable_fileinfo+set}" = set; then - enableval="$enable_fileinfo" -@@ -35161,12 +36583,12 @@ EOF - for ac_func in utimes strndup - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:35165: checking for $ac_func" >&5 -+echo "configure:36587: 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:36615: \"$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 -@@ -35227,7 +36649,7 @@ fi - php_enable_filter=yes - - echo $ac_n "checking whether to enable input filter support""... $ac_c" 1>&6 --echo "configure:35231: checking whether to enable input filter support" >&5 -+echo "configure:36653: checking whether to enable input filter support" >&5 - # Check whether --enable-filter or --disable-filter was given. - if test "${enable_filter+set}" = set; then - enableval="$enable_filter" -@@ -35271,7 +36693,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_with_pcre_dir=no - - echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 --echo "configure:35275: checking pcre install prefix" >&5 -+echo "configure:36697: checking pcre install prefix" >&5 - # Check whether --with-pcre-dir or --without-pcre-dir was given. - if test "${with_pcre_dir+set}" = set; then - withval="$with_pcre_dir" -@@ -35298,7 +36720,7 @@ if test "$PHP_FILTER" != "no"; then - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=$INCLUDES - cat > conftest.$ac_ext < -@@ -35317,7 +36739,7 @@ else - rm -rf conftest* - - cat > conftest.$ac_ext < -@@ -35687,7 +37109,7 @@ fi - php_enable_ftp=no - - echo $ac_n "checking whether to enable FTP support""... $ac_c" 1>&6 --echo "configure:35691: checking whether to enable FTP support" >&5 -+echo "configure:37113: 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" -@@ -35731,7 +37153,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_with_openssl_dir=no - - echo $ac_n "checking OpenSSL dir for FTP""... $ac_c" 1>&6 --echo "configure:35735: checking OpenSSL dir for FTP" >&5 -+echo "configure:37157: checking OpenSSL dir for FTP" >&5 - # Check whether --with-openssl-dir or --without-openssl-dir was given. - if test "${with_openssl_dir+set}" = set; then - withval="$with_openssl_dir" -@@ -36069,7 +37491,7 @@ EOF - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:36073: checking for $ac_word" >&5 -+echo "configure:37495: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -36274,9 +37696,9 @@ fi - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$OPENSSL_INCDIR - echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 --echo "configure:36278: checking for OpenSSL version" >&5 -+echo "configure:37700: checking for OpenSSL version" >&5 - cat > conftest.$ac_ext < -@@ -36431,7 +37853,7 @@ rm -f conftest* - done - - echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:36435: checking for CRYPTO_free in -lcrypto" >&5 -+echo "configure:37857: 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 -@@ -36439,7 +37861,7 @@ else - 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:37876: \"$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 -@@ -36607,7 +38029,7 @@ fi - done - - echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 --echo "configure:36611: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+echo "configure:38033: 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 -@@ -36615,7 +38037,7 @@ else - 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:38052: \"$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 -@@ -36768,7 +38190,7 @@ fi - php_with_gd=no - - echo $ac_n "checking for GD support""... $ac_c" 1>&6 --echo "configure:36772: checking for GD support" >&5 -+echo "configure:38194: checking for GD support" >&5 - # Check whether --with-gd or --without-gd was given. - if test "${with_gd+set}" = set; then - withval="$with_gd" -@@ -36813,7 +38235,7 @@ if test -z "$PHP_JPEG_DIR"; then - php_with_jpeg_dir=no - - echo $ac_n "checking for the location of libjpeg""... $ac_c" 1>&6 --echo "configure:36817: checking for the location of libjpeg" >&5 -+echo "configure:38239: checking for the location of libjpeg" >&5 - # Check whether --with-jpeg-dir or --without-jpeg-dir was given. - if test "${with_jpeg_dir+set}" = set; then - withval="$with_jpeg_dir" -@@ -36838,7 +38260,7 @@ if test -z "$PHP_PNG_DIR"; then - php_with_png_dir=no - - echo $ac_n "checking for the location of libpng""... $ac_c" 1>&6 --echo "configure:36842: checking for the location of libpng" >&5 -+echo "configure:38264: checking for the location of libpng" >&5 - # Check whether --with-png-dir or --without-png-dir was given. - if test "${with_png_dir+set}" = set; then - withval="$with_png_dir" -@@ -36863,7 +38285,7 @@ if test -z "$PHP_ZLIB_DIR"; then - php_with_zlib_dir=no - - echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:36867: checking for the location of libz" >&5 -+echo "configure:38289: checking for the location of libz" >&5 - # Check whether --with-zlib-dir or --without-zlib-dir was given. - if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" -@@ -36887,7 +38309,7 @@ fi - php_with_xpm_dir=no - - echo $ac_n "checking for the location of libXpm""... $ac_c" 1>&6 --echo "configure:36891: checking for the location of libXpm" >&5 -+echo "configure:38313: checking for the location of libXpm" >&5 - # Check whether --with-xpm-dir or --without-xpm-dir was given. - if test "${with_xpm_dir+set}" = set; then - withval="$with_xpm_dir" -@@ -36910,7 +38332,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_with_freetype_dir=no - - echo $ac_n "checking for FreeType 2""... $ac_c" 1>&6 --echo "configure:36914: checking for FreeType 2" >&5 -+echo "configure:38336: checking for FreeType 2" >&5 - # Check whether --with-freetype-dir or --without-freetype-dir was given. - if test "${with_freetype_dir+set}" = set; then - withval="$with_freetype_dir" -@@ -36933,7 +38355,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_with_t1lib=no - - echo $ac_n "checking for T1lib support""... $ac_c" 1>&6 --echo "configure:36937: checking for T1lib support" >&5 -+echo "configure:38359: checking for T1lib support" >&5 - # Check whether --with-t1lib or --without-t1lib was given. - if test "${with_t1lib+set}" = set; then - withval="$with_t1lib" -@@ -36956,7 +38378,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_enable_gd_native_ttf=no - - echo $ac_n "checking whether to enable truetype string function in GD""... $ac_c" 1>&6 --echo "configure:36960: checking whether to enable truetype string function in GD" >&5 -+echo "configure:38382: 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" -@@ -36979,7 +38401,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_enable_gd_jis_conv=no - - echo $ac_n "checking whether to enable JIS-mapped Japanese font support in GD""... $ac_c" 1>&6 --echo "configure:36983: checking whether to enable JIS-mapped Japanese font support in GD" >&5 -+echo "configure:38405: checking whether to enable JIS-mapped Japanese font support in GD" >&5 - # Check whether --enable-gd-jis-conv or --disable-gd-jis-conv was given. - if test "${enable_gd_jis_conv+set}" = set; then - enableval="$enable_gd_jis_conv" -@@ -37031,12 +38453,12 @@ if test "$PHP_GD" = "yes"; then - for ac_func in fabsf floorf - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:37035: checking for $ac_func" >&5 -+echo "configure:38457: 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:38485: \"$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 -@@ -37231,7 +38653,7 @@ EOF - done - - echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 --echo "configure:37235: checking for jpeg_read_header in -ljpeg" >&5 -+echo "configure:38657: 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 -@@ -37239,7 +38661,7 @@ else - 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:38676: \"$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 -@@ -37528,7 +38950,7 @@ fi - done - - echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 --echo "configure:37532: checking for png_write_image in -lpng" >&5 -+echo "configure:38954: checking for png_write_image in -lpng" >&5 - ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -37536,7 +38958,7 @@ else - 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:38973: \"$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 -@@ -37927,7 +39349,7 @@ fi - done - - echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 --echo "configure:37931: checking for XpmFreeXpmImage in -lXpm" >&5 -+echo "configure:39353: 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 -@@ -37935,7 +39357,7 @@ else - 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:39372: \"$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 -@@ -38321,7 +39743,7 @@ fi - done - - echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 --echo "configure:38325: checking for FT_New_Face in -lfreetype" >&5 -+echo "configure:39747: checking for FT_New_Face in -lfreetype" >&5 - ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -38329,7 +39751,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lfreetype $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:39766: \"$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 -@@ -38657,7 +40079,7 @@ fi - done - - echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 --echo "configure:38661: checking for T1_StrError in -lt1" >&5 -+echo "configure:40083: checking for T1_StrError in -lt1" >&5 - ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -38665,7 +40087,7 @@ else - 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:40102: \"$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 -@@ -39119,7 +40541,7 @@ EOF - done - - echo $ac_n "checking for jpeg_read_header in -ljpeg""... $ac_c" 1>&6 --echo "configure:39123: checking for jpeg_read_header in -ljpeg" >&5 -+echo "configure:40545: 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 -@@ -39127,7 +40549,7 @@ else - 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:40564: \"$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 -@@ -39416,7 +40838,7 @@ fi - done - - echo $ac_n "checking for png_write_image in -lpng""... $ac_c" 1>&6 --echo "configure:39420: checking for png_write_image in -lpng" >&5 -+echo "configure:40842: checking for png_write_image in -lpng" >&5 - ac_lib_var=`echo png'_'png_write_image | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -39424,7 +40846,7 @@ else - 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:40861: \"$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 -@@ -39815,7 +41237,7 @@ fi - done - - echo $ac_n "checking for XpmFreeXpmImage in -lXpm""... $ac_c" 1>&6 --echo "configure:39819: checking for XpmFreeXpmImage in -lXpm" >&5 -+echo "configure:41241: 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 -@@ -39823,7 +41245,7 @@ else - 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:41260: \"$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 -@@ -40209,7 +41631,7 @@ fi - done - - echo $ac_n "checking for FT_New_Face in -lfreetype""... $ac_c" 1>&6 --echo "configure:40213: checking for FT_New_Face in -lfreetype" >&5 -+echo "configure:41635: checking for FT_New_Face in -lfreetype" >&5 - ac_lib_var=`echo freetype'_'FT_New_Face | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -40217,7 +41639,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lfreetype $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:41654: \"$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 -@@ -40545,7 +41967,7 @@ fi - done - - echo $ac_n "checking for T1_StrError in -lt1""... $ac_c" 1>&6 --echo "configure:40549: checking for T1_StrError in -lt1" >&5 -+echo "configure:41971: checking for T1_StrError in -lt1" >&5 - ac_lib_var=`echo t1'_'T1_StrError | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -40553,7 +41975,7 @@ else - 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:41990: \"$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 -@@ -40939,7 +42361,7 @@ EOF - done - - echo $ac_n "checking for gdImageString16 in -lgd""... $ac_c" 1>&6 --echo "configure:40943: checking for gdImageString16 in -lgd" >&5 -+echo "configure:42365: 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 -@@ -40947,7 +42369,7 @@ else - 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:42384: \"$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 -@@ -41087,7 +42509,7 @@ fi - done - - echo $ac_n "checking for gdImagePaletteCopy in -lgd""... $ac_c" 1>&6 --echo "configure:41091: checking for gdImagePaletteCopy in -lgd" >&5 -+echo "configure:42513: 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 -@@ -41095,7 +42517,7 @@ else - 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:42532: \"$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 -@@ -41235,7 +42657,7 @@ fi - done - - echo $ac_n "checking for gdImageCreateFromPng in -lgd""... $ac_c" 1>&6 --echo "configure:41239: checking for gdImageCreateFromPng in -lgd" >&5 -+echo "configure:42661: 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 -@@ -41243,7 +42665,7 @@ else - 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: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 -@@ -41383,7 +42805,7 @@ fi - done - - echo $ac_n "checking for gdImageCreateFromGif in -lgd""... $ac_c" 1>&6 --echo "configure:41387: checking for gdImageCreateFromGif in -lgd" >&5 -+echo "configure:42809: 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 -@@ -41391,7 +42813,7 @@ else - 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:42828: \"$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 -@@ -41531,7 +42953,7 @@ fi - done - - echo $ac_n "checking for gdImageGif in -lgd""... $ac_c" 1>&6 --echo "configure:41535: checking for gdImageGif in -lgd" >&5 -+echo "configure:42957: checking for gdImageGif in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageGif | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -41539,7 +42961,7 @@ else - 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:42976: \"$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 -@@ -41679,7 +43101,7 @@ fi - done - - echo $ac_n "checking for gdImageWBMP in -lgd""... $ac_c" 1>&6 --echo "configure:41683: checking for gdImageWBMP in -lgd" >&5 -+echo "configure:43105: 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 -@@ -41687,7 +43109,7 @@ else - 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:43124: \"$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 -@@ -41827,7 +43249,7 @@ fi - done - - echo $ac_n "checking for gdImageCreateFromJpeg in -lgd""... $ac_c" 1>&6 --echo "configure:41831: checking for gdImageCreateFromJpeg in -lgd" >&5 -+echo "configure:43253: 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 -@@ -41835,7 +43257,7 @@ else - 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:43272: \"$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 -@@ -41975,7 +43397,7 @@ fi - done - - echo $ac_n "checking for gdImageCreateFromXpm in -lgd""... $ac_c" 1>&6 --echo "configure:41979: checking for gdImageCreateFromXpm in -lgd" >&5 -+echo "configure:43401: 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 -@@ -41983,7 +43405,7 @@ else - 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:43420: \"$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 -@@ -42123,7 +43545,7 @@ fi - done - - echo $ac_n "checking for gdImageCreateFromGd2 in -lgd""... $ac_c" 1>&6 --echo "configure:42127: checking for gdImageCreateFromGd2 in -lgd" >&5 -+echo "configure:43549: checking for gdImageCreateFromGd2 in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageCreateFromGd2 | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42131,7 +43553,7 @@ else - 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:43568: \"$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 -@@ -42271,7 +43693,7 @@ fi - done - - echo $ac_n "checking for gdImageCreateTrueColor in -lgd""... $ac_c" 1>&6 --echo "configure:42275: checking for gdImageCreateTrueColor in -lgd" >&5 -+echo "configure:43697: checking for gdImageCreateTrueColor in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageCreateTrueColor | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42279,7 +43701,7 @@ else - 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:43716: \"$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 -@@ -42419,7 +43841,7 @@ fi - done - - echo $ac_n "checking for gdImageSetTile in -lgd""... $ac_c" 1>&6 --echo "configure:42423: checking for gdImageSetTile in -lgd" >&5 -+echo "configure:43845: checking for gdImageSetTile in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageSetTile | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42427,7 +43849,7 @@ else - 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:43864: \"$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 -@@ -42567,7 +43989,7 @@ fi - done - - echo $ac_n "checking for gdImageEllipse in -lgd""... $ac_c" 1>&6 --echo "configure:42571: checking for gdImageEllipse in -lgd" >&5 -+echo "configure:43993: checking for gdImageEllipse in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageEllipse | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42575,7 +43997,7 @@ else - 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:44012: \"$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 -@@ -42715,7 +44137,7 @@ fi - done - - echo $ac_n "checking for gdImageSetBrush in -lgd""... $ac_c" 1>&6 --echo "configure:42719: checking for gdImageSetBrush in -lgd" >&5 -+echo "configure:44141: checking for gdImageSetBrush in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageSetBrush | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42723,7 +44145,7 @@ else - 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:44160: \"$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 -@@ -42863,7 +44285,7 @@ fi - done - - echo $ac_n "checking for gdImageStringTTF in -lgd""... $ac_c" 1>&6 --echo "configure:42867: checking for gdImageStringTTF in -lgd" >&5 -+echo "configure:44289: checking for gdImageStringTTF in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageStringTTF | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -42871,7 +44293,7 @@ else - 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:44308: \"$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 -@@ -43011,7 +44433,7 @@ fi - done - - echo $ac_n "checking for gdImageStringFT in -lgd""... $ac_c" 1>&6 --echo "configure:43015: checking for gdImageStringFT in -lgd" >&5 -+echo "configure:44437: checking for gdImageStringFT in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageStringFT | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43019,7 +44441,7 @@ else - 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:44456: \"$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 -@@ -43159,7 +44581,7 @@ fi - done - - echo $ac_n "checking for gdImageStringFTEx in -lgd""... $ac_c" 1>&6 --echo "configure:43163: checking for gdImageStringFTEx in -lgd" >&5 -+echo "configure:44585: checking for gdImageStringFTEx in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageStringFTEx | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43167,7 +44589,7 @@ else - 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:44604: \"$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 -@@ -43307,7 +44729,7 @@ fi - done - - echo $ac_n "checking for gdImageColorClosestHWB in -lgd""... $ac_c" 1>&6 --echo "configure:43311: checking for gdImageColorClosestHWB in -lgd" >&5 -+echo "configure:44733: 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 -@@ -43315,7 +44737,7 @@ else - 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:44752: \"$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 -@@ -43455,7 +44877,7 @@ fi - done - - echo $ac_n "checking for gdImageColorResolve in -lgd""... $ac_c" 1>&6 --echo "configure:43459: checking for gdImageColorResolve in -lgd" >&5 -+echo "configure:44881: 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 -@@ -43463,7 +44885,7 @@ else - 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:44900: \"$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 -@@ -43603,7 +45025,7 @@ fi - done - - echo $ac_n "checking for gdImageGifCtx in -lgd""... $ac_c" 1>&6 --echo "configure:43607: checking for gdImageGifCtx in -lgd" >&5 -+echo "configure:45029: checking for gdImageGifCtx in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageGifCtx | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43611,7 +45033,7 @@ else - 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:45048: \"$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 -@@ -43751,7 +45173,7 @@ fi - done - - echo $ac_n "checking for gdCacheCreate in -lgd""... $ac_c" 1>&6 --echo "configure:43755: checking for gdCacheCreate in -lgd" >&5 -+echo "configure:45177: checking for gdCacheCreate in -lgd" >&5 - ac_lib_var=`echo gd'_'gdCacheCreate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43759,7 +45181,7 @@ else - 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:45196: \"$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 -@@ -43899,7 +45321,7 @@ fi - done - - echo $ac_n "checking for gdFontCacheShutdown in -lgd""... $ac_c" 1>&6 --echo "configure:43903: checking for gdFontCacheShutdown in -lgd" >&5 -+echo "configure:45325: checking for gdFontCacheShutdown in -lgd" >&5 - ac_lib_var=`echo gd'_'gdFontCacheShutdown | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -43907,7 +45329,7 @@ else - 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:45344: \"$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 -@@ -44047,7 +45469,7 @@ fi - done - - echo $ac_n "checking for gdFreeFontCache in -lgd""... $ac_c" 1>&6 --echo "configure:44051: checking for gdFreeFontCache in -lgd" >&5 -+echo "configure:45473: checking for gdFreeFontCache in -lgd" >&5 - ac_lib_var=`echo gd'_'gdFreeFontCache | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -44055,7 +45477,7 @@ else - 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:45492: \"$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 -@@ -44195,7 +45617,7 @@ fi - done - - echo $ac_n "checking for gdFontCacheMutexSetup in -lgd""... $ac_c" 1>&6 --echo "configure:44199: checking for gdFontCacheMutexSetup in -lgd" >&5 -+echo "configure:45621: checking for gdFontCacheMutexSetup in -lgd" >&5 - ac_lib_var=`echo gd'_'gdFontCacheMutexSetup | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -44203,7 +45625,7 @@ else - 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:45640: \"$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 -@@ -44343,7 +45765,7 @@ fi - done - - echo $ac_n "checking for gdNewDynamicCtxEx in -lgd""... $ac_c" 1>&6 --echo "configure:44347: checking for gdNewDynamicCtxEx in -lgd" >&5 -+echo "configure:45769: checking for gdNewDynamicCtxEx in -lgd" >&5 - ac_lib_var=`echo gd'_'gdNewDynamicCtxEx | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -44351,7 +45773,7 @@ else - 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:45788: \"$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 -@@ -44417,7 +45839,7 @@ fi - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$GD_INCLUDE - cat > conftest.$ac_ext < -@@ -44431,7 +45853,7 @@ ctx->gd_free = 1; - - ; return 0; } - EOF --if { (eval echo configure:44435: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:45857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <<\EOF -@@ -44762,7 +46184,7 @@ EOF - - 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:46199: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBS=$old_LIBS -@@ -44924,7 +46346,7 @@ fi - done - - echo $ac_n "checking for gdImageCreate in -lgd""... $ac_c" 1>&6 --echo "configure:44928: checking for gdImageCreate in -lgd" >&5 -+echo "configure:46350: checking for gdImageCreate in -lgd" >&5 - ac_lib_var=`echo gd'_'gdImageCreate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -44932,7 +46354,7 @@ else - 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:46369: \"$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 -@@ -45008,7 +46430,7 @@ fi - php_with_gettext=no - - echo $ac_n "checking for GNU gettext support""... $ac_c" 1>&6 --echo "configure:45012: checking for GNU gettext support" >&5 -+echo "configure:46434: checking for GNU gettext support" >&5 - # Check whether --with-gettext or --without-gettext was given. - if test "${with_gettext+set}" = set; then - withval="$with_gettext" -@@ -45063,7 +46485,7 @@ if test "$PHP_GETTEXT" != "no"; then - O_LDFLAGS=$LDFLAGS - LDFLAGS="$LDFLAGS -L$GETTEXT_LIBDIR" - echo $ac_n "checking for bindtextdomain in -lintl""... $ac_c" 1>&6 --echo "configure:45067: checking for bindtextdomain in -lintl" >&5 -+echo "configure:46489: 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 -@@ -45071,7 +46493,7 @@ else - 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:46508: \"$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 -@@ -45104,7 +46526,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for bindtextdomain in -lc""... $ac_c" 1>&6 --echo "configure:45108: checking for bindtextdomain in -lc" >&5 -+echo "configure:46530: 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 -@@ -45112,7 +46534,7 @@ else - 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:46549: \"$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 -@@ -45587,7 +47009,7 @@ EOF - - - echo $ac_n "checking for ngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 --echo "configure:45591: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:47013: checking for ngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 - ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'ngettext | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45595,7 +47017,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:47032: \"$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 -@@ -45630,7 +47052,7 @@ else - fi - - echo $ac_n "checking for dngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 --echo "configure:45634: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:47056: checking for dngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 - ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dngettext | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45638,7 +47060,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:47075: \"$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 -@@ -45673,7 +47095,7 @@ else - fi - - echo $ac_n "checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 --echo "configure:45677: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:47099: checking for dcngettext in -l$GETTEXT_CHECK_IN_LIB" >&5 - ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'dcngettext | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45681,7 +47103,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:47118: \"$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 -@@ -45716,7 +47138,7 @@ else - fi - - echo $ac_n "checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB""... $ac_c" 1>&6 --echo "configure:45720: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 -+echo "configure:47142: checking for bind_textdomain_codeset in -l$GETTEXT_CHECK_IN_LIB" >&5 - ac_lib_var=`echo $GETTEXT_CHECK_IN_LIB'_'bind_textdomain_codeset | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45724,7 +47146,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$GETTEXT_CHECK_IN_LIB $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:47161: \"$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 -@@ -45766,7 +47188,7 @@ fi - php_with_gmp=no - - echo $ac_n "checking for GNU MP support""... $ac_c" 1>&6 --echo "configure:45770: checking for GNU MP support" >&5 -+echo "configure:47192: checking for GNU MP support" >&5 - # Check whether --with-gmp or --without-gmp was given. - if test "${with_gmp+set}" = set; then - withval="$with_gmp" -@@ -45914,7 +47336,7 @@ if test "$PHP_GMP" != "no"; then - done - - echo $ac_n "checking for __gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 --echo "configure:45918: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 -+echo "configure:47340: checking for __gmp_randinit_lc_2exp_size in -lgmp" >&5 - ac_lib_var=`echo gmp'_'__gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -45922,7 +47344,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:47359: \"$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 -@@ -46058,7 +47480,7 @@ else - done - - echo $ac_n "checking for gmp_randinit_lc_2exp_size in -lgmp""... $ac_c" 1>&6 --echo "configure:46062: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 -+echo "configure:47484: checking for gmp_randinit_lc_2exp_size in -lgmp" >&5 - ac_lib_var=`echo gmp'_'gmp_randinit_lc_2exp_size | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -46066,7 +47488,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgmp $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:47503: \"$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 -@@ -46549,7 +47971,7 @@ fi - php_with_mhash=no - - echo $ac_n "checking for mhash support""... $ac_c" 1>&6 --echo "configure:46553: checking for mhash support" >&5 -+echo "configure:47975: checking for mhash support" >&5 - # Check whether --with-mhash or --without-mhash was given. - if test "${with_mhash+set}" = set; then - withval="$with_mhash" -@@ -46593,7 +48015,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_enable_hash=yes - - echo $ac_n "checking whether to enable hash support""... $ac_c" 1>&6 --echo "configure:46597: checking whether to enable hash support" >&5 -+echo "configure:48019: checking whether to enable hash support" >&5 - # Check whether --enable-hash or --disable-hash was given. - if test "${enable_hash+set}" = set; then - enableval="$enable_hash" -@@ -46651,7 +48073,7 @@ EOF - - - echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6 --echo "configure:46655: checking whether byte ordering is bigendian" >&5 -+echo "configure:48077: checking whether byte ordering is bigendian" >&5 - if eval "test \"`echo '$''{'ac_cv_c_bigendian_php'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -46661,7 +48083,7 @@ else - ac_cv_c_bigendian_php=unknown - 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:48103: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_c_bigendian_php=yes - else -@@ -46702,7 +48124,7 @@ EOF - - - echo $ac_n "checking size of short""... $ac_c" 1>&6 --echo "configure:46706: checking size of short" >&5 -+echo "configure:48128: checking size of short" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -46710,9 +48132,10 @@ else - ac_cv_sizeof_short=2 - else - cat > conftest.$ac_ext < -+#include - main() - { - FILE *f=fopen("conftestval", "w"); -@@ -46721,7 +48144,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:46725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:48148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_short=`cat conftestval` - else -@@ -46741,7 +48164,7 @@ EOF - - - echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:46745: checking size of int" >&5 -+echo "configure:48168: 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 -@@ -46749,9 +48172,10 @@ else - ac_cv_sizeof_int=4 - else - cat > conftest.$ac_ext < -+#include - main() - { - FILE *f=fopen("conftestval", "w"); -@@ -46760,7 +48184,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:46764: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:48188: \"$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 -@@ -46780,7 +48204,7 @@ EOF - - - echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:46784: checking size of long" >&5 -+echo "configure:48208: 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 -@@ -46788,9 +48212,10 @@ else - ac_cv_sizeof_long=4 - else - cat > conftest.$ac_ext < -+#include - main() - { - FILE *f=fopen("conftestval", "w"); -@@ -46799,7 +48224,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:46803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:48228: \"$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 -@@ -46819,7 +48244,7 @@ EOF - - - echo $ac_n "checking size of long long""... $ac_c" 1>&6 --echo "configure:46823: checking size of long long" >&5 -+echo "configure:48248: 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 -@@ -46827,9 +48252,10 @@ else - ac_cv_sizeof_long_long=8 - else - cat > conftest.$ac_ext < -+#include - main() - { - FILE *f=fopen("conftestval", "w"); -@@ -46838,7 +48264,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:46842: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:48268: \"$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 -@@ -47184,10 +48610,13 @@ fi - - - -+ -+ -+ - php_with_iconv=yes - - echo $ac_n "checking for iconv support""... $ac_c" 1>&6 --echo "configure:47191: checking for iconv support" >&5 -+echo "configure:48620: checking for iconv support" >&5 - # Check whether --with-iconv or --without-iconv was given. - if test "${with_iconv+set}" = set; then - withval="$with_iconv" -@@ -47248,12 +48677,12 @@ if test "$PHP_ICONV" != "no"; then - - if test "$PHP_ICONV" = "yes"; then - echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:47252: checking for iconv" >&5 -+echo "configure:48681: checking for iconv" >&5 - if eval "test \"`echo '$''{'ac_cv_func_iconv'+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:48709: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_iconv=yes" - else -@@ -47297,12 +48726,12 @@ else - echo "$ac_t""no" 1>&6 - - echo $ac_n "checking for libiconv""... $ac_c" 1>&6 --echo "configure:47301: checking for libiconv" >&5 -+echo "configure:48730: checking for libiconv" >&5 - if eval "test \"`echo '$''{'ac_cv_func_libiconv'+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:48758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_libiconv=yes" - else -@@ -47481,7 +48910,7 @@ EOF - done - - echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 --echo "configure:47485: checking for libiconv in -l$iconv_lib_name" >&5 -+echo "configure:48914: checking for libiconv in -l$iconv_lib_name" >&5 - ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -47489,7 +48918,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$iconv_lib_name $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:48933: \"$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 -@@ -47641,7 +49070,7 @@ else - done - - echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 --echo "configure:47645: checking for iconv in -l$iconv_lib_name" >&5 -+echo "configure:49074: checking for iconv in -l$iconv_lib_name" >&5 - ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -47649,7 +49078,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$iconv_lib_name $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:49093: \"$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 -@@ -47871,16 +49300,16 @@ else - fi - - echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6 --echo "configure:47875: checking if iconv is glibc's" >&5 -+echo "configure:49304: checking if iconv is glibc's" >&5 - cat > conftest.$ac_ext < - int main() { - gnu_get_libc_version(); - ; return 0; } - EOF --if { (eval echo configure:47884: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:49313: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 -@@ -47898,7 +49327,7 @@ rm -f conftest* - - if test -z "$iconv_impl_name"; then - echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6 --echo "configure:47902: checking if using GNU libiconv" >&5 -+echo "configure:49331: checking if using GNU libiconv" >&5 - php_iconv_old_ld="$LDFLAGS" - LDFLAGS="-liconv $LDFLAGS" - if test "$cross_compiling" = yes; then -@@ -47908,7 +49337,7 @@ echo "configure:47902: checking if using - - else - cat > conftest.$ac_ext < -@@ -47918,7 +49347,7 @@ int main() { - } - - EOF --if { (eval echo configure:47922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:49351: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - echo "$ac_t""yes" 1>&6 -@@ -47940,16 +49369,16 @@ fi - - if test -z "$iconv_impl_name"; then - echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6 --echo "configure:47944: checking if iconv is Konstantin Chuguev's" >&5 -+echo "configure:49373: checking if iconv is Konstantin Chuguev's" >&5 - cat > conftest.$ac_ext < - int main() { - iconv_ccs_init(NULL, NULL); - ; return 0; } - EOF --if { (eval echo configure:47953: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:49382: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 -@@ -47968,18 +49397,18 @@ rm -f conftest* - - if test -z "$iconv_impl_name"; then - echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6 --echo "configure:47972: checking if using IBM iconv" >&5 -+echo "configure:49401: checking if using IBM iconv" >&5 - php_iconv_old_ld="$LDFLAGS" - LDFLAGS="-liconv $LDFLAGS" - cat > conftest.$ac_ext < - int main() { - cstoccsid(""); - ; return 0; } - EOF --if { (eval echo configure:47983: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:49412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 -@@ -48165,7 +49594,7 @@ EOF - esac - - echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6 --echo "configure:48169: checking if iconv supports errno" >&5 -+echo "configure:49598: checking if iconv supports errno" >&5 - if test "$cross_compiling" = yes; then - - echo "$ac_t""no" 1>&6 -@@ -48179,7 +49608,7 @@ EOF - - else - cat > conftest.$ac_ext < -@@ -48200,7 +49629,7 @@ int main() { - } - - EOF --if { (eval echo configure:48204: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:49633: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - echo "$ac_t""yes" 1>&6 -@@ -48232,9 +49661,9 @@ fi - - - echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6 --echo "configure:48236: checking if your cpp allows macro usage in include lines" >&5 -+echo "configure:49665: checking if your cpp allows macro usage in include lines" >&5 - cat > conftest.$ac_ext < -@@ -48244,7 +49673,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:48248: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:49677: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - echo "$ac_t""yes" 1>&6 -@@ -48600,7 +50029,7 @@ fi - php_with_imap=no - - echo $ac_n "checking for IMAP support""... $ac_c" 1>&6 --echo "configure:48604: checking for IMAP support" >&5 -+echo "configure:50033: checking for IMAP support" >&5 - # Check whether --with-imap or --without-imap was given. - if test "${with_imap+set}" = set; then - withval="$with_imap" -@@ -48644,7 +50073,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_with_kerberos=no - - echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6 --echo "configure:48648: checking for IMAP Kerberos support" >&5 -+echo "configure:50077: checking for IMAP Kerberos support" >&5 - # Check whether --with-kerberos or --without-kerberos was given. - if test "${with_kerberos+set}" = set; then - withval="$with_kerberos" -@@ -48667,7 +50096,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_with_imap_ssl=no - - echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6 --echo "configure:48671: checking for IMAP SSL support" >&5 -+echo "configure:50100: checking for IMAP SSL support" >&5 - # Check whether --with-imap-ssl or --without-imap-ssl was given. - if test "${with_imap_ssl+set}" = set; then - withval="$with_imap_ssl" -@@ -49071,7 +50500,7 @@ EOF - done - - cat > conftest.$ac_ext < - EOF -@@ -49091,12 +50520,12 @@ rm -f conftest* - old_CFLAGS=$CFLAGS - CFLAGS="-I$IMAP_INC_DIR" - echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6 --echo "configure:49095: checking for utf8_mime2text signature" >&5 -+echo "configure:50524: checking for utf8_mime2text signature" >&5 - if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -49109,7 +50538,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:49113: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:50542: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - ac_cv_utf8_mime2text=old -@@ -49138,12 +50567,12 @@ EOF - old_CFLAGS=$CFLAGS - CFLAGS="-I$IMAP_INC_DIR" - echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6 --echo "configure:49142: checking for U8T_DECOMPOSE" >&5 -+echo "configure:50571: checking for U8T_DECOMPOSE" >&5 - if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -@@ -49154,7 +50583,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:49158: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:50587: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - ac_cv_u8t_decompose=yes -@@ -49184,7 +50613,7 @@ echo "$ac_t""$ac_cv_u8t_canonical" 1>&6 - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$IMAP_INC_DIR - cat > conftest.$ac_ext <&6 --echo "configure:49307: checking for pam_start in -lpam" >&5 -+echo "configure:50736: 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 -@@ -49311,7 +50740,7 @@ else - 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:50755: \"$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 -@@ -49477,7 +50906,7 @@ fi - done - - echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 --echo "configure:49481: checking for crypt in -lcrypt" >&5 -+echo "configure:50910: 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 -@@ -49485,7 +50914,7 @@ else - 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:50929: \"$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 -@@ -49700,7 +51129,7 @@ fi - # Extract the first word of "krb5-config", so it can be a program name with args. - set dummy krb5-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:49704: checking for $ac_word" >&5 -+echo "configure:51133: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -50069,7 +51498,7 @@ else - - else - cat > conftest.$ac_ext < - EOF -@@ -50110,7 +51539,7 @@ rm -f conftest* - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:50114: checking for $ac_word" >&5 -+echo "configure:51543: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -50315,9 +51744,9 @@ fi - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$OPENSSL_INCDIR - echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 --echo "configure:50319: checking for OpenSSL version" >&5 -+echo "configure:51748: checking for OpenSSL version" >&5 - cat > conftest.$ac_ext < -@@ -50472,7 +51901,7 @@ rm -f conftest* - done - - echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:50476: checking for CRYPTO_free in -lcrypto" >&5 -+echo "configure:51905: 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 -@@ -50480,7 +51909,7 @@ else - 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:51924: \"$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 -@@ -50648,7 +52077,7 @@ fi - done - - echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 --echo "configure:50652: checking for SSL_CTX_set_ssl_version in -lssl" >&5 -+echo "configure:52081: 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 -@@ -50656,7 +52085,7 @@ else - 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:52100: \"$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 -@@ -50809,7 +52238,7 @@ else - - elif test -f "$IMAP_INC_DIR/linkage.c"; then - cat > conftest.$ac_ext < - EOF -@@ -50840,7 +52269,7 @@ rm -f conftest* - - 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:52306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBS=$old_LIBS -@@ -50909,7 +52338,7 @@ fi - - 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:52375: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBS=$old_LIBS -@@ -50969,7 +52398,7 @@ fi - - - echo $ac_n "checking whether rfc822_output_address_list function present""... $ac_c" 1>&6 --echo "configure:50973: checking whether rfc822_output_address_list function present" >&5 -+echo "configure:52402: checking whether rfc822_output_address_list function present" >&5 - - old_LIBS=$LIBS - LIBS=" -@@ -50981,7 +52410,7 @@ echo "configure:50973: checking whether - - 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:52450: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBS=$old_LIBS -@@ -51046,7 +52475,7 @@ fi - - - echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6 --echo "configure:51050: checking whether build with IMAP works" >&5 -+echo "configure:52479: checking whether build with IMAP works" >&5 - - - old_LIBS=$LIBS -@@ -51057,7 +52486,7 @@ echo "configure:51050: checking whether - - 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:52523: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBS=$old_LIBS -@@ -51122,7 +52551,7 @@ fi - php_with_interbase=no - - echo $ac_n "checking for InterBase support""... $ac_c" 1>&6 --echo "configure:51126: checking for InterBase support" >&5 -+echo "configure:52555: checking for InterBase support" >&5 - # Check whether --with-interbase or --without-interbase was given. - if test "${with_interbase+set}" = set; then - withval="$with_interbase" -@@ -51269,7 +52698,7 @@ if test "$PHP_INTERBASE" != "no"; then - done - - echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 --echo "configure:51273: checking for isc_detach_database in -lfbclient" >&5 -+echo "configure:52702: checking for isc_detach_database in -lfbclient" >&5 - ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -51277,7 +52706,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lfbclient $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:52721: \"$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 -@@ -51415,7 +52844,7 @@ else - done - - echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 --echo "configure:51419: checking for isc_detach_database in -lgds" >&5 -+echo "configure:52848: checking for isc_detach_database in -lgds" >&5 - ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -51423,7 +52852,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgds $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:52867: \"$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 -@@ -51561,7 +52990,7 @@ else - done - - echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 --echo "configure:51565: checking for isc_detach_database in -lib_util" >&5 -+echo "configure:52994: checking for isc_detach_database in -lib_util" >&5 - ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -51569,7 +52998,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lib_util $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:53013: \"$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 -@@ -52057,7 +53486,7 @@ fi - php_enable_intl=no - - echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6 --echo "configure:52061: checking whether to enable internationalization support" >&5 -+echo "configure:53490: checking whether to enable internationalization support" >&5 - # Check whether --enable-intl or --disable-intl was given. - if test "${enable_intl+set}" = set; then - enableval="$enable_intl" -@@ -52129,7 +53558,7 @@ ext_output=$PHP_ICU_DIR - # Extract the first word of "icu-config", so it can be a program name with args. - set dummy icu-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:52133: checking for $ac_word" >&5 -+echo "configure:53562: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -52167,7 +53596,7 @@ fi - fi - - echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6 --echo "configure:52171: checking for location of ICU headers and libraries" >&5 -+echo "configure:53600: checking for location of ICU headers and libraries" >&5 - - icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` - if test "$?" != "0" || test -z "$icu_install_prefix"; then -@@ -52177,7 +53606,7 @@ echo "configure:52171: checking for loca - echo "$ac_t""$icu_install_prefix" 1>&6 - - echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6 --echo "configure:52181: checking for ICU 3.4 or greater" >&5 -+echo "configure:53610: checking for ICU 3.4 or greater" >&5 - icu_version_full=`$ICU_CONFIG --version` - ac_IFS=$IFS - IFS="." -@@ -52334,7 +53763,7 @@ do - # 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:52338: checking for $ac_word" >&5 -+echo "configure:53767: 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 -@@ -52366,7 +53795,7 @@ test -n "$CXX" || CXX="gcc" - - - echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 --echo "configure:52370: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 -+echo "configure:53799: 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. -@@ -52377,12 +53806,12 @@ cross_compiling=$ac_cv_prog_cxx_cross - - cat > conftest.$ac_ext << EOF - --#line 52381 "configure" -+#line 53810 "configure" - #include "confdefs.h" - - int main(){return(0);} - EOF --if { (eval echo configure:52386: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:53815: \"$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 -@@ -52408,12 +53837,12 @@ if test $ac_cv_prog_cxx_works = no; then - { 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:52412: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 -+echo "configure:53841: 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:52417: checking whether we are using GNU C++" >&5 -+echo "configure:53846: 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 -@@ -52422,7 +53851,7 @@ else - yes; - #endif - EOF --if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:52426: \"$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:53855: \"$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 -@@ -52441,7 +53870,7 @@ ac_test_CXXFLAGS="${CXXFLAGS+set}" - ac_save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS= - echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 --echo "configure:52445: checking whether ${CXX-g++} accepts -g" >&5 -+echo "configure:53874: 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 -@@ -52473,7 +53902,7 @@ else - fi - - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:52477: checking how to run the C++ preprocessor" >&5 -+echo "configure:53906: 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 -@@ -52486,12 +53915,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee - 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:52495: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:53924: \"$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 - : -@@ -53049,7 +54478,7 @@ fi - php_enable_json=yes - - echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6 --echo "configure:53053: checking whether to enable JavaScript Object Serialization support" >&5 -+echo "configure:54482: checking whether to enable JavaScript Object Serialization support" >&5 - # Check whether --enable-json or --disable-json was given. - if test "${enable_json+set}" = set; then - enableval="$enable_json" -@@ -53095,12 +54524,12 @@ if test "$PHP_JSON" != "no"; then - EOF - - echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:53099: checking for ANSI C header files" >&5 -+echo "configure:54528: 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 -@@ -53108,7 +54537,7 @@ else - #include - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:53112: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:54541: \"$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* -@@ -53125,7 +54554,7 @@ rm -f conftest* - 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 -@@ -53143,7 +54572,7 @@ fi - 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 -@@ -53164,7 +54593,7 @@ if test "$cross_compiling" = yes; then - : - else - cat > conftest.$ac_ext < - #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -@@ -53175,7 +54604,7 @@ if (XOR (islower (i), ISLOWER (i)) || to - exit (0); } - - EOF --if { (eval echo configure:53179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:54608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - : - else -@@ -53525,7 +54954,7 @@ fi - php_with_ldap=no - - echo $ac_n "checking for LDAP support""... $ac_c" 1>&6 --echo "configure:53529: checking for LDAP support" >&5 -+echo "configure:54958: checking for LDAP support" >&5 - # Check whether --with-ldap or --without-ldap was given. - if test "${with_ldap+set}" = set; then - withval="$with_ldap" -@@ -53569,7 +54998,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_with_ldap_sasl=no - - echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6 --echo "configure:53573: checking for LDAP Cyrus SASL support" >&5 -+echo "configure:55002: checking for LDAP Cyrus SASL support" >&5 - # Check whether --with-ldap-sasl or --without-ldap-sasl was given. - if test "${with_ldap_sasl+set}" = set; then - withval="$with_ldap_sasl" -@@ -55911,19 +57340,19 @@ EOF - LIBS="$LIBS $LDAP_SHARED_LIBADD" - - echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6 --echo "configure:55915: checking for 3 arg ldap_set_rebind_proc" >&5 -+echo "configure:57344: checking for 3 arg ldap_set_rebind_proc" >&5 - if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - int main() { - ldap_set_rebind_proc(0,0,0) - ; return 0; } - EOF --if { (eval echo configure:55927: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:57356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_3arg_setrebindproc=yes - else -@@ -55946,12 +57375,12 @@ EOF - for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:55950: checking for $ac_func" >&5 -+echo "configure:57379: 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:57407: \"$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 -@@ -56136,7 +57565,7 @@ EOF - done - - echo $ac_n "checking for sasl_version in -lsasl2""... $ac_c" 1>&6 --echo "configure:56140: checking for sasl_version in -lsasl2" >&5 -+echo "configure:57569: checking for sasl_version in -lsasl2" >&5 - ac_lib_var=`echo sasl2'_'sasl_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 -@@ -56144,7 +57573,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lsasl2 $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:57588: \"$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 -@@ -56324,12 +57753,12 @@ fi - fi - - echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6 --echo "configure:56328: checking for ldap_bind_s" >&5 -+echo "configure:57757: checking for ldap_bind_s" >&5 - if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+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:57785: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - eval "ac_cv_func_ldap_bind_s=yes" - else -@@ -56381,39 +57810,18 @@ fi - - - -+php_with_libevent=no - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- --php_enable_mbstring=no -- --echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6 --echo "configure:56409: checking whether to enable multibyte string support" >&5 --# Check whether --enable-mbstring or --disable-mbstring was given. --if test "${enable_mbstring+set}" = set; then -- enableval="$enable_mbstring" -- PHP_MBSTRING=$enableval -+echo $ac_n "checking for libevent support""... $ac_c" 1>&6 -+echo "configure:57817: checking for libevent support" >&5 -+# Check whether --with-libevent or --without-libevent was given. -+if test "${with_libevent+set}" = set; then -+ withval="$with_libevent" -+ PHP_LIBEVENT=$withval - else - -- PHP_MBSTRING=no -- test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL -+ PHP_LIBEVENT=no -+ test "$PHP_ENABLE_ALL" && PHP_LIBEVENT=$PHP_ENABLE_ALL - - fi - -@@ -56421,12 +57829,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_MBSTRING in -+case $PHP_LIBEVENT in - shared,*) -- PHP_MBSTRING=`echo "$PHP_MBSTRING"|$SED 's/^shared,//'` -+ PHP_LIBEVENT=`echo "$PHP_LIBEVENT"|$SED 's/^shared,//'` - ;; - shared) -- PHP_MBSTRING=yes -+ PHP_LIBEVENT=yes - ;; - no) - ext_output=no -@@ -56445,720 +57853,881 @@ echo "$ac_t""$ext_output" 1>&6 - - - -+if test "$PHP_LIBEVENT" != "no"; then -+ SEARCH_PATH="/usr /usr/local" -+ SEARCH_FOR="/include/event.h" -+ -+ if test "$PHP_LIBEVENT" = "yes"; then -+ echo $ac_n "checking for libevent headers in default path""... $ac_c" 1>&6 -+echo "configure:57863: checking for libevent headers in default path" >&5 -+ for i in $SEARCH_PATH ; do -+ if test -r $i/$SEARCH_FOR; then -+ LIBEVENT_DIR=$i -+ echo "$ac_t""found in $i" 1>&6 -+ fi -+ done -+ else -+ echo $ac_n "checking for libevent headers in $PHP_LIBEVENT""... $ac_c" 1>&6 -+echo "configure:57872: checking for libevent headers in $PHP_LIBEVENT" >&5 -+ if test -r $PHP_LIBEVENT/$SEARCH_FOR; then -+ LIBEVENT_DIR=$PHP_LIBEVENT -+ echo "$ac_t""found" 1>&6 -+ fi -+ fi - --php_enable_mbregex=yes -+ if test -z "$LIBEVENT_DIR"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: Cannot find libevent headers" 1>&2; exit 1; } -+ fi - --echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6 --echo "configure:56453: checking whether to enable multibyte regex support" >&5 --# Check whether --enable-mbregex or --disable-mbregex was given. --if test "${enable_mbregex+set}" = set; then -- enableval="$enable_mbregex" -- PHP_MBREGEX=$enableval --else -- -- PHP_MBREGEX=yes - -+ if test "$LIBEVENT_DIR/include" != "/usr/include"; then -+ -+ if test -z "$LIBEVENT_DIR/include" || echo "$LIBEVENT_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$LIBEVENT_DIR/include -+ else -+ -+ ep_dir="`echo $LIBEVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/include\"`" -+ fi - --fi -- -- --ext_output=$PHP_MBREGEX --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- -- --php_enable_mbregex_backtrack=yes -- --echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6 --echo "configure:56476: checking whether to check multibyte regex backtrack" >&5 --# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given. --if test "${enable_mbregex_backtrack+set}" = set; then -- enableval="$enable_mbregex_backtrack" -- PHP_MBREGEX_BACKTRACK=$enableval --else -+ - -- PHP_MBREGEX_BACKTRACK=yes -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - --fi -- -- --ext_output=$PHP_MBREGEX_BACKTRACK --echo "$ac_t""$ext_output" 1>&6 -- -- -+ fi - - -+ LIBNAME=event -+ LIBSYMBOL=event_base_new - --php_with_libmbfl=no -+ if test "x$PHP_LIBDIR" = "x"; then -+ PHP_LIBDIR=lib -+ fi - --echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6 --echo "configure:56499: checking for external libmbfl" >&5 --# Check whether --with-libmbfl or --without-libmbfl was given. --if test "${with_libmbfl+set}" = set; then -- withval="$with_libmbfl" -- PHP_LIBMBFL=$withval --else - -- PHP_LIBMBFL=no -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$LIBEVENT_DIR/$PHP_LIBDIR -+ " - -- --fi -- -- --ext_output=$PHP_LIBMBFL --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- -- --php_with_onig=no -- --echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6 --echo "configure:56522: checking for external oniguruma" >&5 --# Check whether --with-onig or --without-onig was given. --if test "${with_onig+set}" = set; then -- withval="$with_onig" -- PHP_ONIG=$withval --else -+ save_ext_shared=$ext_shared -+ ext_shared=yes - -- PHP_ONIG=no -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ - -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - --fi -- -- --ext_output=$PHP_ONIG --echo "$ac_t""$ext_output" 1>&6 -- -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - - -+ fi -+ ;; -+ esac - --if test "$PHP_MBSTRING" != "no"; then -- cat >> confdefs.h <<\EOF --#define HAVE_MBSTRING 1 --EOF - -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - -- PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c" -+ -+ 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 - - -- if test "$PHP_MBREGEX" != "no"; then -+ fi - -- if test "$PHP_MBREGEX" = "yes"; then -- if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then -- if test "$PHP_MBREGEX_BACKTRACK" != "no"; then -- cat >> confdefs.h <<\EOF --#define USE_COMBINATION_EXPLOSION_CHECK 1 --EOF -+ fi - -- fi -+ ;; -+ esac -+ done - -- echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 --echo "configure:56563: checking for variable length prototypes and stdarg.h" >&5 --if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then -+ echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 -+echo "configure:58021: checking for $LIBSYMBOL in -l$LIBNAME" >&5 -+ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | 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 -- -- if test "$cross_compiling" = yes; then -- -- case $host_alias in -- *netware*) -- php_cv_mbstring_stdarg=yes -- ;; -- *) -- php_cv_mbstring_stdarg=no -- ;; -- esac -- --else -- cat > conftest.$ac_ext < conftest.$ac_ext < --int foo(int x, ...) { -- va_list va; -- va_start(va, x); -- va_arg(va, int); -- va_arg(va, char *); -- va_arg(va, double); -- return 0; --} --int main() { return foo(10, "", 3.14); } -- --EOF --if { (eval echo configure:56596: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- php_cv_mbstring_stdarg=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- php_cv_mbstring_stdarg=no --fi --rm -fr conftest* --fi -- -- --fi -- --echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6 -- -- for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:56617: 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 < -+int main() { -+$LIBSYMBOL() -+; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:56627: \"$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 -+if { (eval echo configure:58040: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" -+ eval "ac_cv_lib_$ac_lib_var=yes" - else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 --fi --done -+LIBS="$ac_save_LIBS" - -- echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:56654: 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 -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_int=4 --else -- cat > conftest.$ac_ext < --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(int)); -- exit(0); --} --EOF --if { (eval echo configure:56673: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_int=0 --fi --rm -fr conftest* - fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ - --fi --echo "$ac_t""$ac_cv_sizeof_int" 1>&6 --cat >> confdefs.h </dev/null ; then -+ ai_p=$LIBEVENT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $LIBEVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/$PHP_LIBDIR\"`" -+ fi - -+ -+ if test "$ext_shared" = "yes"; then -+ LIBEVENT_SHARED_LIBADD="-L$ai_p $LIBEVENT_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && LIBEVENT_SHARED_LIBADD="$ld_runpath_switch$ai_p $LIBEVENT_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 - -- echo $ac_n "checking size of short""... $ac_c" 1>&6 --echo "configure:56693: checking size of short" >&5 --if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_short=2 --else -- cat > conftest.$ac_ext < --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(short)); -- exit(0); --} --EOF --if { (eval echo configure:56712: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- ac_cv_sizeof_short=`cat conftestval` --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_short=0 --fi --rm -fr conftest* --fi - --fi --echo "$ac_t""$ac_cv_sizeof_short" 1>&6 --cat >> confdefs.h <&6 --echo "configure:56732: 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 -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_long=4 --else -- cat > conftest.$ac_ext < --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(long)); -- exit(0); --} --EOF --if { (eval echo configure:56751: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_long=0 --fi --rm -fr conftest* --fi -+ if test -n "$LIBEVENT_DIR/$PHP_LIBDIR"; then -+ -+ if test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$LIBEVENT_DIR/$PHP_LIBDIR" || echo "$LIBEVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$LIBEVENT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $LIBEVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$LIBEVENT_DIR/$PHP_LIBDIR\"`" -+ fi - --fi --echo "$ac_t""$ac_cv_sizeof_long" 1>&6 --cat >> confdefs.h <&6 --echo "configure:56771: 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 <j = 5; --} --{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -- const int foo = 10; --} - --; return 0; } --EOF --if { (eval echo configure:56825: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- ac_cv_c_const=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- ac_cv_c_const=no --fi --rm -f conftest* --fi - --echo "$ac_t""$ac_cv_c_const" 1>&6 --if test $ac_cv_c_const = no; then -- cat >> confdefs.h <<\EOF --#define const --EOF -+ fi - --fi - -- echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:56846: 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 --#include --int main() { --struct tm *tp; --; return 0; } --EOF --if { (eval echo configure:56860: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- ac_cv_header_time=yes -+ -+ - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- ac_cv_header_time=no --fi --rm -f conftest* -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_$LIBNAME_$LIBSYMBOL -+ -+ { echo "configure: error: wrong libevent version {1.4.+ is required} or lib not found" 1>&2; exit 1; } -+ -+ - fi - --echo "$ac_t""$ac_cv_header_time" 1>&6 --if test $ac_cv_header_time = yes; then -- cat >> confdefs.h <<\EOF --#define TIME_WITH_SYS_TIME 1 --EOF - --fi -- -- # 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:56883: 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:56895: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- ac_cv_header_alloca_h=no --fi --rm -f conftest* --fi -+ -+ am_i_shared=$PHP_LIBEVENT_SHARED -+ is_it_shared=$PHP_SOCKETS_SHARED -+ is_it_enabled=$PHP_SOCKETS -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension libevent to build statically, but it -+depends on extension sockets, which you've configured to build shared. -+You either need to build libevent shared or build sockets statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension libevent, which depends on extension sockets, -+but you've either not enabled sockets, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST LIBEVENT_SHARED_LIBADD" - --echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 --if test $ac_cv_header_alloca_h = yes; then -- cat >> confdefs.h <<\EOF --#define HAVE_ALLOCA_H 1 --EOF -+ -+ ext_builddir=ext/libevent -+ ext_srcdir=$abs_srcdir/ext/libevent - --fi -+ ac_extra= - --echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:56916: 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 < --# define alloca _alloca --# else --# if HAVE_ALLOCA_H --# include --# else --# ifdef _AIX -- #pragma alloca --# else --# ifndef alloca /* predefined by HP cc +Olibcalls */ --char *alloca (); --# endif --# endif --# endif --# endif --#endif -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --int main() { --char *p = (char *) alloca(1); --; return 0; } --EOF --if { (eval echo configure:56949: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- ac_cv_func_alloca_works=no --fi --rm -f conftest* --fi - --echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 --if test $ac_cv_func_alloca_works = yes; then -- cat >> confdefs.h <<\EOF --#define HAVE_ALLOCA 1 --EOF -+ old_IFS=$IFS -+ for ac_src in libevent.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - --fi -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - --if test $ac_cv_func_alloca_works = no; then -- # The SVR3 libPW and SVR4 libucb both contain incompatible functions -- # that cause trouble. Some versions do not even contain alloca or -- # contain a buggy version. If you still want to use their alloca, -- # use ar to extract alloca.o from them instead of compiling alloca.c. -- ALLOCA=alloca.${ac_objext} -- cat >> confdefs.h <<\EOF --#define C_ALLOCA 1 -+ cat >>Makefile.objects<&6 --echo "configure:56981: 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 <&5 | -- egrep "webecray" >/dev/null 2>&1; then -- rm -rf conftest* -- ac_cv_os_cray=yes --else -- rm -rf conftest* -- ac_cv_os_cray=no --fi --rm -f conftest* -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo - --fi - --echo "$ac_t""$ac_cv_os_cray" 1>&6 --if test $ac_cv_os_cray = yes; then --for ac_func in _getb67 GETB67 getb67; do -- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:57011: 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 < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); -+ old_IFS=$IFS -+ for ac_src in libevent.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_libevent="$shared_objects_libevent $ac_bdir$ac_obj.lo" - --int main() { -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --$ac_func(); --#endif -+ cat >>Makefile.objects<>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" --fi --rm -f conftest* --fi - --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <>Makefile.objects<&6 --fi -+ ;; -+ esac -+ cat >> confdefs.h <>Makefile.objects<>Makefile.objects<&6 --echo "configure:57066: 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 -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+ -+php_enable_mbstring=no -+ -+echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6 -+echo "configure:58513: checking whether to enable multibyte string support" >&5 -+# Check whether --enable-mbstring or --disable-mbstring was given. -+if test "${enable_mbstring+set}" = set; then -+ enableval="$enable_mbstring" -+ PHP_MBSTRING=$enableval - else -- if test "$cross_compiling" = yes; then -- ac_cv_c_stack_direction=0 -+ -+ PHP_MBSTRING=no -+ test "$PHP_ENABLE_ALL" && PHP_MBSTRING=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_MBSTRING in -+shared,*) -+ PHP_MBSTRING=`echo "$PHP_MBSTRING"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_MBSTRING=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_enable_mbregex=yes -+ -+echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6 -+echo "configure:58557: checking whether to enable multibyte regex support" >&5 -+# Check whether --enable-mbregex or --disable-mbregex was given. -+if test "${enable_mbregex+set}" = set; then -+ enableval="$enable_mbregex" -+ PHP_MBREGEX=$enableval - else -- cat > conftest.$ac_ext < addr) ? 1 : -1; --} --main () --{ -- exit (find_stack_direction() < 0); --} --EOF --if { (eval echo configure:57093: \"$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 -+ -+ PHP_MBREGEX=yes -+ -+ -+fi -+ -+ -+ext_output=$PHP_MBREGEX -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_enable_mbregex_backtrack=yes -+ -+echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6 -+echo "configure:58580: checking whether to check multibyte regex backtrack" >&5 -+# Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given. -+if test "${enable_mbregex_backtrack+set}" = set; then -+ enableval="$enable_mbregex_backtrack" -+ PHP_MBREGEX_BACKTRACK=$enableval - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_c_stack_direction=-1 -+ -+ PHP_MBREGEX_BACKTRACK=yes -+ -+ - fi --rm -fr conftest* -+ -+ -+ext_output=$PHP_MBREGEX_BACKTRACK -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_with_libmbfl=no -+ -+echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6 -+echo "configure:58603: checking for external libmbfl" >&5 -+# Check whether --with-libmbfl or --without-libmbfl was given. -+if test "${with_libmbfl+set}" = set; then -+ withval="$with_libmbfl" -+ PHP_LIBMBFL=$withval -+else -+ -+ PHP_LIBMBFL=no -+ -+ - fi - -+ -+ext_output=$PHP_LIBMBFL -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_with_onig=no -+ -+echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6 -+echo "configure:58626: checking for external oniguruma" >&5 -+# Check whether --with-onig or --without-onig was given. -+if test "${with_onig+set}" = set; then -+ withval="$with_onig" -+ PHP_ONIG=$withval -+else -+ -+ PHP_ONIG=no -+ -+ - fi - --echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 --cat >> confdefs.h <&6 -+ -+ -+ -+ -+if test "$PHP_MBSTRING" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_MBSTRING 1 - EOF - --fi - -- echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:57115: checking for 8-bit clean memcmp" >&5 --if eval "test \"`echo '$''{'ac_cv_func_memcmp_clean'+set}'`\" = set"; then -+ -+ PHP_MBSTRING_BASE_SOURCES="$PHP_MBSTRING_BASE_SOURCES mbstring.c php_unicode.c mb_gpc.c" -+ -+ -+ if test "$PHP_MBREGEX" != "no"; then -+ -+ if test "$PHP_MBREGEX" = "yes"; then -+ if test "$PHP_ONIG" = "yes" || test "$PHP_ONIG" = "no"; then -+ if test "$PHP_MBREGEX_BACKTRACK" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define USE_COMBINATION_EXPLOSION_CHECK 1 -+EOF -+ -+ fi -+ -+ echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 -+echo "configure:58667: checking for variable length prototypes and stdarg.h" >&5 -+if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- if test "$cross_compiling" = yes; then -- ac_cv_func_memcmp_clean=no -+ -+ if test "$cross_compiling" = yes; then -+ -+ case $host_alias in -+ *netware*) -+ php_cv_mbstring_stdarg=yes -+ ;; -+ *) -+ php_cv_mbstring_stdarg=no -+ ;; -+ esac -+ - else - cat > conftest.$ac_ext < -+int foo(int x, ...) { -+ va_list va; -+ va_start(va, x); -+ va_arg(va, int); -+ va_arg(va, char *); -+ va_arg(va, double); -+ return 0; - } -- -+int main() { return foo(10, "", 3.14); } -+ - EOF --if { (eval echo configure:57133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:58700: \"$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 -+ php_cv_mbstring_stdarg=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- ac_cv_func_memcmp_clean=no -+ php_cv_mbstring_stdarg=no - fi - rm -fr conftest* - fi - -+ - fi - --echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 --test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" -+echo "$ac_t""$php_cv_mbstring_stdarg" 1>&6 - -- ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6 --echo "configure:57152: checking for stdarg.h" >&5 -+ for ac_hdr in stdlib.h string.h strings.h unistd.h sys/time.h sys/times.h stdarg.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:58721: 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 < -+#include <$ac_hdr> - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:57162: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:58731: \"$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* -@@ -57174,322 +58743,860 @@ rm -f conftest* - fi - if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- cat >> confdefs.h <<\EOF --#define HAVE_STDARG_PROTOTYPES 1 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 - fi -+done - -- cat >> confdefs.h <<\EOF --#define PHP_ONIG_BUNDLED 1 --EOF -- -- cat >> confdefs.h <<\EOF --#define HAVE_ONIG 1 --EOF -- -- -- PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY" -- -- -- PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma" -- -- -- PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma/enc" -- -- -- PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES oniguruma" -+ echo $ac_n "checking size of int""... $ac_c" 1>&6 -+echo "configure:58758: 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 -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_int=4 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(int)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:58778: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_int=0 -+fi -+rm -fr conftest* -+fi - -- -- PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS oniguruma/config.h" -+fi -+echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -+cat >> confdefs.h <&6 -+echo "configure:58798: checking size of short" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_short=2 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(short)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:58818: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_short=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_short=0 -+fi -+rm -fr conftest* -+fi - -- else -- if test ! -f "$PHP_ONIG/include/oniguruma.h"; then -- { echo "configure: error: oniguruma.h not found in $PHP_ONIG/include" 1>&2; exit 1; } -- fi -- -- if test "$PHP_ONIG/include" != "/usr/include"; then -- -- if test -z "$PHP_ONIG/include" || echo "$PHP_ONIG/include" | grep '^/' >/dev/null ; then -- ai_p=$PHP_ONIG/include -- else -- -- ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`" -- fi -+fi -+echo "$ac_t""$ac_cv_sizeof_short" 1>&6 -+cat >> confdefs.h <&6 -+echo "configure:58838: 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 -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_long=4 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(long)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:58858: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_long=0 -+fi -+rm -fr conftest* -+fi - -+fi -+echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -+cat >> confdefs.h <&6 -+echo "configure:58878: 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 <j = 5; -+} -+{ /* ULTRIX-32 V3.1 (Rev 9) vcc rejects this */ -+ const int foo = 10; -+} - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+; return 0; } -+EOF -+if { (eval echo configure:58932: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_c_const=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_c_const=no -+fi -+rm -f conftest* -+fi - -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- 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 -+echo "$ac_t""$ac_cv_c_const" 1>&6 -+if test $ac_cv_c_const = no; then -+ cat >> confdefs.h <<\EOF -+#define const -+EOF - -+fi - -- fi -- -- fi -+ echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -+echo "configure:58953: 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 -+#include -+int main() { -+struct tm *tp; -+; return 0; } -+EOF -+if { (eval echo configure:58967: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_header_time=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_header_time=no -+fi -+rm -f conftest* -+fi - -- ;; -- esac -- done -+echo "$ac_t""$ac_cv_header_time" 1>&6 -+if test $ac_cv_header_time = yes; then -+ cat >> confdefs.h <<\EOF -+#define TIME_WITH_SYS_TIME 1 -+EOF - -- echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6 --echo "configure:57392: checking for onig_init in -lonig" >&5 --ac_lib_var=`echo onig'_'onig_init | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+fi -+ -+ # 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:58990: 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 -- ac_save_LIBS="$LIBS" --LIBS="-lonig $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < - int main() { --onig_init() -+char *p = alloca(2 * sizeof(int)); - ; return 0; } - EOF --if { (eval echo configure:57411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:59002: \"$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" -+ ac_cv_header_alloca_h=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ ac_cv_header_alloca_h=no - fi - rm -f conftest* --LIBS="$ac_save_LIBS" -+fi -+ -+echo "$ac_t""$ac_cv_header_alloca_h" 1>&6 -+if test $ac_cv_header_alloca_h = yes; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ALLOCA_H 1 -+EOF - - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- - -- if test "$ext_shared" = "yes"; then -- MBSTRING_SHARED_LIBADD="-lonig $MBSTRING_SHARED_LIBADD" -- if test -n "$PHP_ONIG/$PHP_LIBDIR"; then -- -- if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PHP_ONIG/$PHP_LIBDIR -- else -- -- ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" -- fi -+echo $ac_n "checking for alloca""... $ac_c" 1>&6 -+echo "configure:59023: 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 < -+# define alloca _alloca -+# else -+# if HAVE_ALLOCA_H -+# include -+# else -+# ifdef _AIX -+ #pragma alloca -+# else -+# ifndef alloca /* predefined by HP cc +Olibcalls */ -+char *alloca (); -+# endif -+# endif -+# endif -+# endif -+#endif - -+int main() { -+char *p = (char *) alloca(1); -+; return 0; } -+EOF -+if { (eval echo configure:59056: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_func_alloca_works=no -+fi -+rm -f conftest* -+fi - -- fi -- -- fi -+echo "$ac_t""$ac_cv_func_alloca_works" 1>&6 -+if test $ac_cv_func_alloca_works = yes; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ALLOCA 1 -+EOF - -- fi -- else -- -+fi - -- if test -n "$PHP_ONIG/$PHP_LIBDIR"; then -- -- if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PHP_ONIG/$PHP_LIBDIR -- else -- -- ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" -- fi -+if test $ac_cv_func_alloca_works = no; then -+ # The SVR3 libPW and SVR4 libucb both contain incompatible functions -+ # that cause trouble. Some versions do not even contain alloca or -+ # contain a buggy version. If you still want to use their alloca, -+ # use ar to extract alloca.o from them instead of compiling alloca.c. -+ ALLOCA=alloca.${ac_objext} -+ cat >> confdefs.h <<\EOF -+#define C_ALLOCA 1 -+EOF - -- -- -- -+ -+echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 -+echo "configure:59088: 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 <&5 | -+ egrep "webecray" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_os_cray=yes -+else -+ rm -rf conftest* -+ ac_cv_os_cray=no -+fi -+rm -f conftest* -+ -+fi -+ -+echo "$ac_t""$ac_cv_os_cray" 1>&6 -+if test $ac_cv_os_cray = yes; then -+for ac_func in _getb67 GETB67 getb67; do -+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:59118: 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 < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:59146: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <&6 -+fi -+ -+done -+fi -+ -+echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 -+echo "configure:59173: 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 -+ if test "$cross_compiling" = yes; then -+ ac_cv_c_stack_direction=0 -+else -+ cat > conftest.$ac_ext < addr) ? 1 : -1; -+} -+main () -+{ -+ exit (find_stack_direction() < 0); -+} -+EOF -+if { (eval echo configure:59200: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_c_stack_direction=-1 -+fi -+rm -fr conftest* -+fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_c_stack_direction" 1>&6 -+cat >> confdefs.h <&6 -+echo "configure:59222: 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 -+ if test "$cross_compiling" = yes; then -+ 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 -+then -+ ac_cv_func_memcmp_clean=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_func_memcmp_clean=no -+fi -+rm -fr conftest* -+fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_func_memcmp_clean" 1>&6 -+test $ac_cv_func_memcmp_clean = no && LIBOBJS="$LIBOBJS memcmp.${ac_objext}" -+ -+ ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6 -+echo "configure:59259: checking for stdarg.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:59269: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_STDARG_PROTOTYPES 1 -+EOF -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ cat >> confdefs.h <<\EOF -+#define PHP_ONIG_BUNDLED 1 -+EOF -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_ONIG 1 -+EOF -+ -+ -+ PHP_MBSTRING_CFLAGS="$PHP_MBSTRING_CFLAGS -DNOT_RUBY" -+ -+ -+ PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma" -+ -+ -+ PHP_MBSTRING_EXTRA_BUILD_DIRS="$PHP_MBSTRING_EXTRA_BUILD_DIRS oniguruma/enc" -+ -+ -+ PHP_MBSTRING_EXTRA_INCLUDES="$PHP_MBSTRING_EXTRA_INCLUDES oniguruma" -+ -+ -+ PHP_MBSTRING_EXTRA_CONFIG_HEADERS="$PHP_MBSTRING_EXTRA_CONFIG_HEADERS oniguruma/config.h" -+ -+ -+ PHP_MBSTRING_SOURCES="$PHP_MBSTRING_SOURCES -+ oniguruma/regcomp.c -+ oniguruma/regerror.c -+ oniguruma/regexec.c -+ oniguruma/reggnu.c -+ oniguruma/regparse.c -+ oniguruma/regenc.c -+ oniguruma/regext.c -+ oniguruma/regsyntax.c -+ oniguruma/regtrav.c -+ oniguruma/regversion.c -+ oniguruma/st.c -+ oniguruma/enc/unicode.c -+ oniguruma/enc/ascii.c -+ oniguruma/enc/utf8.c -+ oniguruma/enc/euc_jp.c -+ oniguruma/enc/euc_tw.c -+ oniguruma/enc/euc_kr.c -+ oniguruma/enc/sjis.c -+ oniguruma/enc/iso8859_1.c -+ oniguruma/enc/iso8859_2.c -+ oniguruma/enc/iso8859_3.c -+ oniguruma/enc/iso8859_4.c -+ oniguruma/enc/iso8859_5.c -+ oniguruma/enc/iso8859_6.c -+ oniguruma/enc/iso8859_7.c -+ oniguruma/enc/iso8859_8.c -+ oniguruma/enc/iso8859_9.c -+ oniguruma/enc/iso8859_10.c -+ oniguruma/enc/iso8859_11.c -+ oniguruma/enc/iso8859_13.c -+ oniguruma/enc/iso8859_14.c -+ oniguruma/enc/iso8859_15.c -+ oniguruma/enc/iso8859_16.c -+ oniguruma/enc/koi8.c -+ oniguruma/enc/koi8_r.c -+ oniguruma/enc/big5.c -+ oniguruma/enc/utf16_be.c -+ oniguruma/enc/utf16_le.c -+ oniguruma/enc/utf32_be.c -+ oniguruma/enc/utf32_le.c -+ " -+ -+ -+ PHP_MBSTRING_INSTALL_HEADERS="$PHP_MBSTRING_INSTALL_HEADERS oniguruma/oniguruma.h" -+ -+ else -+ if test ! -f "$PHP_ONIG/include/oniguruma.h"; then -+ { echo "configure: error: oniguruma.h not found in $PHP_ONIG/include" 1>&2; exit 1; } -+ fi -+ -+ if test "$PHP_ONIG/include" != "/usr/include"; then -+ -+ if test -z "$PHP_ONIG/include" || echo "$PHP_ONIG/include" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_ONIG/include -+ else -+ -+ ep_dir="`echo $PHP_ONIG/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_ONIG/include\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$PHP_ONIG/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 -+ -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6 -+echo "configure:59499: checking for onig_init in -lonig" >&5 -+ac_lib_var=`echo onig'_'onig_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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lonig $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ MBSTRING_SHARED_LIBADD="-lonig $MBSTRING_SHARED_LIBADD" -+ if test -n "$PHP_ONIG/$PHP_LIBDIR"; then -+ -+ if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_ONIG/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ MBSTRING_SHARED_LIBADD="-L$ai_p $MBSTRING_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && MBSTRING_SHARED_LIBADD="$ld_runpath_switch$ai_p $MBSTRING_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 "$PHP_ONIG/$PHP_LIBDIR"; then -+ -+ if test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ONIG/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PHP_ONIG/$PHP_LIBDIR" || echo "$PHP_ONIG/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_ONIG/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $PHP_ONIG/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_ONIG/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ -+ - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -@@ -57633,9 +59740,9 @@ fi - done - - echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6 --echo "configure:57637: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 -+echo "configure:59744: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 - cat > conftest.$ac_ext < -@@ -57646,7 +59753,7 @@ return (int)(ONIG_ENCODING_KOI8 + 1); - - ; return 0; } - EOF --if { (eval echo configure:57650: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:59757: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - - echo "$ac_t""no" 1>&6 -@@ -57944,7 +60051,7 @@ EOF - done - - echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6 --echo "configure:57948: checking for mbfl_buffer_converter_new in -lmbfl" >&5 -+echo "configure:60055: checking for mbfl_buffer_converter_new in -lmbfl" >&5 - ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -57952,7 +60059,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lmbfl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:60074: \"$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 -@@ -58600,7 +60707,7 @@ fi - php_with_mcrypt=no - - echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6 --echo "configure:58604: checking for mcrypt support" >&5 -+echo "configure:60711: checking for mcrypt support" >&5 - # Check whether --with-mcrypt or --without-mcrypt was given. - if test "${with_mcrypt+set}" = set; then - withval="$with_mcrypt" -@@ -58653,9 +60760,9 @@ if test "$PHP_MCRYPT" != "no"; then - old_CPPFLAGS=$CPPFLAGS - CPPFLAGS=-I$MCRYPT_DIR/include - echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6 --echo "configure:58657: checking for libmcrypt version" >&5 -+echo "configure:60764: checking for libmcrypt version" >&5 - cat > conftest.$ac_ext < -@@ -58779,7 +60886,7 @@ rm -f conftest* - done - - echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 --echo "configure:58783: checking for mcrypt_module_open in -lmcrypt" >&5 -+echo "configure:60890: 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 -@@ -58787,7 +60894,7 @@ else - 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:60909: \"$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 -@@ -58951,7 +61058,7 @@ else - done - - echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 --echo "configure:58955: checking for mcrypt_module_open in -lmcrypt" >&5 -+echo "configure:61062: 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 -@@ -58959,7 +61066,7 @@ else - 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:61081: \"$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 -@@ -59443,7 +61550,7 @@ fi - php_with_mssql=no - - echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6 --echo "configure:59447: checking for MSSQL support via FreeTDS" >&5 -+echo "configure:61554: checking for MSSQL support via FreeTDS" >&5 - # Check whether --with-mssql or --without-mssql was given. - if test "${with_mssql+set}" = set; then - withval="$with_mssql" -@@ -59941,7 +62048,7 @@ EOF - fi - - echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:59945: checking for dnet_addr in -ldnet_stub" >&5 -+echo "configure:62052: 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 -@@ -59949,7 +62056,7 @@ else - 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:62071: \"$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 -@@ -60104,7 +62211,7 @@ fi - php_with_mysql=no - - echo $ac_n "checking for MySQL support""... $ac_c" 1>&6 --echo "configure:60108: checking for MySQL support" >&5 -+echo "configure:62215: checking for MySQL support" >&5 - # Check whether --with-mysql or --without-mysql was given. - if test "${with_mysql+set}" = set; then - withval="$with_mysql" -@@ -60148,7 +62255,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_with_mysql_sock=no - - echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6 --echo "configure:60152: checking for specified location of the MySQL UNIX socket" >&5 -+echo "configure:62259: checking for specified location of the MySQL UNIX socket" >&5 - # Check whether --with-mysql-sock or --without-mysql-sock was given. - if test "${with_mysql_sock+set}" = set; then - withval="$with_mysql_sock" -@@ -60172,7 +62279,7 @@ if test -z "$PHP_ZLIB_DIR"; then - php_with_zlib_dir=no - - echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:60176: checking for the location of libz" >&5 -+echo "configure:62283: checking for the location of libz" >&5 - # Check whether --with-zlib-dir or --without-zlib-dir was given. - if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" -@@ -60346,7 +62453,7 @@ Note that the MySQL client library is no - done - - echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:60350: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 -+echo "configure:62457: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 - ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -60354,7 +62461,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$MYSQL_LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:62476: \"$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 -@@ -60588,7 +62695,7 @@ else - done - - echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:60592: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 -+echo "configure:62699: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 - ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -60596,7 +62703,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$MYSQL_LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:62718: \"$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 -@@ -60762,7 +62869,7 @@ fi - done - - echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:60766: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 -+echo "configure:62873: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 - ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -60770,7 +62877,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$MYSQL_LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:62892: \"$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 -@@ -60975,7 +63082,7 @@ fi - - if test "$PHP_MYSQL" != "no"; then - echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6 --echo "configure:60979: checking for MySQL UNIX socket location" >&5 -+echo "configure:63086: checking for MySQL UNIX socket location" >&5 - if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then - MYSQL_SOCK=$PHP_MYSQL_SOCK - cat >> confdefs.h <&6 --echo "configure:61352: checking for MySQLi support" >&5 -+echo "configure:63459: checking for MySQLi support" >&5 - # Check whether --with-mysqli or --without-mysqli was given. - if test "${with_mysqli+set}" = set; then - withval="$with_mysqli" -@@ -61392,7 +63499,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_enable_embedded_mysqli=no - - echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6 --echo "configure:61396: checking whether to enable embedded MySQLi support" >&5 -+echo "configure:63503: checking whether to enable embedded MySQLi support" >&5 - # Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given. - if test "${enable_embedded_mysqli+set}" = set; then - enableval="$enable_embedded_mysqli" -@@ -61543,7 +63650,7 @@ EOF - done - - echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 --echo "configure:61547: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 -+echo "configure:63654: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 - ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -61551,7 +63658,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$MYSQL_LIB_NAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:63673: \"$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 -@@ -61810,7 +63917,7 @@ EOF - done - - echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 --echo "configure:61814: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 -+echo "configure:63921: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 - ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -61818,7 +63925,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$MYSQL_LIB_NAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:63940: \"$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 -@@ -61973,7 +64080,7 @@ fi - done - - echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 --echo "configure:61977: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 -+echo "configure:64084: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 - ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -61981,7 +64088,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$MYSQL_LIB_NAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:64103: \"$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 -@@ -62395,7 +64502,7 @@ fi - php_with_oci8=no - - echo $ac_n "checking for Oracle Database OCI8 support""... $ac_c" 1>&6 --echo "configure:62399: checking for Oracle Database OCI8 support" >&5 -+echo "configure:64506: checking for Oracle Database OCI8 support" >&5 - # Check whether --with-oci8 or --without-oci8 was given. - if test "${with_oci8+set}" = set; then - withval="$with_oci8" -@@ -62443,7 +64550,7 @@ if test "$PHP_OCI8" != "no"; then - - - echo $ac_n "checking PHP version""... $ac_c" 1>&6 --echo "configure:62447: checking PHP version" >&5 -+echo "configure:64554: checking PHP version" >&5 - - tmp_version=$PHP_VERSION - if test -z "$tmp_version"; then -@@ -62475,7 +64582,7 @@ echo "configure:62447: checking PHP vers - - - echo $ac_n "checking size of long int""... $ac_c" 1>&6 --echo "configure:62479: checking size of long int" >&5 -+echo "configure:64586: checking size of long int" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -62483,9 +64590,10 @@ else - ac_cv_sizeof_long_int=4 - else - cat > conftest.$ac_ext < -+#include - main() - { - FILE *f=fopen("conftestval", "w"); -@@ -62494,7 +64602,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:62498: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:64606: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_long_int=`cat conftestval` - else -@@ -62514,7 +64622,7 @@ EOF - - - echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 --echo "configure:62518: checking checking if we're on a 64-bit platform" >&5 -+echo "configure:64626: checking checking if we're on a 64-bit platform" >&5 - if test "$ac_cv_sizeof_long_int" = "4"; then - echo "$ac_t""no" 1>&6 - PHP_OCI8_OH_LIBDIR=lib32 -@@ -62558,7 +64666,7 @@ echo "configure:62518: checking checking - if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then - - echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6 --echo "configure:62562: checking Oracle ORACLE_HOME install directory" >&5 -+echo "configure:64670: checking Oracle ORACLE_HOME install directory" >&5 - - if test "$PHP_OCI8" = "yes"; then - OCI8_DIR=$ORACLE_HOME -@@ -62569,7 +64677,7 @@ echo "configure:62562: checking Oracle O - - - echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6 --echo "configure:62573: checking ORACLE_HOME library validity" >&5 -+echo "configure:64681: checking ORACLE_HOME library validity" >&5 - if test ! -d "$OCI8_DIR"; then - { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; } - fi -@@ -62910,7 +65018,7 @@ echo "configure:62573: checking ORACLE_H - - - echo $ac_n "checking Oracle library version compatibility""... $ac_c" 1>&6 --echo "configure:62914: checking Oracle library version compatibility" >&5 -+echo "configure:65022: checking Oracle library version compatibility" >&5 - OCI8_LCS_BASE=$OCI8_DIR/$OCI8_LIB_DIR/libclntsh.$SHLIB_SUFFIX_NAME - OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc - if test -s "$OCI8_DIR/orainst/unix.rgs"; then -@@ -63040,7 +65148,7 @@ echo "configure:62914: checking Oracle l - done - - echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 --echo "configure:63044: checking for OCIEnvNlsCreate in -lclntsh" >&5 -+echo "configure:65152: checking for OCIEnvNlsCreate in -lclntsh" >&5 - ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -63048,7 +65156,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lclntsh $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:65171: \"$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 -@@ -63492,7 +65600,7 @@ EOF - else - - echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6 --echo "configure:63496: checking Oracle Instant Client directory" >&5 -+echo "configure:65604: checking Oracle Instant Client directory" >&5 - - if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then - PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'` -@@ -63505,7 +65613,7 @@ echo "configure:63496: checking Oracle I - OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT - - echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6 --echo "configure:63509: checking Oracle Instant Client SDK header directory" >&5 -+echo "configure:65617: checking Oracle Instant Client SDK header directory" >&5 - - OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'` - -@@ -63714,7 +65822,7 @@ echo "configure:63509: checking Oracle I - - - echo $ac_n "checking Oracle Instant Client library version compatibility""... $ac_c" 1>&6 --echo "configure:63718: checking Oracle Instant Client library version compatibility" >&5 -+echo "configure:65826: checking Oracle Instant Client library version compatibility" >&5 - OCI8_LCS_BASE=$PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME - OCI8_LCS=`ls $OCI8_LCS_BASE.*.1 2> /dev/null | tail -1` # Oracle 10g, 11g etc - OCI8_NNZ=`ls $PHP_OCI8_INSTANT_CLIENT/libnnz*.$SHLIB_SUFFIX_NAME 2> /dev/null | tail -1` -@@ -64175,7 +66283,7 @@ esac - - if test "$PHP_ADABAS" != "no"; then - echo $ac_n "checking for Adabas support""... $ac_c" 1>&6 --echo "configure:64179: checking for Adabas support" >&5 -+echo "configure:66287: checking for Adabas support" >&5 - if test "$PHP_ADABAS" = "yes"; then - PHP_ADABAS=/usr/local - fi -@@ -64378,7 +66486,7 @@ esac - - if test "$PHP_SAPDB" != "no"; then - echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6 --echo "configure:64382: checking for SAP DB support" >&5 -+echo "configure:66490: checking for SAP DB support" >&5 - if test "$PHP_SAPDB" = "yes"; then - PHP_SAPDB=/usr/local - fi -@@ -64511,7 +66619,7 @@ esac - - if test "$PHP_SOLID" != "no"; then - echo $ac_n "checking for Solid support""... $ac_c" 1>&6 --echo "configure:64515: checking for Solid support" >&5 -+echo "configure:66623: checking for Solid support" >&5 - if test "$PHP_SOLID" = "yes"; then - PHP_SOLID=/usr/local/solid - fi -@@ -64538,7 +66646,7 @@ EOF - echo "$ac_t""$ext_output" 1>&6 - - echo $ac_n "checking Solid library file""... $ac_c" 1>&6 --echo "configure:64542: checking Solid library file" >&5 -+echo "configure:66650: 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 -@@ -64659,7 +66767,7 @@ esac - - if test "$PHP_IBM_DB2" != "no"; then - echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6 --echo "configure:64663: checking for IBM DB2 support" >&5 -+echo "configure:66771: checking for IBM DB2 support" >&5 - if test "$PHP_IBM_DB2" = "yes"; then - ODBC_INCDIR=/home/db2inst1/sqllib/include - ODBC_LIBDIR=/home/db2inst1/sqllib/lib -@@ -64690,7 +66798,7 @@ fi - - 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:66813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBS=$old_LIBS -@@ -64782,7 +66890,7 @@ esac - - if test "$PHP_ODBCROUTER" != "no"; then - echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6 --echo "configure:64786: checking for ODBCRouter.com support" >&5 -+echo "configure:66894: checking for ODBCRouter.com support" >&5 - if test "$PHP_ODBCROUTER" = "yes"; then - PHP_ODBCROUTER=/usr - fi -@@ -64846,7 +66954,7 @@ esac - - if test "$PHP_EMPRESS" != "no"; then - echo $ac_n "checking for Empress support""... $ac_c" 1>&6 --echo "configure:64850: checking for Empress support" >&5 -+echo "configure:66958: checking for Empress support" >&5 - if test "$PHP_EMPRESS" = "yes"; then - ODBC_INCDIR=$EMPRESSPATH/include/odbc - ODBC_LIBDIR=$EMPRESSPATH/shlib -@@ -64864,7 +66972,7 @@ EOF - echo "$ac_t""$ext_output" 1>&6 - - echo $ac_n "checking Empress library file""... $ac_c" 1>&6 --echo "configure:64868: checking Empress library file" >&5 -+echo "configure:66976: checking Empress library file" >&5 - ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` - if test ! -f $ODBC_LIBS; then - ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` -@@ -64920,7 +67028,7 @@ esac - - if test "$PHP_EMPRESS_BCS" != "no"; then - echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6 --echo "configure:64924: checking for Empress local access support" >&5 -+echo "configure:67032: checking for Empress local access support" >&5 - if test "$PHP_EMPRESS_BCS" = "yes"; then - ODBC_INCDIR=$EMPRESSPATH/include/odbc - ODBC_LIBDIR=$EMPRESSPATH/shlib -@@ -64954,7 +67062,7 @@ EOF - echo "$ac_t""$ext_output" 1>&6 - - echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6 --echo "configure:64958: checking Empress local access library file" >&5 -+echo "configure:67066: checking Empress local access library file" >&5 - ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` - if test ! -f $ODBCBCS_LIBS; then - ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` -@@ -65010,7 +67118,7 @@ esac - - if test "$PHP_BIRDSTEP" != "no"; then - echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6 --echo "configure:65014: checking for Birdstep support" >&5 -+echo "configure:67122: checking for Birdstep support" >&5 - if test "$PHP_BIRDSTEP" = "yes"; then - ODBC_INCDIR=/usr/local/birdstep/include - ODBC_LIBDIR=/usr/local/birdstep/lib -@@ -65122,7 +67230,7 @@ esac - - if test "$PHP_CUSTOM_ODBC" != "no"; then - echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6 --echo "configure:65126: checking for a custom ODBC support" >&5 -+echo "configure:67234: checking for a custom ODBC support" >&5 - if test "$PHP_CUSTOM_ODBC" = "yes"; then - PHP_CUSTOM_ODBC=/usr/local - fi -@@ -65186,7 +67294,7 @@ esac - - if test "$PHP_IODBC" != "no"; then - echo $ac_n "checking for iODBC support""... $ac_c" 1>&6 --echo "configure:65190: checking for iODBC support" >&5 -+echo "configure:67298: checking for iODBC support" >&5 - if test "$PHP_IODBC" = "yes"; then - PHP_IODBC=/usr/local - fi -@@ -65332,7 +67440,7 @@ esac - - if test "$PHP_ESOOB" != "no"; then - echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6 --echo "configure:65336: checking for Easysoft ODBC-ODBC Bridge support" >&5 -+echo "configure:67444: checking for Easysoft ODBC-ODBC Bridge support" >&5 - if test "$PHP_ESOOB" = "yes"; then - PHP_ESOOB=/usr/local/easysoft/oob/client - fi -@@ -65396,7 +67504,7 @@ esac - - if test "$PHP_UNIXODBC" != "no"; then - echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 --echo "configure:65400: checking for unixODBC support" >&5 -+echo "configure:67508: checking for unixODBC support" >&5 - if test "$PHP_UNIXODBC" = "yes"; then - PHP_UNIXODBC=/usr/local - fi -@@ -65465,7 +67573,7 @@ esac - - if test "$PHP_DBMAKER" != "no"; then - echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6 --echo "configure:65469: checking for DBMaker support" >&5 -+echo "configure:67577: checking for DBMaker support" >&5 - if test "$PHP_DBMAKER" = "yes"; then - # find dbmaker's home directory - DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` -@@ -66027,7 +68135,7 @@ fi - php_enable_pcntl=no - - echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6 --echo "configure:66031: checking whether to enable pcntl support" >&5 -+echo "configure:68139: checking whether to enable pcntl support" >&5 - # Check whether --enable-pcntl or --disable-pcntl was given. - if test "${enable_pcntl+set}" = set; then - enableval="$enable_pcntl" -@@ -66071,12 +68179,12 @@ if test "$PHP_PCNTL" != "no"; then - for ac_func in fork - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:66075: checking for $ac_func" >&5 -+echo "configure:68183: 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:68211: \"$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 -@@ -66130,12 +68238,12 @@ done - for ac_func in waitpid - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:66134: checking for $ac_func" >&5 -+echo "configure:68242: 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:68270: \"$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 -@@ -66189,12 +68297,12 @@ done - for ac_func in sigaction - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:66193: checking for $ac_func" >&5 -+echo "configure:68301: 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:68329: \"$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 -@@ -66248,12 +68356,12 @@ done - for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:66252: checking for $ac_func" >&5 -+echo "configure:68360: 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:68388: \"$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 -@@ -66601,7 +68709,7 @@ fi - php_enable_pdo=yes - - echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6 --echo "configure:66605: checking whether to enable PDO support" >&5 -+echo "configure:68713: checking whether to enable PDO support" >&5 - # Check whether --enable-pdo or --disable-pdo was given. - if test "${enable_pdo+set}" = set; then - enableval="$enable_pdo" -@@ -67035,7 +69143,7 @@ fi - php_with_pdo_dblib=no - - echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6 --echo "configure:67039: checking for PDO_DBLIB support via FreeTDS" >&5 -+echo "configure:69147: checking for PDO_DBLIB support via FreeTDS" >&5 - # Check whether --with-pdo-dblib or --without-pdo-dblib was given. - if test "${with_pdo_dblib+set}" = set; then - withval="$with_pdo_dblib" -@@ -67252,13 +69360,13 @@ if test "$PHP_PDO_DBLIB" != "no"; then - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:67256: checking for PDO includes" >&5 -+echo "configure:69364: checking for PDO includes" >&5 - if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:67262: checking for PDO includes" >&5 -+echo "configure:69370: checking for PDO includes" >&5 - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -67572,7 +69680,7 @@ EOF - fi - - echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 --echo "configure:67576: checking for dnet_addr in -ldnet_stub" >&5 -+echo "configure:69684: 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 -@@ -67580,7 +69688,7 @@ else - 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:69703: \"$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 -@@ -67752,7 +69860,7 @@ fi - php_with_pdo_firebird=no - - echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6 --echo "configure:67756: checking for Firebird support for PDO" >&5 -+echo "configure:69864: checking for Firebird support for PDO" >&5 - # Check whether --with-pdo-firebird or --without-pdo-firebird was given. - if test "${with_pdo_firebird+set}" = set; then - withval="$with_pdo_firebird" -@@ -67906,7 +70014,7 @@ if test "$PHP_PDO_FIREBIRD" != "no"; the - done - - echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 --echo "configure:67910: checking for isc_detach_database in -lfbclient" >&5 -+echo "configure:70018: checking for isc_detach_database in -lfbclient" >&5 - ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -67914,7 +70022,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lfbclient $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:70037: \"$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 -@@ -68052,7 +70160,7 @@ else - done - - echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 --echo "configure:68056: checking for isc_detach_database in -lgds" >&5 -+echo "configure:70164: checking for isc_detach_database in -lgds" >&5 - ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -68060,7 +70168,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lgds $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:70183: \"$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 -@@ -68198,7 +70306,7 @@ else - done - - echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 --echo "configure:68202: checking for isc_detach_database in -lib_util" >&5 -+echo "configure:70310: checking for isc_detach_database in -lib_util" >&5 - ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -68206,7 +70314,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lib_util $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:70329: \"$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 -@@ -68262,13 +70370,13 @@ fi - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:68266: checking for PDO includes" >&5 -+echo "configure:70374: checking for PDO includes" >&5 - if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:68272: checking for PDO includes" >&5 -+echo "configure:70380: checking for PDO includes" >&5 - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -68740,7 +70848,7 @@ fi - php_with_pdo_mysql=no - - echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6 --echo "configure:68744: checking for MySQL support for PDO" >&5 -+echo "configure:70852: checking for MySQL support for PDO" >&5 - # Check whether --with-pdo-mysql or --without-pdo-mysql was given. - if test "${with_pdo_mysql+set}" = set; then - withval="$with_pdo_mysql" -@@ -68785,7 +70893,7 @@ if test -z "$PHP_ZLIB_DIR"; then - php_with_zlib_dir=no - - echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:68789: checking for the location of libz" >&5 -+echo "configure:70897: checking for the location of libz" >&5 - # Check whether --with-zlib-dir or --without-zlib-dir was given. - if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" -@@ -68849,14 +70957,14 @@ EOF - - - echo $ac_n "checking for mysql_config""... $ac_c" 1>&6 --echo "configure:68853: checking for mysql_config" >&5 -+echo "configure:70961: checking for mysql_config" >&5 - if test -n "$PDO_MYSQL_CONFIG"; then - echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6 - if test "x$SED" = "x"; then - # Extract the first word of "sed", so it can be a program name with args. - set dummy sed; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:68860: checking for $ac_word" >&5 -+echo "configure:70968: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -68900,7 +71008,7 @@ fi - elif test -n "$PDO_MYSQL_DIR"; then - echo "$ac_t""not found" 1>&6 - echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6 --echo "configure:68904: checking for mysql install under $PDO_MYSQL_DIR" >&5 -+echo "configure:71012: checking for mysql install under $PDO_MYSQL_DIR" >&5 - if test -r $PDO_MYSQL_DIR/include/mysql; then - PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql - else -@@ -69054,7 +71162,7 @@ echo "configure:68904: checking for mysq - done - - echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:69058: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -+echo "configure:71166: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 - ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -69062,7 +71170,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:71185: \"$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 -@@ -69426,7 +71534,7 @@ else - done - - echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:69430: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -+echo "configure:71538: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 - ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -69434,7 +71542,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:71557: \"$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 -@@ -69600,7 +71708,7 @@ fi - done - - echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:69604: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 -+echo "configure:71712: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 - ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -69608,7 +71716,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:71731: \"$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 -@@ -69793,12 +71901,12 @@ fi - for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:69797: checking for $ac_func" >&5 -+echo "configure:71905: 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:71933: \"$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 -@@ -69851,13 +71959,13 @@ done - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:69855: checking for PDO includes" >&5 -+echo "configure:71963: checking for PDO includes" >&5 - if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:69861: checking for PDO includes" >&5 -+echo "configure:71969: checking for PDO includes" >&5 - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -70242,7 +72350,7 @@ SUPPORTED_LIB_VERS="9.0 10.1 11.1" # Th - php_with_pdo_oci=no - - echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6 --echo "configure:70246: checking Oracle OCI support for PDO" >&5 -+echo "configure:72354: checking Oracle OCI support for PDO" >&5 - # Check whether --with-pdo-oci or --without-pdo-oci was given. - if test "${with_pdo_oci+set}" = set; then - withval="$with_pdo_oci" -@@ -70289,7 +72397,7 @@ if test "$PHP_PDO_OCI" != "no"; then - fi - - echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6 --echo "configure:70293: checking Oracle Install-Dir" >&5 -+echo "configure:72401: checking Oracle Install-Dir" >&5 - if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then - PDO_OCI_DIR=$ORACLE_HOME - else -@@ -70298,7 +72406,7 @@ echo "configure:70293: checking Oracle I - echo "$ac_t""$PHP_PDO_OCI" 1>&6 - - echo $ac_n "checking if that is sane""... $ac_c" 1>&6 --echo "configure:70302: checking if that is sane" >&5 -+echo "configure:72410: checking if that is sane" >&5 - if test -z "$PDO_OCI_DIR"; then - { echo "configure: error: - You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME. -@@ -70309,7 +72417,7 @@ You need to tell me where to find your O - - if test "instantclient" = "`echo $PDO_OCI_DIR | cut -d, -f1`" ; then - echo $ac_n "checking size of long int""... $ac_c" 1>&6 --echo "configure:70313: checking size of long int" >&5 -+echo "configure:72421: checking size of long int" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -70317,9 +72425,10 @@ else - ac_cv_sizeof_long_int=4 - else - cat > conftest.$ac_ext < -+#include - main() - { - FILE *f=fopen("conftestval", "w"); -@@ -70328,7 +72437,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:70332: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:72441: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_long_int=`cat conftestval` - else -@@ -70362,7 +72471,7 @@ EOF - fi - fi - echo $ac_n "checking for oci.h""... $ac_c" 1>&6 --echo "configure:70366: checking for oci.h" >&5 -+echo "configure:72475: checking for oci.h" >&5 - if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR/oci.h ; then - - if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/$PDO_OCI_CLIENT_DIR" != "/usr/include"; then -@@ -70511,7 +72620,7 @@ echo "configure:70366: checking for oci. - else - - echo $ac_n "checking size of long int""... $ac_c" 1>&6 --echo "configure:70515: checking size of long int" >&5 -+echo "configure:72624: checking size of long int" >&5 - if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -70519,9 +72628,10 @@ else - ac_cv_sizeof_long_int=4 - else - cat > conftest.$ac_ext < -+#include - main() - { - FILE *f=fopen("conftestval", "w"); -@@ -70530,7 +72640,7 @@ main() - exit(0); - } - EOF --if { (eval echo configure:70534: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:72644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - ac_cv_sizeof_long_int=`cat conftestval` - else -@@ -70550,7 +72660,7 @@ EOF - - - echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6 --echo "configure:70554: checking if we're on a 64-bit platform" >&5 -+echo "configure:72664: checking if we're on a 64-bit platform" >&5 - if test "$ac_cv_sizeof_long_int" = "4" ; then - echo "$ac_t""no" 1>&6 - TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32" -@@ -70560,7 +72670,7 @@ echo "configure:70554: checking if we're - fi - - echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6 --echo "configure:70564: checking OCI8 libraries dir" >&5 -+echo "configure:72674: checking OCI8 libraries dir" >&5 - if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then - PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" - elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then -@@ -70927,7 +73037,7 @@ echo "configure:70564: checking OCI8 lib - fi - - echo $ac_n "checking Oracle version""... $ac_c" 1>&6 --echo "configure:70931: checking Oracle version" >&5 -+echo "configure:73041: checking Oracle version" >&5 - for OCI_VER in $SUPPORTED_LIB_VERS; do - if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then - PDO_OCI_VERSION="$OCI_VER" -@@ -71109,7 +73219,7 @@ echo "configure:70931: checking Oracle v - done - - echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 --echo "configure:71113: checking for OCIEnvCreate in -lclntsh" >&5 -+echo "configure:73223: checking for OCIEnvCreate in -lclntsh" >&5 - ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71117,7 +73227,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lclntsh $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73242: \"$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 -@@ -71262,7 +73372,7 @@ fi - done - - echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 --echo "configure:71266: checking for OCIEnvNlsCreate in -lclntsh" >&5 -+echo "configure:73376: checking for OCIEnvNlsCreate in -lclntsh" >&5 - ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71270,7 +73380,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lclntsh $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73395: \"$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 -@@ -71415,7 +73525,7 @@ fi - done - - echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6 --echo "configure:71419: checking for OCILobIsTemporary in -lclntsh" >&5 -+echo "configure:73529: checking for OCILobIsTemporary in -lclntsh" >&5 - ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71423,7 +73533,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lclntsh $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73548: \"$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 -@@ -71564,7 +73674,7 @@ else - done - - echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6 --echo "configure:71568: checking for OCILobIsTemporary in -locijdbc8" >&5 -+echo "configure:73678: checking for OCILobIsTemporary in -locijdbc8" >&5 - ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71572,7 +73682,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-locijdbc8 $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73697: \"$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 -@@ -71744,7 +73854,7 @@ fi - done - - echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6 --echo "configure:71748: checking for OCICollAssign in -lclntsh" >&5 -+echo "configure:73858: checking for OCICollAssign in -lclntsh" >&5 - ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71752,7 +73862,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lclntsh $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:73877: \"$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 -@@ -71897,7 +74007,7 @@ fi - done - - echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6 --echo "configure:71901: checking for OCIStmtFetch2 in -lclntsh" >&5 -+echo "configure:74011: checking for OCIStmtFetch2 in -lclntsh" >&5 - ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -71905,7 +74015,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lclntsh $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:74030: \"$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 -@@ -71955,13 +74065,13 @@ fi - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:71959: checking for PDO includes" >&5 -+echo "configure:74069: checking for PDO includes" >&5 - if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:71965: checking for PDO includes" >&5 -+echo "configure:74075: checking for PDO includes" >&5 - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -72329,7 +74439,7 @@ fi - php_with_pdo_odbc=no - - echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6 --echo "configure:72333: checking for ODBC v3 support for PDO" >&5 -+echo "configure:74443: checking for ODBC v3 support for PDO" >&5 - # Check whether --with-pdo-odbc or --without-pdo-odbc was given. - if test "${with_pdo_odbc+set}" = set; then - withval="$with_pdo_odbc" -@@ -72381,13 +74491,13 @@ if test "$PHP_PDO_ODBC" != "no"; then - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:72385: checking for PDO includes" >&5 -+echo "configure:74495: checking for PDO includes" >&5 - if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:72391: checking for PDO includes" >&5 -+echo "configure:74501: checking for PDO includes" >&5 - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -72408,7 +74518,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 - - - echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6 --echo "configure:72412: checking for selected PDO ODBC flavour" >&5 -+echo "configure:74522: checking for selected PDO ODBC flavour" >&5 - - pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`" - pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`" -@@ -72487,7 +74597,7 @@ echo "configure:72412: checking for sele - - - echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72491: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74601: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/odbc.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72501,7 +74611,7 @@ EOF - - - echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72505: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74615: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72515,7 +74625,7 @@ EOF - - - echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72519: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74629: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72529,7 +74639,7 @@ EOF - - - echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72533: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74643: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72543,7 +74653,7 @@ EOF - - - echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72547: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74657: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72557,7 +74667,7 @@ EOF - - - echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72561: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74671: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72571,7 +74681,7 @@ EOF - - - echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72575: checking for sql.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74685: checking for sql.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/sql.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72585,7 +74695,7 @@ EOF - - - echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72589: checking for isql.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74699: checking for isql.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/isql.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72599,7 +74709,7 @@ EOF - - - echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72603: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74713: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72613,7 +74723,7 @@ EOF - - - echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72617: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74727: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72627,7 +74737,7 @@ EOF - - - echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72631: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74741: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72641,7 +74751,7 @@ EOF - - - echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72645: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74755: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72655,7 +74765,7 @@ EOF - - - echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72659: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74769: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72669,7 +74779,7 @@ EOF - - - echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72673: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74783: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72683,7 +74793,7 @@ EOF - - - echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72687: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74797: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72697,7 +74807,7 @@ EOF - - - echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72701: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74811: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72711,7 +74821,7 @@ EOF - - - echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72715: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74825: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72725,7 +74835,7 @@ EOF - - - echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 --echo "configure:72729: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 -+echo "configure:74839: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 - if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then - php_pdo_have_header=yes - cat >> confdefs.h <<\EOF -@@ -72931,7 +75041,7 @@ EOF - done - - echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 --echo "configure:72935: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 -+echo "configure:75045: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 - ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -72939,7 +75049,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$pdo_odbc_def_lib $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75064: \"$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 -@@ -73065,7 +75175,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - done - - echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 --echo "configure:73069: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 -+echo "configure:75179: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 - ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73073,7 +75183,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$pdo_odbc_def_lib $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:75198: \"$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 -@@ -73458,7 +75568,7 @@ fi - php_with_pdo_pgsql=no - - echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6 --echo "configure:73462: checking for PostgreSQL support for PDO" >&5 -+echo "configure:75572: checking for PostgreSQL support for PDO" >&5 - # Check whether --with-pdo-pgsql or --without-pdo-pgsql was given. - if test "${with_pdo_pgsql+set}" = set; then - withval="$with_pdo_pgsql" -@@ -73517,7 +75627,7 @@ if test "$PHP_PDO_PGSQL" != "no"; then - - - echo $ac_n "checking for pg_config""... $ac_c" 1>&6 --echo "configure:73521: checking for pg_config" >&5 -+echo "configure:75631: checking for pg_config" >&5 - for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do - if test -x $i/pg_config; then - PG_CONFIG="$i/pg_config" -@@ -73581,14 +75691,14 @@ EOF - - - echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6 --echo "configure:73585: checking for openssl dependencies" >&5 -+echo "configure:75695: checking for openssl dependencies" >&5 - grep openssl $PGSQL_INCLUDE/libpq-fe.h >/dev/null 2>&1 - if test $? -eq 0 ; then - echo "$ac_t""yes" 1>&6 - # Extract the first word of "pkg-config", so it can be a program name with args. - set dummy pkg-config; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:73592: checking for $ac_word" >&5 -+echo "configure:75702: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -73632,7 +75742,7 @@ fi - old_LDFLAGS=$LDFLAGS - LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" - echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 --echo "configure:73636: checking for PQparameterStatus in -lpq" >&5 -+echo "configure:75746: checking for PQparameterStatus in -lpq" >&5 - ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73640,7 +75750,7 @@ else - 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:75765: \"$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 -@@ -73680,7 +75790,7 @@ fi - - - echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 --echo "configure:73684: checking for PQprepare in -lpq" >&5 -+echo "configure:75794: checking for PQprepare in -lpq" >&5 - ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73688,7 +75798,7 @@ else - 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:75813: \"$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 -@@ -73723,7 +75833,7 @@ else - fi - - echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 --echo "configure:73727: checking for PQescapeStringConn in -lpq" >&5 -+echo "configure:75837: checking for PQescapeStringConn in -lpq" >&5 - ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73731,7 +75841,7 @@ else - 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:75856: \"$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 -@@ -73766,7 +75876,7 @@ else - fi - - echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 --echo "configure:73770: checking for PQescapeByteaConn in -lpq" >&5 -+echo "configure:75880: checking for PQescapeByteaConn in -lpq" >&5 - ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -73774,7 +75884,7 @@ else - 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:75899: \"$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 -@@ -73810,7 +75920,7 @@ fi - - - echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 --echo "configure:73814: checking for pg_encoding_to_char in -lpq" >&5 -+echo "configure:75924: 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 -@@ -73818,7 +75928,7 @@ else - 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:75943: \"$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 -@@ -73993,13 +76103,13 @@ fi - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:73997: checking for PDO includes" >&5 -+echo "configure:76107: checking for PDO includes" >&5 - if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:74003: checking for PDO includes" >&5 -+echo "configure:76113: checking for PDO includes" >&5 - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -74339,7 +76449,7 @@ fi - php_with_pdo_sqlite=$PHP_PDO - - echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6 --echo "configure:74343: checking for sqlite 3 support for PDO" >&5 -+echo "configure:76453: checking for sqlite 3 support for PDO" >&5 - # Check whether --with-pdo-sqlite or --without-pdo-sqlite was given. - if test "${with_pdo_sqlite+set}" = set; then - withval="$with_pdo_sqlite" -@@ -74388,13 +76498,13 @@ if test "$PHP_PDO_SQLITE" != "no"; then - - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:74392: checking for PDO includes" >&5 -+echo "configure:76502: checking for PDO includes" >&5 - if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:74398: checking for PDO includes" >&5 -+echo "configure:76508: checking for PDO includes" >&5 - if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then - pdo_inc_path=$abs_srcdir/ext - elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -@@ -74423,7 +76533,7 @@ echo "$ac_t""$pdo_inc_path" 1>&6 - PDO_SQLITE_DIR=$PHP_PDO_SQLITE - else # search default path list - echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 --echo "configure:74427: checking for sqlite3 files in default path" >&5 -+echo "configure:76537: checking for sqlite3 files in default path" >&5 - for i in $SEARCH_PATH ; do - if test -r $i/$SEARCH_FOR; then - PDO_SQLITE_DIR=$i -@@ -74569,7 +76679,7 @@ echo "configure:74427: checking for sqli - done - - echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 --echo "configure:74573: checking for $LIBSYMBOL in -l$LIBNAME" >&5 -+echo "configure:76683: checking for $LIBSYMBOL in -l$LIBNAME" >&5 - ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -74577,7 +76687,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:76702: \"$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 -@@ -74818,7 +76928,7 @@ fi - done - - echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 --echo "configure:74822: checking for sqlite3_key in -lsqlite3" >&5 -+echo "configure:76932: checking for sqlite3_key in -lsqlite3" >&5 - ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -74826,7 +76936,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lsqlite3 $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:76951: \"$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 -@@ -75578,12 +77688,12 @@ but you've either not enabled sqlite3, o - for ac_func in usleep nanosleep - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:75582: checking for $ac_func" >&5 -+echo "configure:77692: 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:77720: \"$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 -@@ -75634,17 +77744,17 @@ done - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:75638: checking for $ac_hdr" >&5 -+echo "configure:77748: 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:75648: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:77758: \"$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* -@@ -75768,7 +77878,7 @@ done - done - - echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6 --echo "configure:75772: checking for fdatasync in -lrt" >&5 -+echo "configure:77882: checking for fdatasync in -lrt" >&5 - ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75776,7 +77886,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lrt $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:77901: \"$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 -@@ -75868,7 +77978,7 @@ fi - php_with_pgsql=no - - echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6 --echo "configure:75872: checking for PostgreSQL support" >&5 -+echo "configure:77982: checking for PostgreSQL support" >&5 - # Check whether --with-pgsql or --without-pgsql was given. - if test "${with_pgsql+set}" = set; then - withval="$with_pgsql" -@@ -75922,7 +78032,7 @@ if test "$PHP_PGSQL" != "no"; then - - - echo $ac_n "checking for pg_config""... $ac_c" 1>&6 --echo "configure:75926: checking for pg_config" >&5 -+echo "configure:78036: checking for pg_config" >&5 - for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do - if test -x $i/pg_config; then - PG_CONFIG="$i/pg_config" -@@ -75990,7 +78100,7 @@ EOF - old_LDFLAGS=$LDFLAGS - LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" - echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6 --echo "configure:75994: checking for PQescapeString in -lpq" >&5 -+echo "configure:78104: checking for PQescapeString in -lpq" >&5 - ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -75998,7 +78108,7 @@ else - 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:78123: \"$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 -@@ -76033,7 +78143,7 @@ else - fi - - echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6 --echo "configure:76037: checking for PQunescapeBytea in -lpq" >&5 -+echo "configure:78147: checking for PQunescapeBytea in -lpq" >&5 - ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76041,7 +78151,7 @@ else - 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:78166: \"$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 -@@ -76076,7 +78186,7 @@ else - fi - - echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6 --echo "configure:76080: checking for PQsetnonblocking in -lpq" >&5 -+echo "configure:78190: checking for PQsetnonblocking in -lpq" >&5 - ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76084,7 +78194,7 @@ else - 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:78209: \"$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 -@@ -76119,7 +78229,7 @@ else - fi - - echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 --echo "configure:76123: checking for PQcmdTuples in -lpq" >&5 -+echo "configure:78233: 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 -@@ -76127,7 +78237,7 @@ else - 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:78252: \"$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 -@@ -76162,7 +78272,7 @@ else - fi - - echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6 --echo "configure:76166: checking for PQoidValue in -lpq" >&5 -+echo "configure:78276: 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 -@@ -76170,7 +78280,7 @@ else - 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:78295: \"$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 -@@ -76205,7 +78315,7 @@ else - fi - - echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6 --echo "configure:76209: checking for PQclientEncoding in -lpq" >&5 -+echo "configure:78319: 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 -@@ -76213,7 +78323,7 @@ else - 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:78338: \"$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 -@@ -76248,7 +78358,7 @@ else - fi - - echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 --echo "configure:76252: checking for PQparameterStatus in -lpq" >&5 -+echo "configure:78362: checking for PQparameterStatus in -lpq" >&5 - ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76256,7 +78366,7 @@ else - 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:78381: \"$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 -@@ -76291,7 +78401,7 @@ else - fi - - echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6 --echo "configure:76295: checking for PQprotocolVersion in -lpq" >&5 -+echo "configure:78405: checking for PQprotocolVersion in -lpq" >&5 - ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76299,7 +78409,7 @@ else - 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:78424: \"$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 -@@ -76334,7 +78444,7 @@ else - fi - - echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6 --echo "configure:76338: checking for PQtransactionStatus in -lpq" >&5 -+echo "configure:78448: checking for PQtransactionStatus in -lpq" >&5 - ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76342,7 +78452,7 @@ else - 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:78467: \"$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 -@@ -76377,7 +78487,7 @@ else - fi - - echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6 --echo "configure:76381: checking for PQexecParams in -lpq" >&5 -+echo "configure:78491: checking for PQexecParams in -lpq" >&5 - ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -76385,7 +78495,7 @@ else - 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:78510: \"$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 -@@ -76415,891 +78525,2169 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - #define HAVE_PQEXECPARAMS 1 - EOF - --else -- echo "$ac_t""no" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 -+echo "configure:78534: checking for PQprepare in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQprepare | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQPREPARE 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 -+echo "configure:78577: checking for PQexecPrepared in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQexecPrepared | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQEXECPREPARED 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 -+echo "configure:78620: checking for PQresultErrorField in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQresultErrorField | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQRESULTERRORFIELD 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 -+echo "configure:78663: checking for PQsendQueryParams in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQsendQueryParams | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQSENDQUERYPARAMS 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 -+echo "configure:78706: checking for PQsendPrepare in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQsendPrepare | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQSENDPREPARE 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 -+echo "configure:78749: checking for PQsendQueryPrepared in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQsendQueryPrepared | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQSENDQUERYPREPARED 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 -+echo "configure:78792: checking for PQputCopyData in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQputCopyData | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQPUTCOPYDATA 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 -+echo "configure:78835: checking for PQputCopyEnd in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQputCopyEnd | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQPUTCOPYEND 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 -+echo "configure:78878: checking for PQgetCopyData in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQgetCopyData | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQGETCOPYDATA 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 -+echo "configure:78921: checking for PQfreemem in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQfreemem | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQFREEMEM 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 -+echo "configure:78964: checking for PQsetErrorVerbosity in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQsetErrorVerbosity | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQSETERRORVERBOSITY 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 -+echo "configure:79007: checking for PQftable in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQftable | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQFTABLE 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 -+echo "configure:79050: checking for PQescapeStringConn in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQescapeStringConn | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQESCAPE_CONN 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 -+echo "configure:79093: checking for PQescapeByteaConn in -lpq" >&5 -+ac_lib_var=`echo pq'_'PQescapeByteaConn | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PQESCAPE_BYTEA_CONN 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 -+echo "configure:79136: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 -+echo "configure:79179: checking for lo_create in -lpq" >&5 -+ac_lib_var=`echo pq'_'lo_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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PG_LO_CREATE 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 -+echo "configure:79222: checking for lo_import_with_oid in -lpq" >&5 -+ac_lib_var=`echo pq'_'lo_import_with_oid | 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="-lpq $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 -+ cat >> confdefs.h <<\EOF -+#define HAVE_PG_LO_IMPORT_WITH_OID 1 -+EOF -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ LIBS=$old_LIBS -+ LDFLAGS=$old_LDFLAGS -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD" -+ if test -n "$PGSQL_LIBDIR"; then -+ -+ if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PGSQL_LIBDIR -+ else -+ -+ ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_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 "$PGSQL_LIBDIR"; then -+ -+ if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PGSQL_LIBDIR -+ else -+ -+ ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" -+ fi -+ -+ -+ -+ -+ -+ 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 -+ -+ -+ case pq in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lpq $LIBS" -+ ;; -+ esac -+ -+ -+ -+ -+ fi -+ -+ -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD" -+ -+ -+ -+ if test "$PGSQL_INCLUDE" != "/usr/include"; then -+ -+ if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then -+ ai_p=$PGSQL_INCLUDE -+ else -+ -+ ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ -+ -+ ext_builddir=ext/pgsql -+ ext_srcdir=$abs_srcdir/ext/pgsql -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_PGSQL_SHARED=no -+ -+ -+ case ext/pgsql in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in pgsql.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<&6 -+echo "configure:79701: checking for phar archive support" >&5 -+# Check whether --enable-phar or --disable-phar was given. -+if test "${enable_phar+set}" = set; then -+ enableval="$enable_phar" -+ PHP_PHAR=$enableval -+else -+ -+ PHP_PHAR=yes -+ test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_PHAR in -+shared,*) -+ PHP_PHAR=`echo "$PHP_PHAR"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_PHAR=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_PHAR" != "no"; then -+ -+ ext_builddir=ext/phar -+ ext_srcdir=$abs_srcdir/ext/phar -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_PHAR_SHARED=no -+ -+ -+ case ext/phar in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<&6 -+echo "configure:80035: checking for phar openssl support" >&5 -+ if test "$PHP_HASH_SHARED" != "yes"; then -+ if test "$PHP_HASH" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define PHAR_HASH_OK 1 -+EOF -+ -+ fi -+ else -+ echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2 -+ fi -+ if test "$PHP_OPENSSL_SHARED" = "yes"; then -+ echo "$ac_t""no (shared openssl)" 1>&6 -+ else -+ if test "$PHP_OPENSSL" = "yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define PHAR_HAVE_OPENSSL 1 -+EOF -+ -+ else -+ echo "$ac_t""no" 1>&6 -+ fi -+ fi -+ -+ am_i_shared=$PHP_PHAR_SHARED -+ is_it_shared=$PHP_HASH_SHARED -+ is_it_enabled=$PHP_HASH -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension phar to build statically, but it -+depends on extension hash, which you've configured to build shared. -+You either need to build phar shared or build hash statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension phar, which depends on extension hash, -+but you've either not enabled hash, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ am_i_shared=$PHP_PHAR_SHARED -+ is_it_shared=$PHP_SPL_SHARED -+ is_it_enabled=$PHP_SPL -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension phar to build statically, but it -+depends on extension spl, which you've configured to build shared. -+You either need to build phar shared or build spl statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension phar, which depends on extension spl, -+but you've either not enabled spl, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ src=$ext_srcdir/Makefile.frag -+ ac_srcdir=$ext_srcdir -+ ac_builddir=$ext_builddir -+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -+ - fi - -- echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 --echo "configure:76424: checking for PQprepare in -lpq" >&5 --ac_lib_var=`echo pq'_'PQprepare | 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="-lpq $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 -- cat >> confdefs.h <<\EOF --#define HAVE_PQPREPARE 1 --EOF -+php_enable_posix=yes - -+echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 -+echo "configure:80110: checking whether to enable POSIX-like functions" >&5 -+# Check whether --enable-posix or --disable-posix was given. -+if test "${enable_posix+set}" = set; then -+ enableval="$enable_posix" -+ PHP_POSIX=$enableval - else -- echo "$ac_t""no" 1>&6 -+ -+ PHP_POSIX=yes -+ test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL -+ - fi - -- echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 --echo "configure:76467: checking for PQexecPrepared in -lpq" >&5 --ac_lib_var=`echo pq'_'PQexecPrepared | 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="-lpq $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 -- cat >> confdefs.h <<\EOF --#define HAVE_PQEXECPREPARED 1 --EOF -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_POSIX in -+shared,*) -+ PHP_POSIX=`echo "$PHP_POSIX"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_POSIX=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - --else -- echo "$ac_t""no" 1>&6 --fi - -- echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 --echo "configure:76510: checking for PQresultErrorField in -lpq" >&5 --ac_lib_var=`echo pq'_'PQresultErrorField | 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="-lpq $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" -+echo "$ac_t""$ext_output" 1>&6 - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+ -+ -+ -+if test "$PHP_POSIX" = "yes"; then - cat >> confdefs.h <<\EOF --#define HAVE_PQRESULTERRORFIELD 1 -+#define HAVE_POSIX 1 - EOF - --else -- echo "$ac_t""no" 1>&6 --fi -+ -+ ext_builddir=ext/posix -+ ext_srcdir=$abs_srcdir/ext/posix - -- echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 --echo "configure:76553: checking for PQsendQueryParams in -lpq" >&5 --ac_lib_var=`echo pq'_'PQsendQueryParams | 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="-lpq $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" -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_POSIX_SHARED=no -+ -+ -+ case ext/posix in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQSENDQUERYPARAMS 1 --EOF -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --else -- echo "$ac_t""no" 1>&6 --fi - -- echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 --echo "configure:76596: checking for PQsendPrepare in -lpq" >&5 --ac_lib_var=`echo pq'_'PQsendPrepare | 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="-lpq $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" -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQSENDPREPARE 1 -+ cat >>Makefile.objects<&6 --fi - -- echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 --echo "configure:76639: checking for PQsendQueryPrepared in -lpq" >&5 --ac_lib_var=`echo pq'_'PQsendQueryPrepared | 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="-lpq $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" -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQSENDQUERYPREPARED 1 --EOF - --else -- echo "$ac_t""no" 1>&6 --fi -+ old_IFS=$IFS -+ for ac_src in posix.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo" - -- echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 --echo "configure:76682: checking for PQputCopyData in -lpq" >&5 --ac_lib_var=`echo pq'_'PQputCopyData | 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="-lpq $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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" -+ done - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQPUTCOPYDATA 1 --EOF -+ case $host_alias in -+ *netware*) -+ -+ install_modules="install-modules" - --else -- echo "$ac_t""no" 1>&6 --fi -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpposix.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) $(PHPPOSIX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpposix.so '$ext_builddir'/phpposix.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPOSIX, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_posix) $(PHPPOSIX_SHARED_LIBADD)' -+ ;; -+ esac - -- echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 --echo "configure:76725: checking for PQputCopyEnd in -lpq" >&5 --ac_lib_var=`echo pq'_'PQputCopyEnd | 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="-lpq $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" -+ cat >>Makefile.objects<&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQPUTCOPYEND 1 - EOF - --else -- echo "$ac_t""no" 1>&6 --fi -+ ;; -+ *) -+ -+ install_modules="install-modules" - -- echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 --echo "configure:76768: checking for PQgetCopyData in -lpq" >&5 --ac_lib_var=`echo pq'_'PQgetCopyData | 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="-lpq $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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 -- cat >> confdefs.h <<\EOF --#define HAVE_PQGETCOPYDATA 1 -+ ;; -+ esac -+ cat >> confdefs.h <&6 --fi -+ fi -+ fi -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -+ PHP_POSIX_SHARED=no -+ case "$PHP_SAPI" in -+ cgi|embed) -+ -+ -+ case ext/posix in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - -- echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 --echo "configure:76811: checking for PQfreemem in -lpq" >&5 --ac_lib_var=`echo pq'_'PQfreemem | 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="-lpq $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" -+ old_IFS=$IFS -+ for ac_src in posix.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQFREEMEM 1 -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&6 --fi - -- echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 --echo "configure:76854: checking for PQsetErrorVerbosity in -lpq" >&5 --ac_lib_var=`echo pq'_'PQsetErrorVerbosity | 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="-lpq $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" -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQSETERRORVERBOSITY 1 --EOF - --else -- echo "$ac_t""no" 1>&6 --fi -+ old_IFS=$IFS -+ for ac_src in posix.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - -- echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 --echo "configure:76897: checking for PQftable in -lpq" >&5 --ac_lib_var=`echo pq'_'PQftable | 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="-lpq $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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" -+ done - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQFTABLE 1 --EOF - --else -- echo "$ac_t""no" 1>&6 --fi -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC posix" -+ fi -+ -+ -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ - -- echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 --echo "configure:76940: checking for PQescapeStringConn in -lpq" >&5 --ac_lib_var=`echo pq'_'PQescapeStringConn | 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="-lpq $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" -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=posix -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQESCAPE_CONN 1 --EOF -+ fi - --else -- echo "$ac_t""no" 1>&6 --fi - -- echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 --echo "configure:76983: checking for PQescapeByteaConn in -lpq" >&5 --ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ for ac_hdr in sys/mkdev.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:80452: 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 -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < - EOF --if { (eval echo configure:77002: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:80462: \"$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* -- eval "ac_cv_lib_$ac_lib_var=yes" -+ eval "ac_cv_header_$ac_safe=yes" - else -+ echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ eval "ac_cv_header_$ac_safe=no" - fi - rm -f conftest* --LIBS="$ac_save_LIBS" -- - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PQESCAPE_BYTEA_CONN 1 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 - fi -+done - -- echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 --echo "configure:77026: 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 -+ -+ for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:80492: 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 -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char pg_encoding_to_char(); -+char $ac_func(); - - int main() { --pg_encoding_to_char() -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ - ; return 0; } - EOF --if { (eval echo configure:77045: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:80520: \"$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" -+ eval "ac_cv_func_$ac_func=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ eval "ac_cv_func_$ac_func=no" - fi - rm -f conftest* --LIBS="$ac_save_LIBS" -- - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT 1 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 - fi -+done - -- echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 --echo "configure:77069: checking for lo_create in -lpq" >&5 --ac_lib_var=`echo pq'_'lo_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 -+ -+ echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 -+echo "configure:80546: checking for working ttyname_r() implementation" >&5 -+ if test "$cross_compiling" = yes; then -+ -+ echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6 -+ - else -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < -+ -+int main(int argc, char *argv[]) -+{ -+ char buf[64]; -+ -+ return ttyname_r(0, buf, 64) ? 1 : 0; -+} -+ - EOF --if { (eval echo configure:77088: \"$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" -+if { (eval echo configure:80566: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define HAVE_TTYNAME_R 1 -+EOF -+ -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ rm -fr conftest* -+ -+ echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6 -+ - fi --rm -f conftest* --LIBS="$ac_save_LIBS" -- -+rm -fr conftest* - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_PG_LO_CREATE 1 --EOF - --else -- echo "$ac_t""no" 1>&6 --fi - -- echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 --echo "configure:77112: checking for lo_import_with_oid in -lpq" >&5 --ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 -+echo "configure:80588: checking for utsname.domainname" >&5 -+if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_save_LIBS="$LIBS" --LIBS="-lpq $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < -+ - int main() { --lo_import_with_oid() -+ -+ return sizeof(((struct utsname *)0)->domainname); -+ - ; return 0; } - EOF --if { (eval echo configure:77131: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:80606: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" -+ -+ ac_cv_have_utsname_domainname=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 -- cat >> confdefs.h <<\EOF --#define HAVE_PG_LO_IMPORT_WITH_OID 1 --EOF -- --else -- echo "$ac_t""no" 1>&6 --fi -- -- LIBS=$old_LIBS -- LDFLAGS=$old_LDFLAGS -- -- -- -- if test "$ext_shared" = "yes"; then -- PGSQL_SHARED_LIBADD="-lpq $PGSQL_SHARED_LIBADD" -- if test -n "$PGSQL_LIBDIR"; then -- -- if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PGSQL_LIBDIR -- else -- -- ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- PGSQL_SHARED_LIBADD="-L$ai_p $PGSQL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && PGSQL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PGSQL_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" -+ ac_cv_have_utsname_domainname=no - -- test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -- LDFLAGS="$LDFLAGS -L$ai_p" -- PHP_RPATHS="$PHP_RPATHS $ai_p" -+fi -+rm -f conftest* - -- fi -- -- -- fi -- -- fi -- -- fi -- else -- -+fi - -- if test -n "$PGSQL_LIBDIR"; then -- -- if test "$PGSQL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PGSQL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PGSQL_LIBDIR" || echo "$PGSQL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PGSQL_LIBDIR -- else -- -- ep_dir="`echo $PGSQL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PGSQL_LIBDIR\"`" -- fi -+echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6 -+ if test "$ac_cv_have_utsname_domainname" = yes; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_UTSNAME_DOMAINNAME 1 -+EOF - -- -- -- -- -- 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 -- -- -- case pq in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lpq $LIBS" -- ;; -- esac -+php_with_pspell=no - -+echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 -+echo "configure:80637: checking for PSPELL support" >&5 -+# Check whether --with-pspell or --without-pspell was given. -+if test "${with_pspell+set}" = set; then -+ withval="$with_pspell" -+ PHP_PSPELL=$withval -+else -+ -+ PHP_PSPELL=no -+ test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL - -+fi - - -- fi - -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_PSPELL in -+shared,*) -+ PHP_PSPELL=`echo "$PHP_PSPELL"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_PSPELL=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PGSQL_SHARED_LIBADD" - - -- -- if test "$PGSQL_INCLUDE" != "/usr/include"; then -- -- if test -z "$PGSQL_INCLUDE" || echo "$PGSQL_INCLUDE" | grep '^/' >/dev/null ; then -- ai_p=$PGSQL_INCLUDE -- else -- -- ep_dir="`echo $PGSQL_INCLUDE|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PGSQL_INCLUDE\"`" -- fi -+echo "$ac_t""$ext_output" 1>&6 - -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi - -- fi - - -- -- ext_builddir=ext/pgsql -- ext_srcdir=$abs_srcdir/ext/pgsql -+if test "$PHP_PSPELL" != "no"; then -+ -+ ext_builddir=ext/pspell -+ ext_srcdir=$abs_srcdir/ext/pspell - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_PGSQL_SHARED=no -+ PHP_PSPELL_SHARED=no - - -- case ext/pgsql in -+ case ext/pspell in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -77314,7 +80702,7 @@ fi - - - old_IFS=$IFS -- for ac_src in pgsql.c; do -+ for ac_src in pspell.c; do - - IFS=. - set $ac_src -@@ -77337,18 +80725,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC pgsql" -+ EXT_STATIC="$EXT_STATIC pspell" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC pgsql" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC pspell" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_PGSQL_SHARED=yes -+ PHP_PSPELL_SHARED=yes - -- case ext/pgsql in -+ case ext/pspell in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pgsql"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pgsql/"; ac_bdir="ext/pgsql/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -77363,14 +80751,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in pgsql.c; do -+ for ac_src in pspell.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_pgsql="$shared_objects_pgsql $ac_bdir$ac_obj.lo" -+ shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -77393,31 +80781,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppgsql.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) $(PHPPGSQL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppgsql.so '$ext_builddir'/phppgsql.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppspell.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppspell.so '$ext_builddir'/phppspell.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPGSQL, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPSPELL, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pgsql) $(PHPPGSQL_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppgsql.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppspell.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppgsql.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pgsql" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<&2; exit 1; } -+ fi -+ -+ PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD" -+ if test -n "$PSPELL_LIBDIR"; then -+ -+ if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PSPELL_LIBDIR -+ else -+ -+ ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_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 "$PSPELL_LIBDIR"; then -+ -+ if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PSPELL_LIBDIR -+ else -+ -+ ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -+ fi -+ -+ -+ -+ -+ -+ 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 -+ -+ -+ case pspell in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lpspell $LIBS" -+ ;; -+ esac -+ -+ -+ -+ -+ fi -+ -+ -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$PSPELL_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; - esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 -+ -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6 -+echo "configure:81187: checking for new_aspell_config in -laspell" >&5 -+ac_lib_var=`echo aspell'_'new_aspell_config | 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="-laspell $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD" -+ if test -n "$PSPELL_LIBDIR"; then -+ -+ if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PSPELL_LIBDIR -+ else -+ -+ ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_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 "$PSPELL_LIBDIR"; then -+ -+ if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PSPELL_LIBDIR -+ else -+ -+ ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -+ fi -+ -+ -+ -+ - -+ 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 - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ -+ fi - -- old_IFS=$IFS -- for ac_src in pgsql.c; do -+ fi - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ -+ case aspell in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-laspell $LIBS" -+ ;; -+ esac - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects<&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_aspell_new_aspell_config -+ - -- BUILD_DIR="$BUILD_DIR $ext_builddir" -- -+fi - - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=pgsql -+ -+ if test "$PSPELL_INCDIR" != "/usr/include"; then - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PSPELL_INCDIR -+ else -+ -+ ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - - fi - -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD" -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_PSPELL 1 -+EOF -+ - fi - - - -+php_with_libedit=no - -+echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 -+echo "configure:81380: 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" -+ PHP_LIBEDIT=$withval -+else -+ -+ PHP_LIBEDIT=no -+ test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL - --php_enable_phar=yes -+fi - --echo $ac_n "checking for phar archive support""... $ac_c" 1>&6 --echo "configure:77591: checking for phar archive support" >&5 --# Check whether --enable-phar or --disable-phar was given. --if test "${enable_phar+set}" = set; then -- enableval="$enable_phar" -- PHP_PHAR=$enableval -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_LIBEDIT in -+shared,*) -+ PHP_LIBEDIT=`echo "$PHP_LIBEDIT"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_LIBEDIT=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_LIBEDIT" = "no"; then -+ -+php_with_readline=no -+ -+echo $ac_n "checking for readline support""... $ac_c" 1>&6 -+echo "configure:81425: checking for readline support" >&5 -+# Check whether --with-readline or --without-readline was given. -+if test "${with_readline+set}" = set; then -+ withval="$with_readline" -+ PHP_READLINE=$withval - else - -- PHP_PHAR=yes -- test "$PHP_ENABLE_ALL" && PHP_PHAR=$PHP_ENABLE_ALL -+ PHP_READLINE=no -+ test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL - - fi - -@@ -77603,12 +81437,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_PHAR in -+case $PHP_READLINE in - shared,*) -- PHP_PHAR=`echo "$PHP_PHAR"|$SED 's/^shared,//'` -+ PHP_READLINE=`echo "$PHP_READLINE"|$SED 's/^shared,//'` - ;; - shared) -- PHP_PHAR=yes -+ PHP_READLINE=yes - ;; - no) - ext_output=no -@@ -77626,764 +81460,1178 @@ echo "$ac_t""$ext_output" 1>&6 - - - -+else -+ php_with_readline=no -+fi -+ -+if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then -+ for i in $PHP_READLINE /usr/local /usr; do -+ test -f $i/include/readline/readline.h && READLINE_DIR=$i && break -+ done -+ -+ if test -z "$READLINE_DIR"; then -+ { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; } -+ fi - --if test "$PHP_PHAR" != "no"; then - -- ext_builddir=ext/phar -- ext_srcdir=$abs_srcdir/ext/phar -+ if test "$READLINE_DIR/include" != "/usr/include"; then -+ -+ if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$READLINE_DIR/include -+ else -+ -+ ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`" -+ fi - -- ac_extra= -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_PHAR_SHARED=no -+ fi -+ -+ -+ PHP_READLINE_LIBS="" -+ echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -+echo "configure:81511: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lncurses $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 ext/phar in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ case ncurses in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" -+ else -+ -+ -+ case ncurses in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lncurses $LIBS" -+ ;; -+ esac -+ -+ -+ fi -+ ;; - esac -+ -+ -+ PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses" -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -+echo "configure:81575: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-ltermcap $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 termcap in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" -+ else -+ - -+ case termcap in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-ltermcap $LIBS" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap" -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ - -+fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -- old_IFS=$IFS -- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 -+ -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 -+echo "configure:81741: checking for readline in -lreadline" >&5 -+ac_lib_var=`echo readline'_'readline | 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="-lreadline $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD" -+ if test -n "$READLINE_DIR/$PHP_LIBDIR"; then -+ -+ if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$READLINE_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_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 - -- EXT_STATIC="$EXT_STATIC phar" -- if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC phar" - fi - else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_PHAR_SHARED=yes -+ -+ -+ if test -n "$READLINE_DIR/$PHP_LIBDIR"; then -+ -+ if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$READLINE_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ - -- case ext/phar in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac - - -+ 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 - -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo - -+ -+ fi - -- old_IFS=$IFS -- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do -+ fi - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_phar="$shared_objects_phar $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ -+ case readline in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lreadline $LIBS" -+ ;; -+ esac - -- cat >>Makefile.objects<>Makefile.objects<&6 - -- ;; -- *) -- -- install_modules="install-modules" -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_readline_readline -+ -+ { echo "configure: error: readline library not found" 1>&2; exit 1; } -+ -+ -+fi - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phar.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHAR_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phar.so '$ext_builddir'/phar.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHAR, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_phar) $(PHAR_SHARED_LIBADD)' -- ;; -- esac - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phar.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phar.$suffix" -- fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_phar" -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -- cat >>Makefile.objects<> confdefs.h </dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_PHAR_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else - - -- case ext/phar in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac - -+ 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 - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ fi -+ -+ fi - -- old_IFS=$IFS -- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ ;; -+ esac -+ done - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6 -+echo "configure:81989: checking for rl_pending_input in -lreadline" >&5 -+ac_lib_var=`echo readline'_'rl_pending_input | 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="-lreadline $LIBS" -+cat > conftest.$ac_ext <>Makefile.objects<&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" - -- EXT_STATIC="$EXT_STATIC phar" -- ;; -- *) -- -- -- case ext/phar in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/phar"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/phar/"; ac_bdir="ext/phar/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ - -+else -+ echo "$ac_t""no" 1>&6 - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c; do -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_readline_rl_pending_input -+ -+ { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; } - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects<&6 --echo "configure:77925: checking for phar openssl support" >&5 -- if test "$PHP_HASH_SHARED" != "yes"; then -- if test "$PHP_HASH" != "no"; then -- cat >> confdefs.h <<\EOF --#define PHAR_HASH_OK 1 --EOF - -- fi -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else -- echo "configure: warning: Phar: sha256/sha512 signature support disabled if ext/hash is built shared" 1>&2 -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -- if test "$PHP_OPENSSL_SHARED" = "yes"; then -- echo "$ac_t""no (shared openssl)" 1>&6 -- else -- if test "$PHP_OPENSSL" = "yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define PHAR_HAVE_OPENSSL 1 --EOF - -- else -- echo "$ac_t""no" 1>&6 -- fi -- fi -- -- am_i_shared=$PHP_PHAR_SHARED -- is_it_shared=$PHP_HASH_SHARED -- is_it_enabled=$PHP_HASH -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension phar to build statically, but it --depends on extension hash, which you've configured to build shared. --You either need to build phar shared or build hash statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension phar, which depends on extension hash, --but you've either not enabled hash, or have disabled it. --" 1>&2; exit 1; } -- fi -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - - -- am_i_shared=$PHP_PHAR_SHARED -- is_it_shared=$PHP_SPL_SHARED -- is_it_enabled=$PHP_SPL -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension phar to build statically, but it --depends on extension spl, which you've configured to build shared. --You either need to build phar shared or build spl statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension phar, which depends on extension spl, --but you've either not enabled spl, or have disabled it. --" 1>&2; exit 1; } -- fi -+ 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" - -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -- --fi -+ fi - - -+ fi -+ -+ fi - --php_enable_posix=yes -+ ;; -+ esac -+ done - --echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 --echo "configure:78000: checking whether to enable POSIX-like functions" >&5 --# Check whether --enable-posix or --disable-posix was given. --if test "${enable_posix+set}" = set; then -- enableval="$enable_posix" -- PHP_POSIX=$enableval -+ echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 -+echo "configure:82139: checking for rl_callback_read_char in -lreadline" >&5 -+ac_lib_var=`echo readline'_'rl_callback_read_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 - else -- -- PHP_POSIX=yes -- test "$PHP_ENABLE_ALL" && PHP_POSIX=$PHP_ENABLE_ALL -+ ac_save_LIBS="$LIBS" -+LIBS="-lreadline $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_RL_CALLBACK_READ_CHAR 1 -+EOF - -+ -+ -+else -+ echo "$ac_t""no" 1>&6 - --ext_output="yes, shared" --ext_shared=yes --case $PHP_POSIX in --shared,*) -- PHP_POSIX=`echo "$PHP_POSIX"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_POSIX=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_readline_rl_callback_read_char -+ -+ -+fi - - --echo "$ac_t""$ext_output" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBREADLINE 1 -+EOF - - -+elif test "$PHP_LIBEDIT" != "no"; then - -+ for i in $PHP_LIBEDIT /usr/local /usr; do -+ test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break -+ done - --if test "$PHP_POSIX" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_POSIX 1 --EOF -+ if test -z "$LIBEDIT_DIR"; then -+ { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; } -+ fi - - -- ext_builddir=ext/posix -- ext_srcdir=$abs_srcdir/ext/posix -- -- ac_extra= -+ if test "$LIBEDIT_DIR/include" != "/usr/include"; then -+ -+ if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$LIBEDIT_DIR/include -+ else -+ -+ ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`" -+ fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_POSIX_SHARED=no - - -- case ext/posix in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -+ fi - -- old_IFS=$IFS -- for ac_src in posix.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 -+echo "configure:82242: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lncurses $LIBS" -+cat > conftest.$ac_ext <>Makefile.objects<&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 ncurses in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" -+ else -+ -+ -+ case ncurses in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lncurses $LIBS" -+ ;; -+ esac - - -- EXT_STATIC="$EXT_STATIC posix" -- if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC posix" - fi -- else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_POSIX_SHARED=yes -- -- case ext/posix in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ ;; - esac -+ -+ - -- -+else -+ echo "$ac_t""no" 1>&6 - -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo -+ echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 -+echo "configure:82305: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-ltermcap $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" - -- old_IFS=$IFS -- for ac_src in posix.c; do -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS - -- shared_objects_posix="$shared_objects_posix $ac_bdir$ac_obj.lo" -+ -+ case termcap in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" -+ else -+ -+ -+ case termcap in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-ltermcap $LIBS" -+ ;; -+ esac - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects<&6 -+fi - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpposix.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpposix.$suffix" -- fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix" -+fi - -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$ac_ii - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/posix.$suffix" -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_posix" -+ -+ 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 - -- cat >>Makefile.objects<> confdefs.h <&6 -+echo "configure:82470: checking for readline in -ledit" >&5 -+ac_lib_var=`echo edit'_'readline | 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="-ledit $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 -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD" -+ if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then -+ -+ if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$LIBEDIT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" - fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_POSIX_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -- -- case ext/posix in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ -+ if test "$ext_shared" = "yes"; then -+ READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" -+ else -+ - - -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in posix.c; do -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ 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 - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$LIBEDIT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ - -- case ext/posix in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/posix"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/posix/"; ac_bdir="ext/posix/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac - -+ 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 - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ -+ fi - -- old_IFS=$IFS -- for ac_src in posix.c; do -+ fi - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ -+ case edit in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-ledit $LIBS" -+ ;; -+ esac - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects<&6 - -- -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=posix -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_edit_readline - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- -- fi -+ { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; } -+ -+ -+fi - - -- for ac_hdr in sys/mkdev.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:78342: 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:78352: \"$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* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_LIBEDIT 1 - EOF -- --else -- echo "$ac_t""no" 1>&6 --fi --done - -+fi - -- for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r -+if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then -+ for ac_func in rl_completion_matches - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:78382: checking for $ac_func" >&5 -+echo "configure:82630: 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:82658: \"$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 -@@ -78430,154 +82678,20 @@ else - fi - done - -- -- echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 --echo "configure:78436: checking for working ttyname_r() implementation" >&5 -- if test "$cross_compiling" = yes; then -- -- echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6 -- --else -- cat > conftest.$ac_ext < -- --int main(int argc, char *argv[]) --{ -- char buf[64]; -- -- return ttyname_r(0, buf, 64) ? 1 : 0; --} -- --EOF --if { (eval echo configure:78456: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define HAVE_TTYNAME_R 1 --EOF -- -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- echo "$ac_t""no, posix_ttyname() will be thread-unsafe" 1>&6 -- --fi --rm -fr conftest* --fi -- -- -- echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 --echo "configure:78478: checking for utsname.domainname" >&5 --if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- cat > conftest.$ac_ext < -- --int main() { -- -- return sizeof(((struct utsname *)0)->domainname); -- --; return 0; } --EOF --if { (eval echo configure:78496: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- -- ac_cv_have_utsname_domainname=yes -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- -- ac_cv_have_utsname_domainname=no -- --fi --rm -f conftest* -- --fi -- --echo "$ac_t""$ac_cv_have_utsname_domainname" 1>&6 -- if test "$ac_cv_have_utsname_domainname" = yes; then -- cat >> confdefs.h <<\EOF --#define HAVE_UTSNAME_DOMAINNAME 1 --EOF -- -- fi --fi -- -- -- --php_with_pspell=no -- --echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 --echo "configure:78527: checking for PSPELL support" >&5 --# Check whether --with-pspell or --without-pspell was given. --if test "${with_pspell+set}" = set; then -- withval="$with_pspell" -- PHP_PSPELL=$withval --else - -- PHP_PSPELL=no -- test "$PHP_ENABLE_ALL" && PHP_PSPELL=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_PSPELL in --shared,*) -- PHP_PSPELL=`echo "$PHP_PSPELL"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_PSPELL=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_PSPELL" != "no"; then -- -- ext_builddir=ext/pspell -- ext_srcdir=$abs_srcdir/ext/pspell -+ ext_builddir=ext/readline -+ ext_srcdir=$abs_srcdir/ext/readline - - ac_extra= - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_PSPELL_SHARED=no -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then -+ PHP_READLINE_SHARED=no - - -- case ext/pspell in -+ case ext/readline in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -78592,7 +82706,7 @@ if test "$PHP_PSPELL" != "no"; then - - - old_IFS=$IFS -- for ac_src in pspell.c; do -+ for ac_src in readline.c; do - - IFS=. - set $ac_src -@@ -78615,18 +82729,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC pspell" -+ EXT_STATIC="$EXT_STATIC readline" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC pspell" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC readline" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_PSPELL_SHARED=yes -+ PHP_READLINE_SHARED=yes - -- case ext/pspell in -+ case ext/readline in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/pspell"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/pspell/"; ac_bdir="ext/pspell/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -78641,14 +82755,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in pspell.c; do -+ for ac_src in readline.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_pspell="$shared_objects_pspell $ac_bdir$ac_obj.lo" -+ shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -78671,31 +82785,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phppspell.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phppspell.so '$ext_builddir'/phppspell.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreadline.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreadline.so '$ext_builddir'/phpreadline.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPPSPELL, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_pspell) $(PHPPSPELL_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phppspell.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreadline.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phppspell.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_pspell" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } -- fi -+fi - -- PSPELL_LIBDIR=$PSPELL_DIR/$PHP_LIBDIR - -- - -- if test "$ext_shared" = "yes"; then -- PSPELL_SHARED_LIBADD="-lpspell $PSPELL_SHARED_LIBADD" -- if test -n "$PSPELL_LIBDIR"; then -- -- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PSPELL_LIBDIR -- else -- -- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -- fi -+php_with_recode=no - -- -- if test "$ext_shared" = "yes"; then -- PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_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" -+echo $ac_n "checking for recode support""... $ac_c" 1>&6 -+echo "configure:82984: checking for recode support" >&5 -+# Check whether --with-recode or --without-recode was given. -+if test "${with_recode+set}" = set; then -+ withval="$with_recode" -+ PHP_RECODE=$withval -+else - -- fi -- -+ PHP_RECODE=no -+ test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL - -- fi -- -- fi -+fi - -- fi -- else -- - -- if test -n "$PSPELL_LIBDIR"; then -- -- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PSPELL_LIBDIR -- else -- -- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -- fi - -- -- -- -- -- 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 -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_RECODE in -+shared,*) -+ PHP_RECODE=`echo "$PHP_RECODE"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_RECODE=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - - -- -- fi - -- fi -- -- -- case pspell in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lpspell $LIBS" -- ;; -- esac -+echo "$ac_t""$ext_output" 1>&6 - - - - -- fi -+if test "$PHP_RECODE" != "no"; then -+ RECODE_LIST="$PHP_RECODE /usr/local /usr /opt" - -+ for i in $RECODE_LIST; do -+ if test -f $i/include/recode.h; then -+ RECODE_DIR=$i -+ RECODE_INC=include -+ RECODE_LIB=$PHP_LIBDIR -+ fi -+ if test -f $i/include/recode/recode.h; then -+ RECODE_DIR=$i -+ RECODE_INC=include/recode -+ RECODE_LIB=$PHP_LIBDIR/recode -+ fi -+ if test -f $i/recode/include/recode.h; then -+ RECODE_DIR=$i/recode -+ RECODE_INC=include -+ RECODE_LIB=$PHP_LIBDIR -+ fi -+ test -n "$RECODE_DIR" && break -+ done - -+ if test -z "$RECODE_DIR"; then -+ { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; } -+ fi - -- -+ - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" -- -L$PSPELL_LIBDIR -- " -+ -L$RECODE_DIR/$RECODE_LIB -+ " - - save_ext_shared=$ext_shared - ext_shared=yes -@@ -79072,27 +83143,27 @@ EOF - esac - done - -- echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6 --echo "configure:79077: checking for new_aspell_config in -laspell" >&5 --ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 -+echo "configure:83148: checking for recode_format_table in -lrecode" >&5 -+ac_lib_var=`echo recode'_'recode_format_table | 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="-laspell $LIBS" -+LIBS="-lrecode $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:83167: \"$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 -@@ -79111,28 +83182,28 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -- -+ - - if test "$ext_shared" = "yes"; then -- PSPELL_SHARED_LIBADD="-laspell $PSPELL_SHARED_LIBADD" -- if test -n "$PSPELL_LIBDIR"; then -+ RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" -+ if test -n "$RECODE_DIR/$RECODE_LIB"; then - -- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -+ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - -- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PSPELL_LIBDIR -+ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_LIB - else - -- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" - fi - - - if test "$ext_shared" = "yes"; then -- PSPELL_SHARED_LIBADD="-L$ai_p $PSPELL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && PSPELL_SHARED_LIBADD="$ld_runpath_switch$ai_p $PSPELL_SHARED_LIBADD" -+ RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" - else - - -@@ -79158,451 +83229,22 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - else - - -- if test -n "$PSPELL_LIBDIR"; then -- -- if test "$PSPELL_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PSPELL_LIBDIR" != "/usr/lib"; then -- -- if test -z "$PSPELL_LIBDIR" || echo "$PSPELL_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PSPELL_LIBDIR -- else -- -- ep_dir="`echo $PSPELL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_LIBDIR\"`" -- fi -- -- -- -- -- -- 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 -- -- -- case aspell in -- c|c_r|pthread*) ;; -- *) -- LIBS="-laspell $LIBS" -- ;; -- esac -- -- -- -- -- fi -- -- -- -- --else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_aspell_new_aspell_config -- -- --fi -- -- -- -- if test "$PSPELL_INCDIR" != "/usr/include"; then -- -- if test -z "$PSPELL_INCDIR" || echo "$PSPELL_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$PSPELL_INCDIR -- else -- -- ep_dir="`echo $PSPELL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PSPELL_INCDIR\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -+ if test -n "$RECODE_DIR/$RECODE_LIB"; then - -- fi -- -- fi -- -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PSPELL_SHARED_LIBADD" -- -- cat >> confdefs.h <<\EOF --#define HAVE_PSPELL 1 --EOF -- --fi -- -- -- --php_with_libedit=no -- --echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 --echo "configure:79270: 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" -- PHP_LIBEDIT=$withval --else -- -- PHP_LIBEDIT=no -- test "$PHP_ENABLE_ALL" && PHP_LIBEDIT=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_LIBEDIT in --shared,*) -- PHP_LIBEDIT=`echo "$PHP_LIBEDIT"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_LIBEDIT=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_LIBEDIT" = "no"; then -- --php_with_readline=no -- --echo $ac_n "checking for readline support""... $ac_c" 1>&6 --echo "configure:79315: checking for readline support" >&5 --# Check whether --with-readline or --without-readline was given. --if test "${with_readline+set}" = set; then -- withval="$with_readline" -- PHP_READLINE=$withval --else -- -- PHP_READLINE=no -- test "$PHP_ENABLE_ALL" && PHP_READLINE=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_READLINE in --shared,*) -- PHP_READLINE=`echo "$PHP_READLINE"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_READLINE=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- --else -- php_with_readline=no --fi -- --if test "$PHP_READLINE" && test "$PHP_READLINE" != "no"; then -- for i in $PHP_READLINE /usr/local /usr; do -- test -f $i/include/readline/readline.h && READLINE_DIR=$i && break -- done -- -- if test -z "$READLINE_DIR"; then -- { echo "configure: error: Please reinstall readline - I cannot find readline.h" 1>&2; exit 1; } -- fi -- -- -- if test "$READLINE_DIR/include" != "/usr/include"; then -+ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - -- if test -z "$READLINE_DIR/include" || echo "$READLINE_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$READLINE_DIR/include -+ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_LIB - else - -- ep_dir="`echo $READLINE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$READLINE_DIR/include\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" - fi - -- -- PHP_READLINE_LIBS="" -- echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 --echo "configure:79401: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lncurses $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 ncurses in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" -- else -- -- -- case ncurses in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lncurses $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- PHP_READLINE_LIBS="$PHP_READLINE_LIBS -lncurses" -- --else -- echo "$ac_t""no" 1>&6 -- -- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 --echo "configure:79465: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-ltermcap $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 termcap in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" -- else -- -- -- case termcap in -- c|c_r|pthread*) ;; -- *) -- LIBS="-ltermcap $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- PHP_READLINE_LIBS="$PHP_READLINE_LIBS -ltermcap" - --else -- echo "$ac_t""no" 1>&6 --fi -- -- --fi -- -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` - -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -79618,75 +83260,75 @@ fi - fi - - -- fi - - fi - -- ;; -- esac -- done -+ fi -+ -+ -+ case recode in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lrecode $LIBS" -+ ;; -+ esac - -- echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 --echo "configure:79631: checking for readline in -lreadline" >&5 --ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ -+ -+ -+ fi -+ -+ -+ -+ - else -- ac_save_LIBS="$LIBS" --LIBS="-lreadline $LIBS" --cat > conftest.$ac_ext <&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_recode_recode_format_table -+ -+ old_LDFLAGS=$LDFLAGS -+ old_LIBS=$LIBS -+ 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 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -+if { (eval echo configure:83308: \"$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=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 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -+ - - if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-lreadline $READLINE_SHARED_LIBADD" -- if test -n "$READLINE_DIR/$PHP_LIBDIR"; then -+ RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" -+ if test -n "$RECODE_DIR/$RECODE_LIB"; then - -- if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - -- if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$READLINE_DIR/$PHP_LIBDIR -+ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_LIB - else - -- ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" - fi - - - if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" -+ RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" - else - - -@@ -79712,18 +83354,18 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - else - - -- if test -n "$READLINE_DIR/$PHP_LIBDIR"; then -+ if test -n "$RECODE_DIR/$RECODE_LIB"; then - -- if test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$READLINE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then - -- if test -z "$READLINE_DIR/$PHP_LIBDIR" || echo "$READLINE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$READLINE_DIR/$PHP_LIBDIR -+ if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_LIB - else - -- ep_dir="`echo $READLINE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$READLINE_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" - fi - - -@@ -79749,10 +83391,10 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - fi - - -- case readline in -+ case recode in - c|c_r|pthread*) ;; - *) -- LIBS="-lreadline $LIBS" -+ DLIBS="-lrecode $DLIBS" - ;; - esac - -@@ -79762,826 +83404,1022 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - fi - - -- -- --else -- echo "$ac_t""no" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define HAVE_BROKEN_RECODE 1 -+EOF - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_readline_readline - -- { echo "configure: error: readline library not found" 1>&2; exit 1; } -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+ { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; } -+ -+fi -+rm -f conftest* -+ LIBS=$old_LIBS -+ LDFLAGS=$old_LDFLAGS - - - fi - - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBRECODE 1 -+EOF -+ - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -- " -+ if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then -+ -+ if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then -+ ai_p=$RECODE_DIR/$RECODE_INC -+ else -+ -+ ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`" -+ fi -+ -+ - -- save_ext_shared=$ext_shared -- ext_shared=yes -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" - else -- -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD" -+ -+ for ac_hdr in stdbool.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:83471: 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:83481: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done -+ - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -+ ext_builddir=ext/recode -+ ext_srcdir=$abs_srcdir/ext/recode - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_RECODE_SHARED=no -+ -+ -+ case ext/recode in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in recode.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h </dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<&6 --echo "configure:79879: checking for rl_pending_input in -lreadline" >&5 --ac_lib_var=`echo readline'_'rl_pending_input | 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="-lreadline $LIBS" --cat > conftest.$ac_ext <> confdefs.h <<\EOF -+#define HAVE_REFLECTION 1 - EOF --if { (eval echo configure:79898: \"$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 -- 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 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- --else -- echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_readline_rl_pending_input -- -- { echo "configure: error: invalid readline installation detected. Try --with-libedit instead." 1>&2; exit 1; } -- -- --fi -+ ext_builddir=ext/reflection -+ ext_srcdir=$abs_srcdir/ext/reflection - -+ ac_extra= - -+ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then -+ PHP_REFLECTION_SHARED=no -+ - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$READLINE_DIR/$PHP_LIBDIR $PHP_READLINE_LIBS -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -+ case ext/reflection in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in php_reflection.c; do - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- fi -- ;; -- esac -+ cat >>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -+ EXT_STATIC="$EXT_STATIC reflection" -+ if test "no" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC reflection" -+ fi - else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ if test "no" = "shared" || test "no" = "yes"; then -+ PHP_REFLECTION_SHARED=yes -+ -+ case ext/reflection in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- 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 - -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo - -- fi -- -- fi - -- ;; -- esac -- done -+ old_IFS=$IFS -+ for ac_src in php_reflection.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo" - -- echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 --echo "configure:80029: checking for rl_callback_read_char in -lreadline" >&5 --ac_lib_var=`echo readline'_'rl_callback_read_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lreadline $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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" -+ done - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- cat >> confdefs.h <<\EOF --#define HAVE_RL_CALLBACK_READ_CHAR 1 --EOF -+ case $host_alias in -+ *netware*) -+ -+ install_modules="install-modules" - -- -- --else -- echo "$ac_t""no" 1>&6 -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreflection.so '$ext_builddir'/phpreflection.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD)' -+ ;; -+ esac - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_readline_rl_callback_read_char -- -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreflection.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix" -+ fi - --fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" - -+ cat >>Makefile.objects<> confdefs.h <<\EOF --#define HAVE_LIBREADLINE 1 --EOF -+$ext_builddir/phpreflection.$suffix: \$(shared_objects_reflection) \$(PHPREFLECTION_SHARED_DEPENDENCIES) -+ $link_cmd - -+EOF - --elif test "$PHP_LIBEDIT" != "no"; then -+ ;; -+ *) -+ -+ install_modules="install-modules" - -- for i in $PHP_LIBEDIT /usr/local /usr; do -- test -f $i/include/editline/readline.h && LIBEDIT_DIR=$i && break -- done -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/reflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(REFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/reflection.so '$ext_builddir'/reflection.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(REFLECTION, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(REFLECTION_SHARED_LIBADD)' -+ ;; -+ esac - -- if test -z "$LIBEDIT_DIR"; then -- { echo "configure: error: Please reinstall libedit - I cannot find readline.h" 1>&2; exit 1; } -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/reflection.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/reflection.$suffix" - fi -- - -- if test "$LIBEDIT_DIR/include" != "/usr/include"; then -- -- if test -z "$LIBEDIT_DIR/include" || echo "$LIBEDIT_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$LIBEDIT_DIR/include -- else -- -- ep_dir="`echo $LIBEDIT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/include\"`" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" -+ -+ cat >>Makefile.objects<> confdefs.h <&6 --echo "configure:80132: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lncurses $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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" -+ done - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+ -+ EXT_STATIC="$EXT_STATIC reflection" -+ ;; -+ *) -+ - -- -+ case ext/reflection in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- case ncurses in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-lncurses $READLINE_SHARED_LIBADD" -- else -- - -- case ncurses in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lncurses $LIBS" -- ;; -- esac -- - -- fi -- ;; -- esac -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - - -+ old_IFS=$IFS -+ for ac_src in php_reflection.c; do - --else -- echo "$ac_t""no" 1>&6 -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - -- echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 --echo "configure:80195: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-ltermcap $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" -+ cat >>Makefile.objects<&6 -+ -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC reflection" -+ fi - -- - -- case termcap in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-ltermcap $READLINE_SHARED_LIBADD" -- else -- -+ BUILD_DIR="$BUILD_DIR $ext_builddir" - -- case termcap in -- c|c_r|pthread*) ;; -- *) -- LIBS="-ltermcap $LIBS" -- ;; -- esac - - -- fi -- ;; -- esac -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=reflection -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - -+ fi - -- --else -- echo "$ac_t""no" 1>&6 --fi - -+ -+ -+php_enable_session=yes -+ -+echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6 -+echo "configure:84104: checking whether to enable PHP sessions" >&5 -+# Check whether --enable-session or --disable-session was given. -+if test "${enable_session+set}" = set; then -+ enableval="$enable_session" -+ PHP_SESSION=$enableval -+else - -+ PHP_SESSION=yes -+ test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL -+ - fi - - -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$READLINE_DIR/$PHP_LIBDIR -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SESSION in -+shared,*) -+ PHP_SESSION=`echo "$PHP_SESSION"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SESSION=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - - -- fi -- ;; -- esac - -+echo "$ac_t""$ext_output" 1>&6 - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi - -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- 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 - -- ;; -- esac -- done -+php_with_mm=no - -- echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 --echo "configure:80360: checking for readline in -ledit" >&5 --ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+echo $ac_n "checking for mm support""... $ac_c" 1>&6 -+echo "configure:84148: checking for mm support" >&5 -+# Check whether --with-mm or --without-mm was given. -+if test "${with_mm+set}" = set; then -+ withval="$with_mm" -+ PHP_MM=$withval - else -- ac_save_LIBS="$LIBS" --LIBS="-ledit $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 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- - -- if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-ledit $READLINE_SHARED_LIBADD" -- if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then -- -- if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$LIBEDIT_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" -- fi -+ext_output=$PHP_MM -+echo "$ac_t""$ext_output" 1>&6 - -- -- if test "$ext_shared" = "yes"; then -- READLINE_SHARED_LIBADD="-L$ai_p $READLINE_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && READLINE_SHARED_LIBADD="$ld_runpath_switch$ai_p $READLINE_SHARED_LIBADD" -- else -- -- -+ -+ -+ -+if test "$PHP_SESSION" != "no"; then - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 -+echo "configure:84170: checking whether pwrite works" >&5 -+if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -- 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" -+ if test "$cross_compiling" = yes; then - -- fi -- -+ ac_cv_pwrite=no -+ -+else -+ cat > conftest.$ac_ext < -+#include -+#include -+#include -+#include - -- fi -- else -- -+ main() { -+ int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); - -- if test -n "$LIBEDIT_DIR/$PHP_LIBDIR"; then -- -- if test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$LIBEDIT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$LIBEDIT_DIR/$PHP_LIBDIR" || echo "$LIBEDIT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$LIBEDIT_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $LIBEDIT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$LIBEDIT_DIR/$PHP_LIBDIR\"`" -- fi -+ if (fd < 0) exit(1); -+ if (pwrite(fd, "text", 4, 0) != 4) exit(1); -+ /* Linux glibc breakage until 2.2.5 */ -+ if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); -+ exit(0); -+ } - -- -- - -+EOF -+if { (eval echo configure:84203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_cv_pwrite=yes - -- 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" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -- fi -- -+ ac_cv_pwrite=no -+ -+fi -+rm -fr conftest* -+fi - -- -- fi - -- fi -+ if test "$ac_cv_pwrite" = "no"; then -+ -+ if test "$cross_compiling" = yes; then - -+ ac_cv_pwrite=no - -- case edit in -- c|c_r|pthread*) ;; -- *) -- LIBS="-ledit $LIBS" -- ;; -- esac -- -- -+else -+ cat > conftest.$ac_ext < -+#include -+#include -+#include -+#include -+ssize_t pwrite(int, void *, size_t, off64_t); -+ main() { -+ int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); - -- fi -+ if (fd < 0) exit(1); -+ if (pwrite(fd, "text", 4, 0) != 4) exit(1); -+ /* Linux glibc breakage until 2.2.5 */ -+ if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); -+ exit(0); -+ } - - -+EOF -+if { (eval echo configure:84249: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - -+ ac_cv_pwrite=yes - - else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_edit_readline -- -- { echo "configure: error: edit library required by readline not found" 1>&2; exit 1; } -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -+ ac_cv_pwrite=no - - fi -+rm -fr conftest* -+fi - - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBEDIT 1 -+ if test "$ac_cv_pwrite" = "yes"; then -+ ac_cv_pwrite=64 -+ fi -+ fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_pwrite" 1>&6 -+ -+ if test "$ac_cv_pwrite" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_PWRITE 1 - EOF - --fi -+ if test "$ac_cv_pwrite" = "64"; then -+ cat >> confdefs.h <<\EOF -+#define PHP_PWRITE_64 1 -+EOF - --if test "$PHP_READLINE" != "no" || test "$PHP_LIBEDIT" != "no"; then -- for ac_func in rl_completion_matches --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:80520: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ fi -+ fi -+ -+ -+ echo $ac_n "checking whether pread works""... $ac_c" 1>&6 -+echo "configure:84290: checking whether pread works" >&5 -+if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -+ -+ -+ echo test > conftest_in -+ if test "$cross_compiling" = yes; then -+ -+ ac_cv_pread=no -+ -+else - cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); -- --int main() { - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --$ac_func(); --#endif -+#include -+#include -+#include -+#include -+#include - --; return 0; } -+ main() { -+ char buf[3]; -+ int fd = open("conftest_in", O_RDONLY); -+ if (fd < 0) exit(1); -+ if (pread(fd, buf, 2, 0) != 2) exit(1); -+ /* Linux glibc breakage until 2.2.5 */ -+ if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); -+ exit(0); -+ } -+ - EOF --if { (eval echo configure:80548: \"$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" -+if { (eval echo configure:84323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_pread=yes -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" -+ rm -fr conftest* -+ -+ ac_cv_pread=no -+ - fi --rm -f conftest* -+rm -fr conftest* - fi - --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h < conftest_in -+ if test "$cross_compiling" = yes; then -+ -+ ac_cv_pread=no -+ -+else -+ cat > conftest.$ac_ext < -+#include -+#include -+#include -+#include -+ssize_t pread(int, void *, size_t, off64_t); -+ main() { -+ char buf[3]; -+ int fd = open("conftest_in", O_RDONLY); -+ if (fd < 0) exit(1); -+ if (pread(fd, buf, 2, 0) != 2) exit(1); -+ /* Linux glibc breakage until 2.2.5 */ -+ if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); -+ exit(0); -+ } -+ - EOF -- -+if { (eval echo configure:84370: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_pread=yes -+ - else -- echo "$ac_t""no" 1>&6 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ ac_cv_pread=no -+ -+fi -+rm -fr conftest* - fi --done - -+ rm -f conftest_in -+ -+ if test "$ac_cv_pread" = "yes"; then -+ ac_cv_pread=64 -+ fi -+ fi - -- ext_builddir=ext/readline -- ext_srcdir=$abs_srcdir/ext/readline -+fi -+ -+echo "$ac_t""$ac_cv_pread" 1>&6 -+ -+ if test "$ac_cv_pread" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_PREAD 1 -+EOF -+ -+ if test "$ac_cv_pread" = "64"; then -+ cat >> confdefs.h <<\EOF -+#define PHP_PREAD_64 1 -+EOF -+ -+ fi -+ fi -+ -+ -+ ext_builddir=ext/session -+ ext_srcdir=$abs_srcdir/ext/session - - ac_extra= - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "cli" != "cli"; then -- PHP_READLINE_SHARED=no -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SESSION_SHARED=no - - -- case ext/readline in -+ case ext/session in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -80596,7 +84434,7 @@ done - - - old_IFS=$IFS -- for ac_src in readline.c; do -+ for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do - - IFS=. - set $ac_src -@@ -80619,18 +84457,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC readline" -+ EXT_STATIC="$EXT_STATIC session" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC readline" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC session" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_READLINE_SHARED=yes -+ PHP_SESSION_SHARED=yes - -- case ext/readline in -+ case ext/session in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/readline"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/readline/"; ac_bdir="ext/readline/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -80645,14 +84483,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in readline.c; do -+ for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_readline="$shared_objects_readline $ac_bdir$ac_obj.lo" -+ shared_objects_session="$shared_objects_session $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -80675,31 +84513,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreadline.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreadline.so '$ext_builddir'/phpreadline.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsession.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsession.so '$ext_builddir'/phpsession.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREADLINE, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSESSION, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_readline) $(PHPREADLINE_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_session) $(PHPSESSION_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreadline.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsession.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreadline.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_readline" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 --echo "configure:80874: checking for recode support" >&5 --# Check whether --with-recode or --without-recode was given. --if test "${with_recode+set}" = set; then -- withval="$with_recode" -- PHP_RECODE=$withval --else -- -- PHP_RECODE=no -- test "$PHP_ENABLE_ALL" && PHP_RECODE=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_RECODE in --shared,*) -- PHP_RECODE=`echo "$PHP_RECODE"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_RECODE=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_RECODE" != "no"; then -- RECODE_LIST="$PHP_RECODE /usr/local /usr /opt" -- -- for i in $RECODE_LIST; do -- if test -f $i/include/recode.h; then -- RECODE_DIR=$i -- RECODE_INC=include -- RECODE_LIB=$PHP_LIBDIR -- fi -- if test -f $i/include/recode/recode.h; then -- RECODE_DIR=$i -- RECODE_INC=include/recode -- RECODE_LIB=$PHP_LIBDIR/recode -- fi -- if test -f $i/recode/include/recode.h; then -- RECODE_DIR=$i/recode -- RECODE_INC=include -- RECODE_LIB=$PHP_LIBDIR -- fi -- test -n "$RECODE_DIR" && break -- done -- -- if test -z "$RECODE_DIR"; then -- { echo "configure: error: Can not find recode.h anywhere under $RECODE_LIST." 1>&2; exit 1; } -- fi -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$RECODE_DIR/$RECODE_LIB -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ am_i_shared=$PHP_SESSION_SHARED -+ is_it_shared=$PHP_HASH_SHARED -+ is_it_enabled=$PHP_HASH -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension session to build statically, but it -+depends on extension hash, which you've configured to build shared. -+You either need to build session shared or build hash statically for the -+build to be successful. -+" 1>&2; exit 1; } - fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension session, which depends on extension hash, -+but you've either not enabled hash, or have disabled it. -+" 1>&2; exit 1; } - fi -- -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- 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" - -+ am_i_shared=$PHP_SESSION_SHARED -+ is_it_shared=$PHP_SPL_SHARED -+ is_it_enabled=$PHP_SPL -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension session to build statically, but it -+depends on extension spl, which you've configured to build shared. -+You either need to build session shared or build spl statically for the -+build to be successful. -+" 1>&2; exit 1; } - fi -- -- -- fi -- -- fi -- -- ;; -- esac -- done -- -- echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 --echo "configure:81038: checking for recode_format_table in -lrecode" >&5 --ac_lib_var=`echo recode'_'recode_format_table | 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="-lrecode $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 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- -- if test "$ext_shared" = "yes"; then -- RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" -- if test -n "$RECODE_DIR/$RECODE_LIB"; then -- -- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -- -- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_LIB -- else -- -- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension session, which depends on extension spl, -+but you've either not enabled spl, or have disabled it. -+" 1>&2; exit 1; } - fi -- -- -- if test "$ext_shared" = "yes"; then -- RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" -- else -- - - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD" -+ - -- 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 "$RECODE_DIR/$RECODE_LIB"; then -- -- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -- -- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_LIB -- else -- -- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -- fi -- -- -+ header_path=ext/session -+ for header_file in php_session.h mod_files.h mod_user.h; do -+ hp_hf="$header_path/$header_file" - - -+ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$INSTALLHEADERS$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 -- -- -+ eval "INSTALLHEADERS$unique=set" - -+ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" -+ - fi - -- fi -- -+ done - -- case recode in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lrecode $LIBS" -- ;; -- esac - -+ cat >> confdefs.h <<\EOF -+#define HAVE_PHP_SESSION 1 -+EOF - -+fi - -+if test "$PHP_MM" != "no"; then -+ for i in $PHP_MM /usr/local /usr; do -+ test -f "$i/include/mm.h" && MM_DIR=$i && break -+ done - -+ if test -z "$MM_DIR" ; then -+ { echo "configure: error: cannot find mm library" 1>&2; exit 1; } - fi -- -- - - --else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_recode_recode_format_table -- -- old_LDFLAGS=$LDFLAGS -- old_LIBS=$LIBS -- 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 -- rm -rf conftest* -- -- - - if test "$ext_shared" = "yes"; then -- RECODE_SHARED_LIBADD="-lrecode $RECODE_SHARED_LIBADD" -- if test -n "$RECODE_DIR/$RECODE_LIB"; then -+ SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD" -+ if test -n "$MM_DIR/$PHP_LIBDIR"; then - -- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -+ if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_LIB -+ if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$MM_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -+ ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then -- RECODE_SHARED_LIBADD="-L$ai_p $RECODE_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && RECODE_SHARED_LIBADD="$ld_runpath_switch$ai_p $RECODE_SHARED_LIBADD" -+ SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD" - else - - -@@ -81244,18 +84821,18 @@ if { (eval echo configure:81198: \"$ac_l - else - - -- if test -n "$RECODE_DIR/$RECODE_LIB"; then -+ if test -n "$MM_DIR/$PHP_LIBDIR"; then - -- if test "$RECODE_DIR/$RECODE_LIB" != "/usr/$PHP_LIBDIR" && test "$RECODE_DIR/$RECODE_LIB" != "/usr/lib"; then -+ if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$RECODE_DIR/$RECODE_LIB" || echo "$RECODE_DIR/$RECODE_LIB" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_LIB -+ if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$MM_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $RECODE_DIR/$RECODE_LIB|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_LIB\"`" -+ ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" - fi - - -@@ -81277,59 +84854,34 @@ if { (eval echo configure:81198: \"$ac_l - - - fi -- -- fi -- -- -- case recode in -- c|c_r|pthread*) ;; -- *) -- DLIBS="-lrecode $DLIBS" -- ;; -- esac -- -- -- -- -- fi -- -- -- cat >> confdefs.h <<\EOF --#define HAVE_BROKEN_RECODE 1 --EOF -- -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- -- { echo "configure: error: I cannot link librecode (-L$RECODE_DIR/$RECODE_LIB -lrecode). Is it installed?" 1>&2; exit 1; } -- --fi --rm -f conftest* -- LIBS=$old_LIBS -- LDFLAGS=$old_LDFLAGS -+ -+ fi - - --fi -+ case mm in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lmm $LIBS" -+ ;; -+ esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRECODE 1 --EOF -+ -+ -+ fi -+ - - -- if test "$RECODE_DIR/$RECODE_INC" != "/usr/include"; then -+ if test "$MM_DIR/include" != "/usr/include"; then - -- if test -z "$RECODE_DIR/$RECODE_INC" || echo "$RECODE_DIR/$RECODE_INC" | grep '^/' >/dev/null ; then -- ai_p=$RECODE_DIR/$RECODE_INC -+ if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$MM_DIR/include - else - -- ep_dir="`echo $RECODE_DIR/$RECODE_INC|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$RECODE_DIR/$RECODE_INC\"`" -+ ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`" - fi - - -@@ -81351,62 +84903,92 @@ EOF - fi - - -- PHP_VAR_SUBST="$PHP_VAR_SUBST RECODE_SHARED_LIBADD" -+ -+ for header_file in ext/session/mod_mm.h; do -+ -+ -+ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" -+ -+ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -+ -+ fi - -- for ac_hdr in stdbool.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:81361: 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 < -+ done -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBMM 1 - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:81371: \"$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* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* -+ - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 -+echo "configure:84934: 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" -+ PHP_SHMOP=$enableval - else -- echo "$ac_t""no" 1>&6 -+ -+ PHP_SHMOP=no -+ test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL -+ - fi --done -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SHMOP in -+shared,*) -+ PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SHMOP=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_SHMOP" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_SHMOP 1 -+EOF - - -- ext_builddir=ext/recode -- ext_srcdir=$abs_srcdir/ext/recode -+ ext_builddir=ext/shmop -+ ext_srcdir=$abs_srcdir/ext/shmop - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_RECODE_SHARED=no -+ PHP_SHMOP_SHARED=no - - -- case ext/recode in -+ case ext/shmop in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -81421,7 +85003,7 @@ done - - - old_IFS=$IFS -- for ac_src in recode.c; do -+ for ac_src in shmop.c; do - - IFS=. - set $ac_src -@@ -81444,18 +85026,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC recode" -+ EXT_STATIC="$EXT_STATIC shmop" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC recode" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_RECODE_SHARED=yes -+ PHP_SHMOP_SHARED=yes - -- case ext/recode in -+ case ext/shmop in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/recode"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/recode/"; ac_bdir="ext/recode/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -81470,14 +85052,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in recode.c; do -+ for ac_src in shmop.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_recode="$shared_objects_recode $ac_bdir$ac_obj.lo" -+ shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -81500,31 +85082,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phprecode.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phprecode.so '$ext_builddir'/phprecode.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpshmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpshmop.so '$ext_builddir'/phpshmop.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPRECODE, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_recode) $(PHPRECODE_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phprecode.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phprecode.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_recode" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <<\EOF --#define HAVE_REFLECTION 1 -+ -+php_enable_simplexml=yes -+ -+echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6 -+echo "configure:85278: checking whether to enable SimpleXML support" >&5 -+# Check whether --enable-simplexml or --disable-simplexml was given. -+if test "${enable_simplexml+set}" = set; then -+ enableval="$enable_simplexml" -+ PHP_SIMPLEXML=$enableval -+else -+ -+ PHP_SIMPLEXML=yes -+ test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SIMPLEXML in -+shared,*) -+ PHP_SIMPLEXML=`echo "$PHP_SIMPLEXML"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SIMPLEXML=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test -z "$PHP_LIBXML_DIR"; then -+ -+php_with_libxml_dir=no -+ -+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:85323: checking libxml2 install dir" >&5 -+# Check whether --with-libxml-dir or --without-libxml-dir was given. -+if test "${with_libxml_dir+set}" = set; then -+ withval="$with_libxml_dir" -+ PHP_LIBXML_DIR=$withval -+else -+ -+ PHP_LIBXML_DIR=no -+ -+ -+fi -+ -+ -+ext_output=$PHP_LIBXML_DIR -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+fi -+ -+if test "$PHP_SIMPLEXML" != "no"; then -+ -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi -+ -+ -+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:85351: checking for xml2-config path" >&5 -+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ for i in $PHP_LIBXML_DIR /usr/local /usr; do -+ if test -x "$i/bin/xml2-config"; then -+ ac_cv_php_xml2_config_path="$i/bin/xml2-config" -+ break -+ fi -+ done -+ -+fi -+ -+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -+ -+ if test -x "$ac_cv_php_xml2_config_path"; then -+ XML2_CONFIG="$ac_cv_php_xml2_config_path" -+ libxml_full_version=`$XML2_CONFIG --version` -+ ac_IFS=$IFS -+ IFS="." -+ set $libxml_full_version -+ IFS=$ac_IFS -+ LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -+ if test "$LIBXML_VERSION" -ge "2006011"; then -+ LIBXML_LIBS=`$XML2_CONFIG --libs` -+ LIBXML_INCS=`$XML2_CONFIG --cflags` -+ -+ for ac_i in $LIBXML_LIBS; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_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 -+ -+ ;; -+ esac -+ done -+ -+ -+ for ac_i in $LIBXML_INCS; do -+ case $ac_i in -+ -I*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/include"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ ;; -+ esac -+ done -+ -+ -+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:85509: checking whether libxml build works" >&5 -+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ -+ old_LIBS=$LIBS -+ LIBS=" -+ $SIMPLEXML_SHARED_LIBADD -+ $LIBS" -+ if test "$cross_compiling" = yes; then -+ -+ LIBS=$old_LIBS -+ -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=yes -+ -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ LIBS=$old_LIBS -+ -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ -+ -+fi -+rm -fr conftest* -+fi -+ -+ -+ -+fi -+ -+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -+ if test "$php_cv_libxml_build_works" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBXML 1 - EOF - -+ fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_SIMPLEXML 1 -+EOF - -- ext_builddir=ext/reflection -- ext_srcdir=$abs_srcdir/ext/reflection -+ -+ ext_builddir=ext/simplexml -+ ext_srcdir=$abs_srcdir/ext/simplexml - - ac_extra= - -- if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then -- PHP_REFLECTION_SHARED=no -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SIMPLEXML_SHARED=no - - -- case ext/reflection in -+ case ext/simplexml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -81720,7 +85599,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in php_reflection.c; do -+ for ac_src in simplexml.c sxe.c; do - - IFS=. - set $ac_src -@@ -81743,18 +85622,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC reflection" -- if test "no" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC reflection" -+ EXT_STATIC="$EXT_STATIC simplexml" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml" - fi - else -- if test "no" = "shared" || test "no" = "yes"; then -- PHP_REFLECTION_SHARED=yes -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_SIMPLEXML_SHARED=yes - -- case ext/reflection in -+ case ext/simplexml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/reflection"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/reflection/"; ac_bdir="ext/reflection/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -81769,14 +85648,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in php_reflection.c; do -+ for ac_src in simplexml.c sxe.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_reflection="$shared_objects_reflection $ac_bdir$ac_obj.lo" -+ shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -81799,31 +85678,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpreflection.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpreflection.so '$ext_builddir'/phpreflection.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsimplexml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsimplexml.so '$ext_builddir'/phpsimplexml.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPREFLECTION, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSIMPLEXML, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_reflection) $(PHPREFLECTION_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpreflection.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsimplexml.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpreflection.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_reflection" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -+ -+ fi -+ -+ -+ am_i_shared=$PHP_SIMPLEXML_SHARED -+ is_it_shared=$PHP_LIBXML_SHARED -+ is_it_enabled=$PHP_LIBXML -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension simplexml to build statically, but it -+depends on extension libxml, which you've configured to build shared. -+You either need to build simplexml shared or build libxml statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension simplexml, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ am_i_shared=$PHP_SIMPLEXML_SHARED -+ is_it_shared=$PHP_SPL_SHARED -+ is_it_enabled=$PHP_SPL -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension simplexml to build statically, but it -+depends on extension spl, which you've configured to build shared. -+You either need to build simplexml shared or build spl statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension simplexml, which depends on extension spl, -+but you've either not enabled spl, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+fi -+ -+ -+ -+php_with_snmp=no -+ -+echo $ac_n "checking for SNMP support""... $ac_c" 1>&6 -+echo "configure:85924: checking for SNMP support" >&5 -+# Check whether --with-snmp or --without-snmp was given. -+if test "${with_snmp+set}" = set; then -+ withval="$with_snmp" -+ PHP_SNMP=$withval -+else -+ -+ PHP_SNMP=no -+ test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SNMP in -+shared,*) -+ PHP_SNMP=`echo "$PHP_SNMP"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SNMP=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_with_openssl_dir=no -+ -+echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 -+echo "configure:85968: checking OpenSSL dir for SNMP" >&5 -+# Check whether --with-openssl-dir or --without-openssl-dir was given. -+if test "${with_openssl_dir+set}" = set; then -+ withval="$with_openssl_dir" -+ PHP_OPENSSL_DIR=$withval -+else -+ -+ PHP_OPENSSL_DIR=no -+ -+ -+fi -+ -+ -+ext_output=$PHP_OPENSSL_DIR -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_enable_ucd_snmp_hack=no -+ -+echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 -+echo "configure:85991: 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" -+ PHP_UCD_SNMP_HACK=$enableval -+else -+ -+ PHP_UCD_SNMP_HACK=no -+ -+ -+fi -+ -+ -+ext_output=$PHP_UCD_SNMP_HACK -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_SNMP" != "no"; then -+ -+ if test "$PHP_SNMP" = "yes"; then -+ # Extract the first word of "net-snmp-config", so it can be a program name with args. -+set dummy net-snmp-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:86016: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ case "$SNMP_CONFIG" in -+ /*) -+ ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path. -+ ;; -+ ?:/*) -+ ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path. -+ ;; -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="/usr/local/bin:$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ ;; -+esac -+fi -+SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG" -+if test -n "$SNMP_CONFIG"; then -+ echo "$ac_t""$SNMP_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ else -+ SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config" -+ fi -+ -+ if test -x "$SNMP_CONFIG"; then -+ SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs` -+ SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`" -+ SNMP_PREFIX=`$SNMP_CONFIG --prefix` -+ -+ if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then -+ -+ if test "${SNMP_PREFIX}/include" != "/usr/include"; then -+ -+ if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then -+ ai_p=${SNMP_PREFIX}/include -+ else -+ -+ ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ -+ for ac_i in $SNMP_LIBS; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_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 -+ -+ ;; -+ esac -+ done -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_NET_SNMP 1 -+EOF -+ -+ SNMP_LIBNAME=netsnmp -+ else -+ { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; } -+ fi -+ else -+ -+ -+ if test "$PHP_SNMP" = "yes"; then -+ for i in /usr/include /usr/local/include; do -+ test -f $i/snmp.h && SNMP_INCDIR=$i -+ test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp -+ test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp -+ test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp -+ done -+ for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do -+ test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i -+ done -+ else -+ SNMP_INCDIR=$PHP_SNMP/include -+ test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp -+ SNMP_LIBDIR=$PHP_SNMP/lib -+ fi -+ -+ if test -z "$SNMP_INCDIR"; then -+ { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; } -+ elif test -z "$SNMP_LIBDIR"; then -+ { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; } -+ fi -+ -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$SNMP_INCDIR -+ for ac_hdr in default_store.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:86217: 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:86227: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+ if test "$ac_cv_header_default_store_h" = "yes"; then -+ echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6 -+echo "configure:86255: checking for OpenSSL support in SNMP libraries" >&5 -+ cat > conftest.$ac_ext < -+#if USE_OPENSSL -+ yes -+#endif - -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects<&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ rm -rf conftest* - -+ SNMP_SSL=yes -+ -+else -+ rm -rf conftest* - -- BUILD_DIR="$BUILD_DIR $ext_builddir" -+ SNMP_SSL=no -+ -+fi -+rm -f conftest* -+ -+ fi -+ CPPFLAGS=$old_CPPFLAGS -+ echo "$ac_t""$SNMP_SSL" 1>&6 - -+ if test "$SNMP_SSL" = "yes"; then -+ if test "$PHP_OPENSSL_DIR" != "no"; then -+ PHP_OPENSSL=$PHP_OPENSSL_DIR -+ fi -+ -+ if test "$PHP_OPENSSL" = "no"; then -+ { echo "configure: error: The UCD-SNMP in this system is built with SSL support. - -+ Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; } -+ else -+ -+ found_openssl=no -+ unset OPENSSL_INCDIR -+ unset OPENSSL_LIBDIR - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=reflection -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ test -z "$PHP_OPENSSL" && PHP_OPENSSL=no -+ test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no - -+ if test "$PHP_OPENSSL" != "no"; then -+ PHP_OPENSSL_DIR=$PHP_OPENSSL -+ elif test "$PHP_IMAP_SSL" != "no"; then -+ PHP_OPENSSL_DIR=$PHP_IMAP_SSL - fi - -- -- -- --php_enable_session=yes -- --echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6 --echo "configure:81994: checking whether to enable PHP sessions" >&5 --# Check whether --enable-session or --disable-session was given. --if test "${enable_session+set}" = set; then -- enableval="$enable_session" -- PHP_SESSION=$enableval -+ if test -z "$PKG_CONFIG"; then -+ # Extract the first word of "pkg-config", so it can be a program name with args. -+set dummy pkg-config; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:86312: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else -- -- PHP_SESSION=yes -- test "$PHP_ENABLE_ALL" && PHP_SESSION=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_SESSION in --shared,*) -- PHP_SESSION=`echo "$PHP_SESSION"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SESSION=yes -+ case "$PKG_CONFIG" in -+ /*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. - ;; --no) -- ext_output=no -- ext_shared=no -+ ?:/*) -+ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. - ;; --*) -- ext_output=yes -- ext_shared=no -+ *) -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" - ;; - esac -+fi -+PKG_CONFIG="$ac_cv_path_PKG_CONFIG" -+if test -n "$PKG_CONFIG"; then -+ echo "$ac_t""$PKG_CONFIG" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi - -+ fi - -+ if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then -+ if $PKG_CONFIG --atleast-version=0.9.6 openssl; then -+ found_openssl=yes -+ OPENSSL_LIBS=`$PKG_CONFIG --libs openssl` -+ OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` -+ OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` -+ else -+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } -+ fi - --echo "$ac_t""$ext_output" 1>&6 -+ if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then -+ -+ for ac_i in $OPENSSL_LIBS; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - - -+ fi -+ ;; -+ esac - - --php_with_mm=no -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - --echo $ac_n "checking for mm support""... $ac_c" 1>&6 --echo "configure:82038: checking for mm support" >&5 --# Check whether --with-mm or --without-mm was given. --if test "${with_mm+set}" = set; then -- withval="$with_mm" -- PHP_MM=$withval --else -+ -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" -+ else -+ - -- PHP_MM=no - -+ 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 -- -- --ext_output=$PHP_MM --echo "$ac_t""$ext_output" 1>&6 - -+ fi -+ -+ fi - -+ ;; -+ esac -+ done - -+ -+ for ac_i in $OPENSSL_INCS; do -+ case $ac_i in -+ -I*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/include"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - --if test "$PHP_SESSION" != "no"; then -- -- echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 --echo "configure:82060: checking whether pwrite works" >&5 --if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- - -- if test "$cross_compiling" = yes; then - -- ac_cv_pwrite=no -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - --else -- cat > conftest.$ac_ext < --#include --#include --#include --#include -+ fi - -- main() { -- int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); -+ ;; -+ esac -+ done - -- if (fd < 0) exit(1); -- if (pwrite(fd, "text", 4, 0) != 4) exit(1); -- /* Linux glibc breakage until 2.2.5 */ -- if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); -- exit(0); -- } -+ fi -+ fi - -+ if test "$found_openssl" = "no"; then - -+ if test "$PHP_OPENSSL_DIR" = "yes"; then -+ PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" -+ fi -+ -+ for i in $PHP_OPENSSL_DIR; do -+ if test -r $i/include/openssl/evp.h; then -+ OPENSSL_INCDIR=$i/include -+ fi -+ if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then -+ OPENSSL_LIBDIR=$i/$PHP_LIBDIR -+ fi -+ test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break -+ done -+ -+ if test -z "$OPENSSL_INCDIR"; then -+ { echo "configure: error: Cannot find OpenSSL's " 1>&2; exit 1; } -+ fi -+ -+ if test -z "$OPENSSL_LIBDIR"; then -+ { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } -+ fi -+ -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=-I$OPENSSL_INCDIR -+ echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 -+echo "configure:86517: checking for OpenSSL version" >&5 -+ cat > conftest.$ac_ext < -+#if OPENSSL_VERSION_NUMBER >= 0x0090600fL -+ yes -+#endif -+ - EOF --if { (eval echo configure:82093: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_pwrite=yes -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ rm -rf conftest* - -+ echo "$ac_t"">= 0.9.6" 1>&6 -+ - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_pwrite=no -+ rm -rf conftest* - -+ { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } -+ - fi --rm -fr conftest* --fi -+rm -f conftest* - -+ CPPFLAGS=$old_CPPFLAGS - -- if test "$ac_cv_pwrite" = "no"; then -- -- if test "$cross_compiling" = yes; then -+ -+ if test "$OPENSSL_INCDIR" != "/usr/include"; then -+ -+ if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$OPENSSL_INCDIR -+ else -+ -+ ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" -+ fi -+ -+ - -- ac_cv_pwrite=no -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - --else -- cat > conftest.$ac_ext < --#include --#include --#include --#include --ssize_t pwrite(int, void *, size_t, off64_t); -- main() { -- int fd = open("conftest_in", O_WRONLY|O_CREAT, 0600); -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - -- if (fd < 0) exit(1); -- if (pwrite(fd, "text", 4, 0) != 4) exit(1); -- /* Linux glibc breakage until 2.2.5 */ -- if (pwrite(fd, "text", 4, -1) != -1 || errno != EINVAL) exit(1); -- exit(0); -- } -+ fi - - --EOF --if { (eval echo configure:82139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$OPENSSL_LIBDIR -+ " - -- ac_cv_pwrite=yes -+ save_ext_shared=$ext_shared -+ ext_shared=yes - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ - -- ac_cv_pwrite=no -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - --fi --rm -fr conftest* --fi -- -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -- if test "$ac_cv_pwrite" = "yes"; then -- ac_cv_pwrite=64 - fi -- fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - --fi -- --echo "$ac_t""$ac_cv_pwrite" 1>&6 -- -- if test "$ac_cv_pwrite" != "no"; then -- cat >> confdefs.h <<\EOF --#define HAVE_PWRITE 1 --EOF -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - -- if test "$ac_cv_pwrite" = "64"; then -- cat >> confdefs.h <<\EOF --#define PHP_PWRITE_64 1 --EOF - - fi -- fi -- -- -- echo $ac_n "checking whether pread works""... $ac_c" 1>&6 --echo "configure:82180: checking whether pread works" >&5 --if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- -- echo test > conftest_in -- if test "$cross_compiling" = yes; then -- -- ac_cv_pread=no -- --else -- cat > conftest.$ac_ext < --#include --#include --#include --#include - -- main() { -- char buf[3]; -- int fd = open("conftest_in", O_RDONLY); -- if (fd < 0) exit(1); -- if (pread(fd, buf, 2, 0) != 2) exit(1); -- /* Linux glibc breakage until 2.2.5 */ -- if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); -- exit(0); -- } -- --EOF --if { (eval echo configure:82213: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - -- ac_cv_pread=yes - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- ac_cv_pread=no -+ 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 --rm -fr conftest* --fi -+ fi - -- rm -f conftest_in - -- if test "$ac_cv_pread" = "no"; then -- -- echo test > conftest_in -- if test "$cross_compiling" = yes; then -- -- ac_cv_pread=no -- -+ fi -+ -+ fi -+ -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 -+echo "configure:86674: 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 - else -- cat > conftest.$ac_ext < conftest.$ac_ext < --#include --#include --#include --#include --ssize_t pread(int, void *, size_t, off64_t); -- main() { -- char buf[3]; -- int fd = open("conftest_in", O_RDONLY); -- if (fd < 0) exit(1); -- if (pread(fd, buf, 2, 0) != 2) exit(1); -- /* Linux glibc breakage until 2.2.5 */ -- if (pread(fd, buf, 2, -1) != -1 || errno != EINVAL) exit(1); -- exit(0); -- } -- -+int main() { -+CRYPTO_free() -+; return 0; } - EOF --if { (eval echo configure:82260: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_pread=yes -- -+if { (eval echo configure:86693: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_pread=no -- --fi --rm -fr conftest* -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" - fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - -- rm -f conftest_in -- -- if test "$ac_cv_pread" = "yes"; then -- ac_cv_pread=64 -- fi -- fi -- - fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ -+ case crypto in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" -+ else -+ -+ -+ case crypto in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lcrypto $LIBS" -+ ;; -+ esac - --echo "$ac_t""$ac_cv_pread" 1>&6 - -- if test "$ac_cv_pread" != "no"; then -- cat >> confdefs.h <<\EOF --#define HAVE_PREAD 1 --EOF -+ fi -+ ;; -+ esac - -- if test "$ac_cv_pread" = "64"; then -- cat >> confdefs.h <<\EOF --#define PHP_PREAD_64 1 --EOF - -- fi -- fi -+ -+ -+else -+ echo "$ac_t""no" 1>&6 - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_crypto_CRYPTO_free -+ -+ { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } -+ - -- ext_builddir=ext/session -- ext_srcdir=$abs_srcdir/ext/session -+fi - -- ac_extra= - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SESSION_SHARED=no -+ old_LIBS=$LIBS -+ LIBS="$LIBS -lcrypto" - -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$OPENSSL_LIBDIR -+ " - -- case ext/session in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ save_ext_shared=$ext_shared -+ ext_shared=yes - -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ - -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects<>Makefile.objects</dev/null ; then -+ ai_p=$ac_ii - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsession.$suffix" -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_session" -- -- cat >>Makefile.objects<>Makefile.objects<&6 -+echo "configure:86850: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lssl $LIBS" -+cat > conftest.$ac_ext <> confdefs.h <&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 -- fi -- -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SESSION_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -- -- case ext/session in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/session"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/session/"; ac_bdir="ext/session/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ found_openssl=yes -+ - -+else -+ echo "$ac_t""no" 1>&6 - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version -+ -+ { echo "configure: error: libssl not found!" 1>&2; exit 1; } -+ -+ -+fi - -- old_IFS=$IFS -- for ac_src in session.c mod_files.c mod_mm.c mod_user.c; do -+ LIBS=$old_LIBS -+ - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -+ case ssl in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD" -+ else - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects<>Makefile.objects</dev/null ; then -+ ai_p=$OPENSSL_LIBDIR -+ else -+ -+ ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" - fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" -+ else -+ - - -- BUILD_DIR="$BUILD_DIR $ext_builddir" -+ 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 - - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=session -+ fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- - fi - -- -- am_i_shared=$PHP_SESSION_SHARED -- is_it_shared=$PHP_HASH_SHARED -- is_it_enabled=$PHP_HASH -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension session to build statically, but it --depends on extension hash, which you've configured to build shared. --You either need to build session shared or build hash statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension session, which depends on extension hash, --but you've either not enabled hash, or have disabled it. --" 1>&2; exit 1; } - fi -+ -+ if test "$found_openssl" = "yes"; then -+ OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR - -- -- am_i_shared=$PHP_SESSION_SHARED -- is_it_shared=$PHP_SPL_SHARED -- is_it_enabled=$PHP_SPL -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension session to build statically, but it --depends on extension spl, which you've configured to build shared. --You either need to build session shared or build spl statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -- { echo "configure: error: --You've configured extension session, which depends on extension spl, --but you've either not enabled spl, or have disabled it. --" 1>&2; exit 1; } -+ -+: -+else -+ { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; } -+ - fi -- -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST SESSION_SHARED_LIBADD" - -+ fi -+ fi -+ -+ echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 -+echo "configure:87005: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lkstat $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 -+ - -- -- header_path=ext/session -- for header_file in php_session.h mod_files.h mod_user.h; do -- hp_hf="$header_path/$header_file" -+ case kstat in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" -+ else - - -- unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INSTALLHEADERS$unique=set" -- -- INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" -- -- fi -+ case kstat in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lkstat $LIBS" -+ ;; -+ esac - -- done -- - -- cat >> confdefs.h <<\EOF --#define HAVE_PHP_SESSION 1 --EOF -+ fi -+ ;; -+ esac - -+ -+else -+ echo "$ac_t""no" 1>&6 - fi - --if test "$PHP_MM" != "no"; then -- for i in $PHP_MM /usr/local /usr; do -- test -f "$i/include/mm.h" && MM_DIR=$i && break -- done -- -- if test -z "$MM_DIR" ; then -- { echo "configure: error: cannot find mm library" 1>&2; exit 1; } -+ -+ if test "$SNMP_INCDIR" != "/usr/include"; then -+ -+ if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SNMP_INCDIR -+ else -+ -+ ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`" - fi -+ -+ - -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ - - if test "$ext_shared" = "yes"; then -- SESSION_SHARED_LIBADD="-lmm $SESSION_SHARED_LIBADD" -- if test -n "$MM_DIR/$PHP_LIBDIR"; then -+ SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD" -+ if test -n "$SNMP_LIBDIR"; then - -- if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then - -- if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$MM_DIR/$PHP_LIBDIR -+ if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SNMP_LIBDIR - else - -- ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then -- SESSION_SHARED_LIBADD="-L$ai_p $SESSION_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SESSION_SHARED_LIBADD="$ld_runpath_switch$ai_p $SESSION_SHARED_LIBADD" -+ SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" - else - - -@@ -82711,18 +87140,18 @@ if test "$PHP_MM" != "no"; then - else - - -- if test -n "$MM_DIR/$PHP_LIBDIR"; then -+ if test -n "$SNMP_LIBDIR"; then - -- if test "$MM_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MM_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then - -- if test -z "$MM_DIR/$PHP_LIBDIR" || echo "$MM_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$MM_DIR/$PHP_LIBDIR -+ if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SNMP_LIBDIR - else - -- ep_dir="`echo $MM_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$MM_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" - fi - - -@@ -82748,10 +87177,10 @@ if test "$PHP_MM" != "no"; then - fi - - -- case mm in -+ case snmp in - c|c_r|pthread*) ;; - *) -- LIBS="-lmm $LIBS" -+ LIBS="-lsnmp $LIBS" - ;; - esac - -@@ -82761,124 +87190,338 @@ if test "$PHP_MM" != "no"; then - fi - - -+ SNMP_LIBNAME=snmp -+ fi -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ $SNMP_SHARED_LIBADD -+ " - -- if test "$MM_DIR/include" != "/usr/include"; then -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then - -- if test -z "$MM_DIR/include" || echo "$MM_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$MM_DIR/include -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -- ep_dir="`echo $MM_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$MM_DIR/include\"`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - - -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ -+ - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -+ eval "LIBPATH$unique=set" - -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -+ 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 - -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -+echo "configure:87295: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 -+ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | 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="-l$SNMP_LIBNAME $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_SNMP_PARSE_OID 1 -+EOF -+ -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid -+ -+ -+fi -+ -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ $SNMP_SHARED_LIBADD -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ - -- for header_file in ext/session/mod_mm.h; do -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` - -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - -- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ 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 "INSTALLHEADERS$unique=set" -+ eval "LIBPATH$unique=set" - -- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -- -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ - fi - -- done -- - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBMM 1 --EOF -+ fi -+ -+ fi -+ -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 -+echo "configure:87448: checking for init_snmp in -l$SNMP_LIBNAME" >&5 -+ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | 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="-l$SNMP_LIBNAME $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_SNMP 1 -+EOF - --php_enable_shmop=no -- --echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 --echo "configure:82824: 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" -- PHP_SHMOP=$enableval --else - -- PHP_SHMOP=no -- test "$PHP_ENABLE_ALL" && PHP_SHMOP=$PHP_ENABLE_ALL -+ -+else -+ echo "$ac_t""no" 1>&6 - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_$SNMP_LIBNAME_init_snmp -+ -+ { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; } -+ -+ - fi - - -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_SHMOP in --shared,*) -- PHP_SHMOP=`echo "$PHP_SHMOP"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SHMOP=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_SHMOP" != "no"; then -- cat >> confdefs.h <<\EOF --#define HAVE_SHMOP 1 -+ if test "$PHP_UCD_SNMP_HACK" = "yes" ; then -+ cat >> confdefs.h <<\EOF -+#define UCD_SNMP_HACK 1 - EOF - -+ fi - -- ext_builddir=ext/shmop -- ext_srcdir=$abs_srcdir/ext/shmop -+ -+ ext_builddir=ext/snmp -+ ext_srcdir=$abs_srcdir/ext/snmp - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SHMOP_SHARED=no -+ PHP_SNMP_SHARED=no - - -- case ext/shmop in -+ case ext/snmp in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -82893,7 +87536,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in shmop.c; do -+ for ac_src in snmp.c; do - - IFS=. - set $ac_src -@@ -82916,18 +87559,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC shmop" -+ EXT_STATIC="$EXT_STATIC snmp" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC shmop" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC snmp" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SHMOP_SHARED=yes -+ PHP_SNMP_SHARED=yes - -- case ext/shmop in -+ case ext/snmp in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/shmop"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/shmop/"; ac_bdir="ext/shmop/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -82942,14 +87585,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in shmop.c; do -+ for ac_src in snmp.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_shmop="$shared_objects_shmop $ac_bdir$ac_obj.lo" -+ shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -82972,31 +87615,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpshmop.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpshmop.so '$ext_builddir'/phpshmop.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsnmp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsnmp.so '$ext_builddir'/phpsnmp.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSHMOP, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_shmop) $(PHPSHMOP_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpshmop.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsnmp.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpshmop.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_shmop" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 --echo "configure:83168: checking whether to enable SimpleXML support" >&5 --# Check whether --enable-simplexml or --disable-simplexml was given. --if test "${enable_simplexml+set}" = set; then -- enableval="$enable_simplexml" -- PHP_SIMPLEXML=$enableval -+echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 -+echo "configure:87814: checking whether to enable SOAP support" >&5 -+# Check whether --enable-soap or --disable-soap was given. -+if test "${enable_soap+set}" = set; then -+ enableval="$enable_soap" -+ PHP_SOAP=$enableval - else - -- PHP_SIMPLEXML=yes -- test "$PHP_ENABLE_ALL" && PHP_SIMPLEXML=$PHP_ENABLE_ALL -+ PHP_SOAP=no -+ test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL - - fi - -@@ -83180,12 +87826,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_SIMPLEXML in -+case $PHP_SOAP in - shared,*) -- PHP_SIMPLEXML=`echo "$PHP_SIMPLEXML"|$SED 's/^shared,//'` -+ PHP_SOAP=`echo "$PHP_SOAP"|$SED 's/^shared,//'` - ;; - shared) -- PHP_SIMPLEXML=yes -+ PHP_SOAP=yes - ;; - no) - ext_output=no -@@ -83209,7 +87855,7 @@ if test -z "$PHP_LIBXML_DIR"; then - php_with_libxml_dir=no - - echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:83213: checking libxml2 install dir" >&5 -+echo "configure:87859: checking libxml2 install dir" >&5 - # Check whether --with-libxml-dir or --without-libxml-dir was given. - if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" -@@ -83229,15 +87875,15 @@ echo "$ac_t""$ext_output" 1>&6 - - fi - --if test "$PHP_SIMPLEXML" != "no"; then -+if test "$PHP_SOAP" != "no"; then - - if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: SimpleXML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi - - - echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:83241: checking for xml2-config path" >&5 -+echo "configure:87887: checking for xml2-config path" >&5 - if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -83269,7 +87915,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -pthread" -+ SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread" - else - - -@@ -83291,7 +87937,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- SIMPLEXML_SHARED_LIBADD="$SIMPLEXML_SHARED_LIBADD -l$ac_ii" -+ SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" - else - - -@@ -83326,8 +87972,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - - if test "$ext_shared" = "yes"; then -- SIMPLEXML_SHARED_LIBADD="-L$ai_p $SIMPLEXML_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SIMPLEXML_SHARED_LIBADD="$ld_runpath_switch$ai_p $SIMPLEXML_SHARED_LIBADD" -+ SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD" - else - - -@@ -83395,7 +88041,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:83399: checking whether libxml build works" >&5 -+echo "configure:88045: checking whether libxml build works" >&5 - if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -83403,7 +88049,7 @@ else - - old_LIBS=$LIBS - LIBS=" -- $SIMPLEXML_SHARED_LIBADD -+ $SOAP_SHARED_LIBADD - $LIBS" - if test "$cross_compiling" = yes; then - -@@ -83411,7 +88057,7 @@ else - - 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:88072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBS=$old_LIBS -@@ -83458,23 +88104,23 @@ EOF - fi - - cat >> confdefs.h <<\EOF --#define HAVE_SIMPLEXML 1 -+#define HAVE_SOAP 1 - EOF - - -- ext_builddir=ext/simplexml -- ext_srcdir=$abs_srcdir/ext/simplexml -+ ext_builddir=ext/soap -+ ext_srcdir=$abs_srcdir/ext/soap - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SIMPLEXML_SHARED=no -+ PHP_SOAP_SHARED=no - - -- case ext/simplexml in -+ case ext/soap in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -83489,7 +88135,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in simplexml.c sxe.c; do -+ for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do - - IFS=. - set $ac_src -@@ -83512,18 +88158,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC simplexml" -+ EXT_STATIC="$EXT_STATIC soap" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC simplexml" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC soap" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SIMPLEXML_SHARED=yes -+ PHP_SOAP_SHARED=yes - -- case ext/simplexml in -+ case ext/soap in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/simplexml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/simplexml/"; ac_bdir="ext/simplexml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -83538,14 +88184,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in simplexml.c sxe.c; do -+ for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_simplexml="$shared_objects_simplexml $ac_bdir$ac_obj.lo" -+ shared_objects_soap="$shared_objects_soap $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -83568,31 +88214,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsimplexml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsimplexml.so '$ext_builddir'/phpsimplexml.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsoap.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(PHPSOAP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsoap.so '$ext_builddir'/phpsoap.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSIMPLEXML, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSOAP, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_simplexml) $(PHPSIMPLEXML_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(PHPSOAP_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsimplexml.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsimplexml.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_simplexml" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -- -- fi -- -- -- am_i_shared=$PHP_SIMPLEXML_SHARED -- is_it_shared=$PHP_LIBXML_SHARED -- is_it_enabled=$PHP_LIBXML -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension simplexml to build statically, but it --depends on extension libxml, which you've configured to build shared. --You either need to build simplexml shared or build libxml statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -- { echo "configure: error: --You've configured extension simplexml, which depends on extension libxml, --but you've either not enabled libxml, or have disabled it. --" 1>&2; exit 1; } -- fi -- -- -- am_i_shared=$PHP_SIMPLEXML_SHARED -- is_it_shared=$PHP_SPL_SHARED -- is_it_enabled=$PHP_SPL -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension simplexml to build statically, but it --depends on extension spl, which you've configured to build shared. --You either need to build simplexml shared or build spl statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension simplexml, which depends on extension spl, --but you've either not enabled spl, or have disabled it. --" 1>&2; exit 1; } -- fi -- --fi -- -- -- --php_with_snmp=no -- --echo $ac_n "checking for SNMP support""... $ac_c" 1>&6 --echo "configure:83814: checking for SNMP support" >&5 --# Check whether --with-snmp or --without-snmp was given. --if test "${with_snmp+set}" = set; then -- withval="$with_snmp" -- PHP_SNMP=$withval --else -- -- PHP_SNMP=no -- test "$PHP_ENABLE_ALL" && PHP_SNMP=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_SNMP in --shared,*) -- PHP_SNMP=`echo "$PHP_SNMP"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SNMP=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- -- --php_with_openssl_dir=no -- --echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 --echo "configure:83858: checking OpenSSL dir for SNMP" >&5 --# Check whether --with-openssl-dir or --without-openssl-dir was given. --if test "${with_openssl_dir+set}" = set; then -- withval="$with_openssl_dir" -- PHP_OPENSSL_DIR=$withval --else -- -- PHP_OPENSSL_DIR=no -- -- --fi -- -- --ext_output=$PHP_OPENSSL_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- -- --php_enable_ucd_snmp_hack=no -- --echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 --echo "configure:83881: 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" -- PHP_UCD_SNMP_HACK=$enableval --else -- -- PHP_UCD_SNMP_HACK=no -- -- --fi -- -- --ext_output=$PHP_UCD_SNMP_HACK --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_SNMP" != "no"; then -- -- if test "$PHP_SNMP" = "yes"; then -- # Extract the first word of "net-snmp-config", so it can be a program name with args. --set dummy net-snmp-config; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:83906: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- case "$SNMP_CONFIG" in -- /*) -- ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a path. -- ;; -- ?:/*) -- ac_cv_path_SNMP_CONFIG="$SNMP_CONFIG" # Let the user override the test with a dos path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="/usr/local/bin:$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_path_SNMP_CONFIG="$ac_dir/$ac_word" -- break -- fi -- done -- IFS="$ac_save_ifs" -- ;; --esac --fi --SNMP_CONFIG="$ac_cv_path_SNMP_CONFIG" --if test -n "$SNMP_CONFIG"; then -- echo "$ac_t""$SNMP_CONFIG" 1>&6 --else -- echo "$ac_t""no" 1>&6 --fi -- -- else -- SNMP_CONFIG="$PHP_SNMP/bin/net-snmp-config" -- fi -- -- if test -x "$SNMP_CONFIG"; then -- SNMP_LIBS=`$SNMP_CONFIG --netsnmp-libs` -- SNMP_LIBS="$SNMP_LIBS `$SNMP_CONFIG --external-libs`" -- SNMP_PREFIX=`$SNMP_CONFIG --prefix` -- -- if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then -- -- if test "${SNMP_PREFIX}/include" != "/usr/include"; then -- -- if test -z "${SNMP_PREFIX}/include" || echo "${SNMP_PREFIX}/include" | grep '^/' >/dev/null ; then -- ai_p=${SNMP_PREFIX}/include -- else -- -- ep_dir="`echo $SNMP_PREFIX/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"${SNMP_PREFIX}/include\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -+ -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=soap - -- fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - - fi - -- -- for ac_i in $SNMP_LIBS; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SOAP_SHARED_LIBADD" - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -l$ac_ii" - else -- -+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -+ fi - -+fi - -- fi -- ;; -- esac - - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+php_enable_sockets=no - -- -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" -- else -- -- -+echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 -+echo "configure:88422: 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" -+ PHP_SOCKETS=$enableval -+else - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ PHP_SOCKETS=no -+ test "$PHP_ENABLE_ALL" && PHP_SOCKETS=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SOCKETS in -+shared,*) -+ PHP_SOCKETS=`echo "$PHP_SOCKETS"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SOCKETS=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_SOCKETS" != "no"; then -+ echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 -+echo "configure:88464: checking for struct cmsghdr" >&5 -+if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -- 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" -+ cat > conftest.$ac_ext < -+#include -+int main() { -+struct cmsghdr s; s -+; return 0; } -+EOF -+if { (eval echo configure:88479: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_cmsghdr=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_cmsghdr=no -+fi -+rm -f conftest* - -- fi -+fi - -+echo "$ac_t""$ac_cv_cmsghdr" 1>&6 - -- fi -- -- fi -+ if test "$ac_cv_cmsghdr" = yes; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_CMSGHDR 1 -+EOF - -- ;; -- esac -- done -+ fi - -- cat >> confdefs.h <<\EOF --#define HAVE_NET_SNMP 1 --EOF -+ for ac_func in hstrerror socketpair -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:88504: 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 < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); - -- SNMP_LIBNAME=netsnmp -- else -- { echo "configure: error: Could not find the required paths. Please check your net-snmp installation." 1>&2; exit 1; } -- fi -- else -+int main() { - -- -- if test "$PHP_SNMP" = "yes"; then -- for i in /usr/include /usr/local/include; do -- test -f $i/snmp.h && SNMP_INCDIR=$i -- test -f $i/ucd-snmp/snmp.h && SNMP_INCDIR=$i/ucd-snmp -- test -f $i/snmp/snmp.h && SNMP_INCDIR=$i/snmp -- test -f $i/snmp/include/ucd-snmp/snmp.h && SNMP_INCDIR=$i/snmp/include/ucd-snmp -- done -- for i in /usr/$PHP_LIBDIR /usr/snmp/lib /usr/local/$PHP_LIBDIR /usr/local/lib /usr/local/snmp/lib; do -- test -f $i/libsnmp.a || test -f $i/libsnmp.$SHLIB_SUFFIX_NAME && SNMP_LIBDIR=$i -- done -- else -- SNMP_INCDIR=$PHP_SNMP/include -- test -d $PHP_SNMP/include/ucd-snmp && SNMP_INCDIR=$PHP_SNMP/include/ucd-snmp -- SNMP_LIBDIR=$PHP_SNMP/lib -- fi -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif - -- if test -z "$SNMP_INCDIR"; then -- { echo "configure: error: snmp.h not found. Check your SNMP installation." 1>&2; exit 1; } -- elif test -z "$SNMP_LIBDIR"; then -- { echo "configure: error: libsnmp not found. Check your SNMP installation." 1>&2; exit 1; } -- fi -+; return 0; } -+EOF -+if { (eval echo configure:88532: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi - -- old_CPPFLAGS=$CPPFLAGS -- CPPFLAGS=-I$SNMP_INCDIR -- for ac_hdr in default_store.h -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+ for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:84107: checking for $ac_hdr" >&5 -+echo "configure:88560: 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:84117: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:88570: \"$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* -@@ -84139,955 +88592,865 @@ else - fi - done - -- if test "$ac_cv_header_default_store_h" = "yes"; then -- echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6 --echo "configure:84145: checking for OpenSSL support in SNMP libraries" >&5 -- cat > conftest.$ac_ext < conftest.$ac_ext < --#if USE_OPENSSL -- yes --#endif -- --EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "yes" >/dev/null 2>&1; then -- rm -rf conftest* -+#include -+#include - -- SNMP_SSL=yes -- -+int main() { -+static struct msghdr tp; int n = (int) tp.msg_flags; return n -+; return 0; } -+EOF -+if { (eval echo configure:88607: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ : - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* -+ cat >> confdefs.h <<\EOF -+#define MISSING_MSGHDR_MSGFLAGS 1 -+EOF -+ - -- SNMP_SSL=no -- - fi - rm -f conftest* -+ cat >> confdefs.h <<\EOF -+#define HAVE_SOCKETS 1 -+EOF -+ -+ -+ -+ ext_builddir=ext/sockets -+ ext_srcdir=$abs_srcdir/ext/sockets -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SOCKETS_SHARED=no -+ -+ -+ case ext/sockets in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in sockets.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&6 -+ else -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_SOCKETS_SHARED=yes -+ -+ case ext/sockets in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- if test "$SNMP_SSL" = "yes"; then -- if test "$PHP_OPENSSL_DIR" != "no"; then -- PHP_OPENSSL=$PHP_OPENSSL_DIR -- fi -+ -+ -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in sockets.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- if test "$PHP_OPENSSL" = "no"; then -- { echo "configure: error: The UCD-SNMP in this system is built with SSL support. -+ shared_objects_sockets="$shared_objects_sockets $ac_bdir$ac_obj.lo" - -- Add --with-openssl-dir=DIR to your configure line." 1>&2; exit 1; } -- else -- -- found_openssl=no -- unset OPENSSL_INCDIR -- unset OPENSSL_LIBDIR -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- test -z "$PHP_OPENSSL" && PHP_OPENSSL=no -- test -z "$PHP_IMAP_SSL" && PHP_IMAP_SSL=no -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <&6 --echo "configure:84202: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- case "$PKG_CONFIG" in -- /*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. -- ;; -- ?:/*) -- ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a dos path. -- ;; -- *) -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word" -- break - fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" -- ;; --esac --fi --PKG_CONFIG="$ac_cv_path_PKG_CONFIG" --if test -n "$PKG_CONFIG"; then -- echo "$ac_t""$PKG_CONFIG" 1>&6 --else -- echo "$ac_t""no" 1>&6 --fi -+ fi -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -+ PHP_SOCKETS_SHARED=no -+ case "$PHP_SAPI" in -+ cgi|embed) -+ -+ -+ case ext/sockets in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ - -- fi -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - -- if test "$PHP_OPENSSL_DIR" = "yes" && test -x "$PKG_CONFIG" && $PKG_CONFIG --exists openssl; then -- if $PKG_CONFIG --atleast-version=0.9.6 openssl; then -- found_openssl=yes -- OPENSSL_LIBS=`$PKG_CONFIG --libs openssl` -- OPENSSL_INCS=`$PKG_CONFIG --cflags-only-I openssl` -- OPENSSL_INCDIR=`$PKG_CONFIG --variable=includedir openssl` -- else -- { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } -- fi - -- if test -n "$OPENSSL_LIBS" && test -n "$OPENSSL_INCS"; then -+ old_IFS=$IFS -+ for ac_src in sockets.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- for ac_i in $OPENSSL_LIBS; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="$SNMP_SHARED_LIBADD -pthread" -- else -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" - fi -- -- -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_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" -+ BUILD_DIR="$BUILD_DIR $ext_builddir" - -- fi - - -- fi -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sockets - -- fi -- -- ;; -- esac -- done -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - -- -- for ac_i in $OPENSSL_INCS; do -- case $ac_i in -- -I*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/include"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - -- - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ header_path=ext/sockets/ -+ for header_file in php_sockets.h; do -+ hp_hf="$header_path/$header_file" -+ -+ -+ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -+ eval "INSTALLHEADERS$unique=set" - -+ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" -+ - fi - -- fi -- -- ;; -- esac -- done -- -- fi -- fi -- -- if test "$found_openssl" = "no"; then -+ done - -- if test "$PHP_OPENSSL_DIR" = "yes"; then -- PHP_OPENSSL_DIR="/usr/local/ssl /usr/local /usr /usr/local/openssl" -- fi -- -- for i in $PHP_OPENSSL_DIR; do -- if test -r $i/include/openssl/evp.h; then -- OPENSSL_INCDIR=$i/include -- fi -- if test -r $i/$PHP_LIBDIR/libssl.a -o -r $i/$PHP_LIBDIR/libssl.$SHLIB_SUFFIX_NAME; then -- OPENSSL_LIBDIR=$i/$PHP_LIBDIR -- fi -- test -n "$OPENSSL_INCDIR" && test -n "$OPENSSL_LIBDIR" && break -- done - -- if test -z "$OPENSSL_INCDIR"; then -- { echo "configure: error: Cannot find OpenSSL's " 1>&2; exit 1; } -- fi -+fi - -- if test -z "$OPENSSL_LIBDIR"; then -- { echo "configure: error: Cannot find OpenSSL's libraries" 1>&2; exit 1; } -- fi - -- old_CPPFLAGS=$CPPFLAGS -- CPPFLAGS=-I$OPENSSL_INCDIR -- echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 --echo "configure:84407: checking for OpenSSL version" >&5 -- cat > conftest.$ac_ext <&6 -+echo "configure:88941: checking whether zend_object_value is packed" >&5 -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" -+ if test "$cross_compiling" = yes; then -+ -+ ac_result=0 -+ echo "$ac_t""no" 1>&6 -+ -+else -+ cat > conftest.$ac_ext < --#if OPENSSL_VERSION_NUMBER >= 0x0090600fL -- yes --#endif -- -+#include "Zend/zend_types.h" -+int main(int argc, char **argv) { -+ return ((sizeof(zend_object_handle) + sizeof(zend_object_handlers*)) == sizeof(zend_object_value)) ? 0 : 1; -+} -+ - EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "yes" >/dev/null 2>&1; then -- rm -rf conftest* -+if { (eval echo configure:88960: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_result=1 -+ echo "$ac_t""yes" 1>&6 - -- echo "$ac_t"">= 0.9.6" 1>&6 -- - else -- rm -rf conftest* -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ ac_result=0 -+ echo "$ac_t""no" 1>&6 - -- { echo "configure: error: OpenSSL version 0.9.6 or greater required." 1>&2; exit 1; } -- - fi --rm -f conftest* -- -- CPPFLAGS=$old_CPPFLAGS -+rm -fr conftest* -+fi - -- -- if test "$OPENSSL_INCDIR" != "/usr/include"; then -- -- if test -z "$OPENSSL_INCDIR" || echo "$OPENSSL_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$OPENSSL_INCDIR -- else -- -- ep_dir="`echo $OPENSSL_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$OPENSSL_INCDIR\"`" -- fi -+ CPPFLAGS=$old_CPPFLAGS -+ cat >> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_SPL 1 -+EOF -+ - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -+ ext_builddir=ext/spl -+ ext_srcdir=$abs_srcdir/ext/spl - -- fi -+ ac_extra= - -- -+ if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then -+ PHP_SPL_SHARED=no - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$OPENSSL_LIBDIR -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes - -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -+ case ext/spl in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- fi -- ;; -- esac -+ cat >>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -+ EXT_STATIC="$EXT_STATIC spl" -+ if test "no" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC spl" -+ fi - else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ if test "no" = "shared" || test "no" = "yes"; then -+ PHP_SPL_SHARED=yes -+ -+ case ext/spl in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- 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 - -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo - -- fi -- -- fi - -- ;; -- esac -- done -+ old_IFS=$IFS -+ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo" - -- echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 --echo "configure:84564: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lcrypto $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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" -+ done - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- -- case crypto in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" -- else -- -- -- case crypto in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lcrypto $LIBS" -- ;; -+ case $host_alias in -+ *netware*) -+ -+ install_modules="install-modules" -+ -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpspl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpspl.so '$ext_builddir'/phpspl.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSPL, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(PHPSPL_SHARED_LIBADD)' -+ ;; - esac - -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix" -+ fi -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" - -- fi -- ;; -- esac -+ cat >>Makefile.objects<&6 -+EOF - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_crypto_CRYPTO_free -- -- { echo "configure: error: libcrypto not found!" 1>&2; exit 1; } -- -- --fi -+ ;; -+ *) -+ -+ install_modules="install-modules" - -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/spl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/spl.so '$ext_builddir'/spl.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD)' -+ ;; -+ esac - -- old_LIBS=$LIBS -- LIBS="$LIBS -lcrypto" -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$OPENSSL_LIBDIR -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix" - fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" - -+ cat >>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ;; -+ esac -+ cat >> confdefs.h <&6 --echo "configure:84740: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lssl $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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" -+ done - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- found_openssl=yes -- -- --else -- echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_ssl_SSL_CTX_set_ssl_version -- -- { echo "configure: error: libssl not found!" 1>&2; exit 1; } -- -+ EXT_STATIC="$EXT_STATIC spl" -+ ;; -+ *) -+ - --fi -- -- LIBS=$old_LIBS -- -+ case ext/spl in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- case ssl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="-lssl $SNMP_SHARED_LIBADD" -- else -- - -- case ssl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lssl $LIBS" -- ;; -- esac -- - -- fi -- ;; -- esac -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - - -- -+ old_IFS=$IFS -+ for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - -- case crypto in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="-lcrypto $SNMP_SHARED_LIBADD" -- else -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- -- case crypto in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lcrypto $LIBS" -- ;; -- esac -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- fi -- ;; -- esac -+ cat >>Makefile.objects</dev/null ; then -- ai_p=$OPENSSL_LIBDIR -- else -- -- ep_dir="`echo $OPENSSL_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$OPENSSL_LIBDIR\"`" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ - fi - -- -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_SHARED_LIBADD" -- else -- - - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ header_path=ext/spl -+ for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do -+ hp_hf="$header_path/$header_file" -+ - -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -+ eval "INSTALLHEADERS$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" -- -+ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" -+ - fi - -+ done -+ - -- fi -- -+ -+ am_i_shared=$PHP_SPL_SHARED -+ is_it_shared=$PHP_PCRE_SHARED -+ is_it_enabled=$PHP_PCRE -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension spl to build statically, but it -+depends on extension pcre, which you've configured to build shared. -+You either need to build spl shared or build pcre statically for the -+build to be successful. -+" 1>&2; exit 1; } - fi -- -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension spl, which depends on extension pcre, -+but you've either not enabled pcre, or have disabled it. -+" 1>&2; exit 1; } - fi -- -- if test "$found_openssl" = "yes"; then -- OPENSSL_INCDIR_OPT=-I$OPENSSL_INCDIR - - --: --else -- { echo "configure: error: SNMP: OpenSSL check failed. Please check config.log for more information." 1>&2; exit 1; } -- -- fi - -- fi -- fi - -- echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 --echo "configure:84895: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lkstat $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" -+echo $ac_n "checking for sqlite support""... $ac_c" 1>&6 -+echo "configure:89324: checking for sqlite support" >&5 -+# Check whether --with-sqlite or --without-sqlite was given. -+if test "${with_sqlite+set}" = set; then -+ withval="$with_sqlite" -+ PHP_SQLITE=$withval - 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 kstat in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="-lkstat $SNMP_SHARED_LIBADD" -- else -- - -- case kstat in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lkstat $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -+ PHP_SQLITE=yes -+ test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL - -- --else -- echo "$ac_t""no" 1>&6 - fi - -- -- if test "$SNMP_INCDIR" != "/usr/include"; then -- -- if test -z "$SNMP_INCDIR" || echo "$SNMP_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$SNMP_INCDIR -- else -- -- ep_dir="`echo $SNMP_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SNMP_INCDIR\"`" -- fi - -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi - -- fi -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SQLITE in -+shared,*) -+ PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SQLITE=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - -- - -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="-lsnmp $SNMP_SHARED_LIBADD" -- if test -n "$SNMP_LIBDIR"; then -- -- if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$SNMP_LIBDIR -- else -- -- ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" -- fi - -- -- if test "$ext_shared" = "yes"; then -- SNMP_SHARED_LIBADD="-L$ai_p $SNMP_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SNMP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SNMP_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 -+echo "$ac_t""$ext_output" 1>&6 -+ - - -- fi -- -- fi - -- fi -- else -- - -- if test -n "$SNMP_LIBDIR"; then -- -- if test "$SNMP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SNMP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$SNMP_LIBDIR" || echo "$SNMP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$SNMP_LIBDIR -- else -- -- ep_dir="`echo $SNMP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SNMP_LIBDIR\"`" -- fi -+php_enable_sqlite_utf8=no - -- -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 -+echo "configure:89368: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 -+# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given. -+if test "${enable_sqlite_utf8+set}" = set; then -+ enableval="$enable_sqlite_utf8" -+ PHP_SQLITE_UTF8=$enableval -+else - -- 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" -+ PHP_SQLITE_UTF8=no - -- fi - -+fi - -- -- fi - -- fi -- -- -- case snmp in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsnmp $LIBS" -- ;; -- esac -+ext_output=$PHP_SQLITE_UTF8 -+echo "$ac_t""$ext_output" 1>&6 - - - - -- fi - - -- SNMP_LIBNAME=snmp -+ -+ -+ -+if test "$PHP_SQLITE" != "no"; then -+ if test "$PHP_PDO" != "no"; then -+ -+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -+echo "configure:89396: checking for PDO includes" >&5 -+if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 -+echo "configure:89402: checking for PDO includes" >&5 -+ if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then -+ pdo_inc_path=$abs_srcdir/ext -+ elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -+ pdo_inc_path=$abs_srcdir/ext -+ elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then -+ pdo_inc_path=$prefix/include/php/ext -+ fi -+ -+fi -+ -+echo "$ac_t""$pdo_inc_path" 1>&6 -+ if test -n "$pdo_inc_path"; then -+: -+ else -+echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2 - fi - -+ if test -n "$pdo_inc_path"; then -+ cat >> confdefs.h <<\EOF -+#define PHP_SQLITE2_HAVE_PDO 1 -+EOF -+ -+ pdo_inc_path="-I$pdo_inc_path" -+ fi -+ fi -+ -+ if test "$PHP_SQLITE" != "yes"; then -+ SEARCH_PATH="/usr/local /usr" -+ SEARCH_FOR="/include/sqlite.h" -+ if test -r $PHP_SQLITE/; then # path given as parameter -+ SQLITE_DIR=$PHP_SQLITE -+ else # search default path list -+ echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 -+echo "configure:89436: checking for sqlite files in default path" >&5 -+ for i in $SEARCH_PATH ; do -+ if test -r $i/$SEARCH_FOR; then -+ SQLITE_DIR=$i -+ echo "$ac_t""found in $i" 1>&6 -+ fi -+ done -+ fi -+ -+ if test -z "$SQLITE_DIR"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } -+ fi -+ - - save_old_LDFLAGS=$LDFLAGS - ac_stuff=" -- $SNMP_SHARED_LIBADD -- " -+ -L$SQLITE_DIR/$PHP_LIBDIR -lm -+ " - - save_ext_shared=$ext_shared - ext_shared=yes -@@ -85180,27 +89543,27 @@ fi - esac - done - -- echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 --echo "configure:85185: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 --ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 -+echo "configure:89548: checking for sqlite_open in -lsqlite" >&5 -+ac_lib_var=`echo sqlite'_'sqlite_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="-l$SNMP_LIBNAME $LIBS" -+LIBS="-lsqlite $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:89567: \"$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 -@@ -85219,97 +89582,69 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -- cat >> confdefs.h <<\EOF --#define HAVE_SNMP_PARSE_OID 1 --EOF -- -- -- --else -- echo "$ac_t""no" 1>&6 -+ - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_$SNMP_LIBNAME_snmp_parse_oid -+ if test "$ext_shared" = "yes"; then -+ SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD" -+ if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then -+ -+ if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- --fi -- -+ if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SQLITE_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" -+ fi - - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SNMP_SHARED_LIBADD -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -+ SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_SHARED_LIBADD" - else - - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ 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 "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ 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 -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac - -+ fi -+ -+ fi - - fi -- ;; -- esac -- -+ else -+ - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SQLITE_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" - fi - - -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -+ - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -85325,93 +89660,171 @@ fi - fi - - -- fi - - fi - -- ;; -- esac -- done -+ fi -+ -+ -+ case sqlite in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsqlite $LIBS" -+ ;; -+ esac - -- echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 --echo "configure:85338: checking for init_snmp in -l$SNMP_LIBNAME" >&5 --ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | 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="-l$SNMP_LIBNAME $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 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -+ -+ fi -+ -+ -+ -+ if test "$SQLITE_DIR/include" != "/usr/include"; then - -- cat >> confdefs.h <<\EOF --#define HAVE_SNMP 1 --EOF -+ if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$SQLITE_DIR/include -+ else -+ -+ ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`" -+ fi - -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ - - else - echo "$ac_t""no" 1>&6 - - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_$SNMP_LIBNAME_init_snmp -+ unset ac_cv_lib_sqlite_sqlite_open -+ -+ { echo "configure: error: wrong sqlite lib version or lib not found" 1>&2; exit 1; } - -- { echo "configure: error: SNMP sanity check failed. Please check config.log for more information." 1>&2; exit 1; } -- - - fi - -+ SQLITE_MODULE_TYPE=external -+ PHP_SQLITE_CFLAGS=$pdo_inc_path -+ sqlite_extra_sources="libsqlite/src/encode.c" -+ else -+ # use bundled library -+ -+ # we only support certain lemon versions -+ lemon_version_list="1.0" - -- if test "$PHP_UCD_SNMP_HACK" = "yes" ; then -- cat >> confdefs.h <<\EOF --#define UCD_SNMP_HACK 1 --EOF -+ # Extract the first word of "lemon", so it can be a program name with args. -+set dummy lemon; ac_word=$2 -+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -+echo "configure:89740: checking for $ac_word" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test -n "$LEMON"; then -+ ac_cv_prog_LEMON="$LEMON" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_LEMON="lemon" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+fi -+fi -+LEMON="$ac_cv_prog_LEMON" -+if test -n "$LEMON"; then -+ echo "$ac_t""$LEMON" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ -+ if test "$LEMON"; then -+ echo $ac_n "checking for lemon version""... $ac_c" 1>&6 -+echo "configure:89768: checking for lemon version" >&5 -+if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` -+ php_cv_lemon_version=invalid -+ for lemon_check_version in $lemon_version_list; do -+ if test "$lemon_version" = "$lemon_check_version"; then -+ php_cv_lemon_version="$lemon_check_version (ok)" -+ fi -+ done -+ -+fi - -+echo "$ac_t""$php_cv_lemon_version" 1>&6 -+ else -+ lemon_version=none - fi -+ case $php_cv_lemon_version in -+ ""|invalid) -+ lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)." -+ echo "configure: warning: $lemon_msg" 1>&2 -+ LEMON="exit 0;" -+ ;; -+ esac - -+ PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON" -+ -+ -+ SQLITE_MODULE_TYPE=builtin -+ PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" -+ sqlite_extra_sources="libsqlite/src/opcodes.c \ -+ libsqlite/src/parse.c libsqlite/src/encode.c \ -+ libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ -+ libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \ -+ libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \ -+ libsqlite/src/os.c libsqlite/src/pager.c \ -+ libsqlite/src/printf.c libsqlite/src/random.c \ -+ libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \ -+ libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \ -+ libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \ -+ libsqlite/src/vacuum.c libsqlite/src/copy.c \ -+ libsqlite/src/vdbeaux.c libsqlite/src/date.c \ -+ libsqlite/src/where.c libsqlite/src/trigger.c" -+ fi -+ sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" - -- ext_builddir=ext/snmp -- ext_srcdir=$abs_srcdir/ext/snmp -+ ext_builddir=ext/sqlite -+ ext_srcdir=$abs_srcdir/ext/sqlite - -- ac_extra= -+ ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SNMP_SHARED=no -+ PHP_SQLITE_SHARED=no - - -- case ext/snmp in -+ case ext/sqlite in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -85426,7 +89839,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in snmp.c; do -+ for ac_src in $sqlite_sources; do - - IFS=. - set $ac_src -@@ -85449,18 +89862,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC snmp" -+ EXT_STATIC="$EXT_STATIC sqlite" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC snmp" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SNMP_SHARED=yes -+ PHP_SQLITE_SHARED=yes - -- case ext/snmp in -+ case ext/sqlite in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/snmp"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/snmp/"; ac_bdir="ext/snmp/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -85475,14 +89888,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in snmp.c; do -+ for ac_src in $sqlite_sources; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_snmp="$shared_objects_snmp $ac_bdir$ac_obj.lo" -+ shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -85505,31 +89918,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsnmp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsnmp.so '$ext_builddir'/phpsnmp.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsqlite.so '$ext_builddir'/phpsqlite.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSNMP, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSQLITE, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_snmp) $(PHPSNMP_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(PHPSQLITE_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsnmp.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsnmp.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_snmp" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension sqlite, which depends on extension spl, -+but you've either not enabled spl, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ am_i_shared=$PHP_SQLITE_SHARED -+ is_it_shared=$PHP_PDO_SHARED -+ is_it_enabled=$PHP_PDO -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension sqlite to build statically, but it -+depends on extension pdo, which you've configured to build shared. -+You either need to build sqlite shared or build pdo statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension sqlite, which depends on extension pdo, -+but you've either not enabled pdo, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ - --fi -+ -+ src=$ext_srcdir/Makefile.frag -+ ac_srcdir=$ext_srcdir -+ ac_builddir=$ext_builddir -+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD" - -+ -+ -+ for header_file in $ext_builddir/libsqlite/src/sqlite.h; do -+ -+ -+ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" -+ -+ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -+ -+ fi - --php_enable_soap=no -+ done -+ - --echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 --echo "configure:85704: checking whether to enable SOAP support" >&5 --# Check whether --enable-soap or --disable-soap was given. --if test "${enable_soap+set}" = set; then -- enableval="$enable_soap" -- PHP_SOAP=$enableval --else - -- PHP_SOAP=no -- test "$PHP_ENABLE_ALL" && PHP_SOAP=$PHP_ENABLE_ALL -+ if test "$SQLITE_MODULE_TYPE" = "builtin"; then -+ -+ -+ $php_shtool mkdir -p $ext_builddir/libsqlite/src -+ - -+ echo $ac_n "checking size of char *""... $ac_c" 1>&6 -+echo "configure:90181: checking size of char *" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_char_p=4 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(char *)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:90201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_sizeof_char_p=`cat conftestval` -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_char_p=0 -+fi -+rm -fr conftest* - fi - -+fi -+echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 -+cat >> confdefs.h <> confdefs.h <<\EOF -+#define SQLITE_PTR_SZ SIZEOF_CHAR_P -+EOF - -+ if test "$PHP_SQLITE_UTF8" = "yes"; then -+ SQLITE_ENCODING="UTF8" -+ cat >> confdefs.h <<\EOF -+#define SQLITE_UTF8 1 -+EOF - -+ else -+ SQLITE_ENCODING="ISO8859" -+ fi -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING" - --echo "$ac_t""$ext_output" 1>&6 - -+ SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION" - - -+ sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h - --if test -z "$PHP_LIBXML_DIR"; then -+ if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then -+ echo '#include ' > $ext_builddir/libsqlite/src/config.h -+ else -+ echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h -+ fi -+ -+ cat >> $ext_builddir/libsqlite/src/config.h <&6 -+echo "configure:90263: 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 < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); - --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:85749: checking libxml2 install dir" >&5 --# Check whether --with-libxml-dir or --without-libxml-dir was given. --if test "${with_libxml_dir+set}" = set; then -- withval="$with_libxml_dir" -- PHP_LIBXML_DIR=$withval -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:90291: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+ for ac_hdr in time.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:90319: 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:90329: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+fi -+ -+ -+ -+echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 -+echo "configure:90360: checking whether flush should be called explicitly after a buffered io" >&5 -+if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - -- PHP_LIBXML_DIR=no -+if test "$cross_compiling" = yes; then -+ -+ ac_cv_flush_io=no -+ -+else -+ cat > conftest.$ac_ext < -+#include -+ -+int main(int argc, char **argv) -+{ -+ char *filename = tmpnam(NULL); -+ char buffer[64]; -+ int result = 0; -+ -+ FILE *fp = fopen(filename, "wb"); -+ if (NULL == fp) -+ return 0; -+ fputs("line 1\n", fp); -+ fputs("line 2\n", fp); -+ fclose(fp); -+ -+ fp = fopen(filename, "rb+"); -+ if (NULL == fp) -+ return 0; -+ fgets(buffer, sizeof(buffer), fp); -+ fputs("line 3\n", fp); -+ rewind(fp); -+ fgets(buffer, sizeof(buffer), fp); -+ if (0 != strcmp(buffer, "line 1\n")) -+ result = 1; -+ fgets(buffer, sizeof(buffer), fp); -+ if (0 != strcmp(buffer, "line 3\n")) -+ result = 1; -+ fclose(fp); -+ unlink(filename); -+ -+ exit(result); -+} -+ -+EOF -+if { (eval echo configure:90409: \"$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 -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -+ ac_cv_flush_io=yes - - fi -+rm -fr conftest* -+fi - -+fi - --ext_output=$PHP_LIBXML_DIR --echo "$ac_t""$ext_output" 1>&6 -+echo "$ac_t""$ac_cv_flush_io" 1>&6 -+if test "$ac_cv_flush_io" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_FLUSHIO 1 -+EOF - -+fi - -+if test "$ac_cv_func_crypt" = "no"; then -+ echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 -+echo "configure:90437: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lcrypt $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" - --if test "$PHP_SOAP" != "no"; then -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ LIBS="-lcrypt $LIBS -lcrypt" -+ cat >> confdefs.h <<\EOF -+#define HAVE_CRYPT 1 -+EOF - -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: SOAP extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi - -+fi - --echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:85777: checking for xml2-config path" >&5 --if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 -+echo "configure:90485: 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 - -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -+ if test "$cross_compiling" = yes; then -+ -+ ac_cv_crypt_des=yes - --fi -+else -+ cat > conftest.$ac_ext <&6 -+#if HAVE_UNISTD_H -+#include -+#endif - -- if test -x "$ac_cv_php_xml2_config_path"; then -- XML2_CONFIG="$ac_cv_php_xml2_config_path" -- libxml_full_version=`$XML2_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $libxml_full_version -- IFS=$ac_IFS -- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -- if test "$LIBXML_VERSION" -ge "2006011"; then -- LIBXML_LIBS=`$XML2_CONFIG --libs` -- LIBXML_INCS=`$XML2_CONFIG --cflags` -- -- for ac_i in $LIBXML_LIBS; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -pthread" -- else -- -+#if HAVE_CRYPT_H -+#include -+#endif -+ -+main() { -+#if HAVE_CRYPT -+ exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_cv_crypt_des=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -+ ac_cv_crypt_des=no - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -+fi -+rm -fr conftest* -+fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_crypt_des" 1>&6 -+ -+echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 -+echo "configure:90536: 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 - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SOAP_SHARED_LIBADD="$SOAP_SHARED_LIBADD -l$ac_ii" -- else -- -+ if test "$cross_compiling" = yes; then - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -+ ac_cv_crypt_ext_des=no - -- fi -- ;; -- esac -+else -+ cat > conftest.$ac_ext < -+#endif - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+#if HAVE_CRYPT_H -+#include -+#endif - -- -- if test "$ext_shared" = "yes"; then -- SOAP_SHARED_LIBADD="-L$ai_p $SOAP_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SOAP_SHARED_LIBADD="$ld_runpath_switch$ai_p $SOAP_SHARED_LIBADD" -- else -- -+main() { -+#if HAVE_CRYPT -+ exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90566: \"$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 -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_cv_crypt_ext_des=no -+ -+fi -+rm -fr conftest* -+fi -+ -+fi -+ -+echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 -+ -+echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 -+echo "configure:90587: 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 - -- 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" -+if test "$cross_compiling" = yes; then - -- fi -+ ac_cv_crypt_md5=no - -+else -+ cat > conftest.$ac_ext < -+#endif - -- ;; -- esac -- done -+#if HAVE_CRYPT_H -+#include -+#endif - -- -- for ac_i in $LIBXML_INCS; do -- case $ac_i in -- -I*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/include"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -+main() { -+#if HAVE_CRYPT -+ char salt[15], answer[40]; - -- -+ salt[0]='$'; salt[1]='1'; salt[2]='$'; -+ salt[3]='r'; salt[4]='a'; salt[5]='s'; -+ salt[6]='m'; salt[7]='u'; salt[8]='s'; -+ salt[9]='l'; salt[10]='e'; salt[11]='$'; -+ salt[12]='\0'; -+ strcpy(answer,salt); -+ strcat(answer,"rISCgZzpwk3UhDidwXvin0"); -+ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90626: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_cv_crypt_md5=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -+ ac_cv_crypt_md5=no - -- fi -+fi -+rm -fr conftest* -+fi - -- ;; -- esac -- done -+fi - -+echo "$ac_t""$ac_cv_crypt_md5" 1>&6 - -- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:85935: checking whether libxml build works" >&5 --if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 -+echo "configure:90647: 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 - -- -- old_LIBS=$LIBS -- LIBS=" -- $SOAP_SHARED_LIBADD -- $LIBS" -- if test "$cross_compiling" = yes; then -- -- LIBS=$old_LIBS -+if test "$cross_compiling" = yes; then - -+ ac_cv_crypt_blowfish=no -+ - else - cat > conftest.$ac_ext < -+#endif -+ -+#if HAVE_CRYPT_H -+#include -+#endif -+ -+main() { -+#if HAVE_CRYPT -+ char salt[30], answer[70]; - -- char xmlInitParser(); -- int main() { -- xmlInitParser(); -- return 0; -- } -- -+ salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; -+ strcat(salt,"rasmuslerd............"); -+ strcpy(answer,salt); -+ strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); -+ exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); -+#else -+ exit(0); -+#endif -+} - EOF --if { (eval echo configure:85962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:90683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - -- LIBS=$old_LIBS -- -- php_cv_libxml_build_works=yes -- -- -+ ac_cv_crypt_blowfish=yes -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - -- LIBS=$old_LIBS -- -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- -- -+ ac_cv_crypt_blowfish=no -+ - fi - rm -fr conftest* - fi - -- -- - fi - --echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 --EOF -+echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 - -- fi -- -- cat >> confdefs.h <<\EOF --#define HAVE_SOAP 1 --EOF -+echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 -+echo "configure:90704: checking for SHA512 crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+if test "$cross_compiling" = yes; then -+ -+ ac_cv_crypt_SHA512=no - -- -- ext_builddir=ext/soap -- ext_srcdir=$abs_srcdir/ext/soap -+else -+ cat > conftest.$ac_ext < -+#endif - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SOAP_SHARED=no -+#if HAVE_CRYPT_H -+#include -+#endif -+ -+main() { -+#if HAVE_CRYPT -+ char salt[30], answer[80]; - -+ salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; -+ strcpy(answer, salt); -+ strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); -+ exit (strcmp((char *)crypt("foo",salt),answer)); -+#else -+ exit(0); -+#endif -+} -+EOF -+if { (eval echo configure:90739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then - -- case ext/soap in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -+ ac_cv_crypt_SHA512=yes - -- old_IFS=$IFS -- for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ ac_cv_crypt_SHA512=no - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+fi -+rm -fr conftest* -+fi - -- cat >>Makefile.objects<&6 - -- EXT_STATIC="$EXT_STATIC soap" -- if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC soap" -- fi -- else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SOAP_SHARED=yes -- -- case ext/soap in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 -+echo "configure:90760: checking for SHA256 crypt" >&5 -+if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -+if test "$cross_compiling" = yes; then - -+ ac_cv_crypt_SHA256=no - -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo -- -+else -+ cat > conftest.$ac_ext < -+#endif - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+#if HAVE_CRYPT_H -+#include -+#endif - -- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_crypt_SHA256=yes - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsoap.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsoap.$suffix" -- fi -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" -+ ac_cv_crypt_SHA256=no - -- cat >>Makefile.objects<&6 - -- ;; -- *) -- -- install_modules="install-modules" - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/soap.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(SOAP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/soap.so '$ext_builddir'/soap.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOAP, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_soap) $(SOAP_SHARED_LIBADD)' -- ;; -- esac -+if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/soap.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/soap.$suffix" -- fi -+ echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 -+echo "configure:90819: checking whether the compiler supports __alignof__" >&5 -+if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_soap" -- -- cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ -+ ac_cv_alignof_exists=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+ ac_cv_alignof_exists=no -+ -+fi -+rm -f conftest* -+fi - -- ;; -- esac -- cat >> confdefs.h <&6 -+ if test "$ac_cv_alignof_exists" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ALIGNOF 1 - EOF - -- fi - fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SOAP_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -+ echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 -+echo "configure:90860: checking whether the compiler supports aligned attribute" >&5 -+if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -- case ext/soap in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/soap"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/soap/"; ac_bdir="ext/soap/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ -+ ac_cv_attribute_aligned=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* - -+ ac_cv_attribute_aligned=no - -+fi -+rm -f conftest* -+fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 -+ if test "$ac_cv_attribute_aligned" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ATTRIBUTE_ALIGNED 1 -+EOF - -+ fi -+ - -- old_IFS=$IFS -- for ac_src in soap.c php_encoding.c php_http.c php_packet_soap.c php_schema.c php_sdl.c php_xml.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <>Makefile.objects<> confdefs.h <> confdefs.h <> confdefs.h <>Makefile.objects<> confdefs.h <> confdefs.h <&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -- -+ if test "$ac_cv_crypt_ext_des" = "yes"; then -+ ac_result=1 -+ ac_crypt_edes=1 -+ else -+ ac_result=0 -+ ac_crypt_edes=0 - fi -+ cat >> confdefs.h <&6 --echo "configure:86312: 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" -- PHP_SOCKETS=$enableval --else -+ if test "$ac_cv_crypt_md5" = "yes"; then -+ ac_result=1 -+ ac_crypt_md5=1 -+ else -+ ac_result=0 -+ ac_crypt_md5=0 -+ fi -+ cat >> confdefs.h <&6 -- -- -- -- --if test "$PHP_SOCKETS" != "no"; then -- echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 --echo "configure:86354: checking for struct cmsghdr" >&5 --if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else - -- cat > conftest.$ac_ext <> confdefs.h < --#include --int main() { --struct cmsghdr s; s --; return 0; } -+ -+ if test "$ac_cv_crypt_sha256" = "yes"; then -+ ac_result=1 -+ ac_crypt_sha256=1 -+ else -+ ac_result=0 -+ ac_crypt_sha256=0 -+ fi -+ cat >> confdefs.h <&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- ac_cv_cmsghdr=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- ac_cv_cmsghdr=no --fi --rm -f conftest* -- --fi - --echo "$ac_t""$ac_cv_cmsghdr" 1>&6 - -- if test "$ac_cv_cmsghdr" = yes; then -- cat >> confdefs.h <<\EOF --#define HAVE_CMSGHDR 1 -+ cat >> confdefs.h <&6 --echo "configure:86394: checking for $ac_func" >&5 -+echo "configure:91055: 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:91083: \"$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 -@@ -86442,1018 +91103,1372 @@ else - fi - done - -- for ac_hdr in netdb.h netinet/tcp.h sys/un.h errno.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:86450: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 -+echo "configure:91108: checking for working fnmatch" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -+ # Some versions of Solaris or SCO have a broken fnmatch function. -+# So we run a test program. If we are cross-compiling, take no chance. -+# Thanks to John Oleynick and Franc,ois Pinard for this test. -+if test "$cross_compiling" = yes; then -+ ac_cv_func_fnmatch_works=no -+else - cat > conftest.$ac_ext < -+main() { exit (fnmatch ("a*", "abc", 0) != 0); } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:86460: \"$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* -- eval "ac_cv_header_$ac_safe=yes" -+if { (eval echo configure:91123: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ ac_cv_func_fnmatch_works=yes - else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" -+ rm -fr conftest* -+ ac_cv_func_fnmatch_works=no - fi --rm -f conftest* -+rm -fr conftest* - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 -+if test $ac_cv_func_fnmatch_works = yes; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_FNMATCH 1 - EOF -- --else -- echo "$ac_t""no" 1>&6 -+ - fi --done -+ -+ - -+for ac_func in fork CreateProcess -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:91150: 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 < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); - --#include --#include -- - int main() { --static struct msghdr tp; int n = (int) tp.msg_flags; return n -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif -+ - ; return 0; } - EOF --if { (eval echo configure:86497: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- : -+if { (eval echo configure:91178: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- cat >> confdefs.h <<\EOF --#define MISSING_MSGHDR_MSGFLAGS 1 --EOF -- -- -+ eval "ac_cv_func_$ac_func=no" - fi - rm -f conftest* -- cat >> confdefs.h <<\EOF --#define HAVE_SOCKETS 1 --EOF -- -- -- -- ext_builddir=ext/sockets -- ext_srcdir=$abs_srcdir/ext/sockets -- -- ac_extra= -- -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SOCKETS_SHARED=no -- -- -- case ext/sockets in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in sockets.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects<>Makefile.objects<&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <>Makefile.objects<&6 -+php_can_support_proc_open=no - --$ext_builddir/phpsockets.$suffix: \$(shared_objects_sockets) \$(PHPSOCKETS_SHARED_DEPENDENCIES) -- $link_cmd -+fi -+done - -+echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 -+echo "configure:91208: checking if your OS can spawn processes with inherited handles" >&5 -+if test "$php_can_support_proc_open" = "yes"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define PHP_CAN_SUPPORT_PROC_OPEN 1 - EOF - -- ;; -- *) -- -- install_modules="install-modules" -- -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sockets.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(SOCKETS_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sockets.so '$ext_builddir'/sockets.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SOCKETS, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sockets) $(SOCKETS_SHARED_LIBADD)' -- ;; -- esac -- -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sockets.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sockets.$suffix" -- fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sockets" -- -- cat >>Makefile.objects<&6 -+fi - -- ;; -- esac -- cat >> confdefs.h <> confdefs.h <<\EOF -+#define ENABLE_CHROOT_FUNC 1 - EOF - -- fi -- fi -- -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SOCKETS_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -- -- case ext/sockets in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+fi - - -- old_IFS=$IFS -- for ac_src in sockets.c; do -+ unset ac_cv_func_res_nsearch -+ unset ac_cv_func___res_nsearch -+ unset found - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6 -+echo "configure:91232: checking for res_nsearch" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char res_nsearch(); - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+int main() { - -- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_res_nsearch=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_res_nsearch=no" -+fi -+rm -f conftest* -+fi - -+if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 -+echo "configure:91278: checking for __res_nsearch" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __res_nsearch(); - -- EXT_STATIC="$EXT_STATIC sockets" -- ;; -- *) -- -- -- case ext/sockets in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sockets"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sockets/"; ac_bdir="ext/sockets/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -+int main() { - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch) -+choke me -+#else -+__res_nsearch(); -+#endif - -+; return 0; } -+EOF -+if { (eval echo configure:91306: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func___res_nsearch=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func___res_nsearch=no" -+fi -+rm -f conftest* -+fi - -- old_IFS=$IFS -- for ac_src in sockets.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ -+fi - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_RES_NSEARCH 1 - EOF -- done -- - -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC sockets" -- fi -- -+ ac_cv_func_res_nsearch=yes -+ ;; - -- BUILD_DIR="$BUILD_DIR $ext_builddir" -+ *) - -+ unset ac_cv_lib_resolv_res_nsearch -+ unset ac_cv_lib_resolv___res_nsearch -+ unset found -+ echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6 -+echo "configure:91344: checking for res_nsearch in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'res_nsearch | 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="-lresolv $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" - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=sockets -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - -- fi -+ echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6 -+echo "configure:91383: checking for __res_nsearch in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'__res_nsearch | 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="-lresolv $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" - -- done -- -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -+ - fi - - -- echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 --echo "configure:86831: checking whether zend_object_value is packed" >&5 -- old_CPPFLAGS=$CPPFLAGS -- CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" -- if test "$cross_compiling" = yes; then -- -- ac_result=0 -- echo "$ac_t""no" 1>&6 -- -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=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:91438: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- -- ac_result=1 -- echo "$ac_t""yes" 1>&6 -- -+ found=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- -- ac_result=0 -- echo "$ac_t""no" 1>&6 -- -+ found=no - fi - rm -fr conftest* - fi - -- CPPFLAGS=$old_CPPFLAGS -- cat >> confdefs.h <> confdefs.h <<\EOF --#define HAVE_SPL 1 --EOF -- -- -- ext_builddir=ext/spl -- ext_srcdir=$abs_srcdir/ext/spl -- -- ac_extra= -+ LIBS=$ac_libs -+ fi - -- if test "no" != "shared" && test "no" != "yes" && test "" != "cli"; then -- PHP_SPL_SHARED=no -+ if test "$found" = "yes"; then - - -- case ext/spl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ case resolv in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lresolv $LIBS" -+ ;; - esac -- -- - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_NSEARCH 1 -+EOF -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBRESOLV 1 -+EOF - -- old_IFS=$IFS -- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do -+ ac_cv_func_res_nsearch=yes -+ else -+ - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ unset ac_cv_lib_bind_res_nsearch -+ unset ac_cv_lib_bind___res_nsearch -+ unset found -+ echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 -+echo "configure:91480: checking for res_nsearch in -lbind" >&5 -+ac_lib_var=`echo bind'_'res_nsearch | 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="-lbind $LIBS" -+cat > conftest.$ac_ext <>Makefile.objects<&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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - -- EXT_STATIC="$EXT_STATIC spl" -- if test "no" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC spl" -- fi -- else -- if test "no" = "shared" || test "no" = "yes"; then -- PHP_SPL_SHARED=yes -- -- case ext/spl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -+ echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 -+echo "configure:91519: checking for __res_nsearch in -lbind" >&5 -+ac_lib_var=`echo bind'_'__res_nsearch | 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="-lbind $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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -- old_IFS=$IFS -- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_spl="$shared_objects_spl $ac_bdir$ac_obj.lo" -+fi - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpspl.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpspl.$suffix" -+ LIBS=$ac_libs - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" - -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_RES_NSEARCH 1 - EOF - -- ;; -- *) -- -- install_modules="install-modules" -- -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/spl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/spl.so '$ext_builddir'/spl.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SPL, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_spl) $(SPL_SHARED_LIBADD)' -- ;; -- esac -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBBIND 1 -+EOF - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/spl.$suffix" -+ ac_cv_func_res_nsearch=yes - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/spl.$suffix" -- fi -+ - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_spl" -+ unset ac_cv_lib_socket_res_nsearch -+ unset ac_cv_lib_socket___res_nsearch -+ unset found -+ echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 -+echo "configure:91616: checking for res_nsearch in -lsocket" >&5 -+ac_lib_var=`echo socket'_'res_nsearch | 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="-lsocket $LIBS" -+cat > conftest.$ac_ext <>Makefile.objects<&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" - --$ext_builddir/spl.$suffix: \$(shared_objects_spl) \$(SPL_SHARED_DEPENDENCIES) -- $link_cmd -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - --EOF -+ echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 -+echo "configure:91655: checking for __res_nsearch in -lsocket" >&5 -+ac_lib_var=`echo socket'_'__res_nsearch | 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="-lsocket $LIBS" -+cat > conftest.$ac_ext <> confdefs.h <&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 -- fi -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -- if test "no" != "shared" && test "no" != "yes" && test "" = "cli"; then -- PHP_SPL_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -- -- case ext/spl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- - -+fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lsocket" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - -- old_IFS=$IFS -- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do -+ LIBS=$ac_libs -+ fi -+ -+ if test "$found" = "yes"; then -+ - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ case socket in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsocket $LIBS" -+ ;; -+ esac - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_RES_NSEARCH 1 -+EOF -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 - EOF -- done - -+ ac_cv_func_res_nsearch=yes -+ else -+ -+ : - -- EXT_STATIC="$EXT_STATIC spl" -- ;; -- *) -- -- -- case ext/spl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/spl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/spl/"; ac_bdir="ext/spl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ fi - -+ -+ fi - - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+ fi -+ -+ ;; -+ -+ esac - - -- old_IFS=$IFS -- for ac_src in php_spl.c spl_functions.c spl_engine.c spl_iterators.c spl_array.c spl_directory.c spl_exceptions.c spl_observer.c spl_dllist.c spl_heap.c spl_fixedarray.c; do -+ unset ac_cv_func_dns_search -+ unset ac_cv_func___dns_search -+ unset found - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ echo $ac_n "checking for dns_search""... $ac_c" 1>&6 -+echo "configure:91767: checking for dns_search" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dns_search(); - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+int main() { - -- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_dns_search=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_dns_search=no" -+fi -+rm -f conftest* -+fi - -+if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 -+echo "configure:91813: checking for __dns_search" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __dns_search(); - -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC spl" -- fi -- -- -- BUILD_DIR="$BUILD_DIR $ext_builddir" -- -+int main() { - -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___dns_search) || defined (__stub_____dns_search) -+choke me -+#else -+__dns_search(); -+#endif - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=spl -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+; return 0; } -+EOF -+if { (eval echo configure:91841: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func___dns_search=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func___dns_search=no" -+fi -+rm -f conftest* -+fi - -- fi -+if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ -+fi - -- -- -- header_path=ext/spl -- for header_file in php_spl.h spl_array.h spl_directory.h spl_engine.h spl_exceptions.h spl_functions.h spl_iterators.h spl_observer.h spl_dllist.h spl_heap.h spl_fixedarray.h; do -- hp_hf="$header_path/$header_file" -- -- -- unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INSTALLHEADERS$unique=set" -- -- INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" -- -- fi - -- done -- -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_DNS_SEARCH 1 -+EOF - -+ ac_cv_func_dns_search=yes -+ ;; - -- am_i_shared=$PHP_SPL_SHARED -- is_it_shared=$PHP_PCRE_SHARED -- is_it_enabled=$PHP_PCRE -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension spl to build statically, but it --depends on extension pcre, which you've configured to build shared. --You either need to build spl shared or build pcre statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension spl, which depends on extension pcre, --but you've either not enabled pcre, or have disabled it. --" 1>&2; exit 1; } -- fi -+ *) - -+ unset ac_cv_lib_resolv_dns_search -+ unset ac_cv_lib_resolv___dns_search -+ unset found -+ echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:91879: checking for dns_search in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'dns_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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - --php_with_sqlite=yes -+ echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:91918: checking for __dns_search in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'__dns_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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext <&6 --echo "configure:87214: checking for sqlite support" >&5 --# Check whether --with-sqlite or --without-sqlite was given. --if test "${with_sqlite+set}" = set; then -- withval="$with_sqlite" -- PHP_SQLITE=$withval -+int main() { -+__dns_search() -+; return 0; } -+EOF -+if { (eval echo configure:91937: \"$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 -- -- PHP_SQLITE=yes -- test "$PHP_ENABLE_ALL" && PHP_SQLITE=$PHP_ENABLE_ALL -+ 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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -+ -+fi - - --ext_output="yes, shared" --ext_shared=yes --case $PHP_SQLITE in --shared,*) -- PHP_SQLITE=`echo "$PHP_SQLITE"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SQLITE=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - -+ LIBS=$ac_libs -+ fi - -+ if test "$found" = "yes"; then -+ -+ -+ case resolv in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lresolv $LIBS" -+ ;; -+ esac - --echo "$ac_t""$ext_output" 1>&6 - -+ cat >> confdefs.h <<\EOF -+#define HAVE_DNS_SEARCH 1 -+EOF - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBRESOLV 1 -+EOF - -+ ac_cv_func_dns_search=yes -+ else -+ -+ -+ unset ac_cv_lib_bind_dns_search -+ unset ac_cv_lib_bind___dns_search -+ unset found -+ echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 -+echo "configure:92015: checking for dns_search in -lbind" >&5 -+ac_lib_var=`echo bind'_'dns_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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $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" - --php_enable_sqlite_utf8=no -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - --echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 --echo "configure:87258: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 --# Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given. --if test "${enable_sqlite_utf8+set}" = set; then -- enableval="$enable_sqlite_utf8" -- PHP_SQLITE_UTF8=$enableval -+ echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 -+echo "configure:92054: checking for __dns_search in -lbind" >&5 -+ac_lib_var=`echo bind'_'__dns_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 - else -- -- PHP_SQLITE_UTF8=no -- -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - --ext_output=$PHP_SQLITE_UTF8 --echo "$ac_t""$ext_output" 1>&6 -- -+ -+fi - - -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lbind" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - -+ LIBS=$ac_libs -+ fi - -+ if test "$found" = "yes"; then -+ -+ -+ case bind in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lbind $LIBS" -+ ;; -+ esac - - -+ cat >> confdefs.h <<\EOF -+#define HAVE_DNS_SEARCH 1 -+EOF - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBBIND 1 -+EOF - --if test "$PHP_SQLITE" != "no"; then -- if test "$PHP_PDO" != "no"; then -+ ac_cv_func_dns_search=yes -+ else - -- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:87286: checking for PDO includes" >&5 --if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then -+ -+ unset ac_cv_lib_socket_dns_search -+ unset ac_cv_lib_socket___dns_search -+ unset found -+ echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:92151: checking for dns_search in -lsocket" >&5 -+ac_lib_var=`echo socket'_'dns_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 - else -- -- echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 --echo "configure:87292: checking for PDO includes" >&5 -- if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then -- pdo_inc_path=$abs_srcdir/ext -- elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then -- pdo_inc_path=$abs_srcdir/ext -- elif test -f $prefix/include/php/ext/pdo/php_pdo_driver.h; then -- pdo_inc_path=$prefix/include/php/ext -- fi -- -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $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" - --echo "$ac_t""$pdo_inc_path" 1>&6 -- if test -n "$pdo_inc_path"; then --: -- else --echo "configure: warning: Cannot find php_pdo_driver.h." 1>&2 -- fi -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - -- if test -n "$pdo_inc_path"; then -- cat >> confdefs.h <<\EOF --#define PHP_SQLITE2_HAVE_PDO 1 -+ echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:92190: checking for __dns_search in -lsocket" >&5 -+ac_lib_var=`echo socket'_'__dns_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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $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" - -- pdo_inc_path="-I$pdo_inc_path" -- fi -- fi -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -- if test "$PHP_SQLITE" != "yes"; then -- SEARCH_PATH="/usr/local /usr" -- SEARCH_FOR="/include/sqlite.h" -- if test -r $PHP_SQLITE/; then # path given as parameter -- SQLITE_DIR=$PHP_SQLITE -- else # search default path list -- echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 --echo "configure:87326: checking for sqlite files in default path" >&5 -- for i in $SEARCH_PATH ; do -- if test -r $i/$SEARCH_FOR; then -- SQLITE_DIR=$i -- echo "$ac_t""found in $i" 1>&6 -- fi -- done -- fi - -- if test -z "$SQLITE_DIR"; then -- echo "$ac_t""not found" 1>&6 -- { echo "configure: error: Please reinstall the sqlite distribution from http://www.sqlite.org" 1>&2; exit 1; } -- fi -+fi - -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$SQLITE_DIR/$PHP_LIBDIR -lm -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lsocket" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi -+ -+ LIBS=$ac_libs - fi - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -+ if test "$found" = "yes"; then -+ - -- case $ac_ii in -+ case socket in - c|c_r|pthread*) ;; - *) -- LIBS="$LIBS -l$ac_ii" -+ LIBS="-lsocket $LIBS" - ;; - esac - - -- fi -- ;; -- esac -+ cat >> confdefs.h <<\EOF -+#define HAVE_DNS_SEARCH 1 -+EOF - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 -+EOF - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ ac_cv_func_dns_search=yes - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ : -+ - fi -+ - -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -+ fi - -+ -+ fi - -- 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" -+ esac -+ -+ -+ unset ac_cv_func_dn_expand -+ unset ac_cv_func___dn_expand -+ unset found - -- fi -+ echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 -+echo "configure:92302: checking for dn_expand" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dn_expand(); - -+int main() { - -- fi -- -- fi -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_dn_expand) || defined (__stub___dn_expand) -+choke me -+#else -+dn_expand(); -+#endif - -- ;; -- esac -- done -+; return 0; } -+EOF -+if { (eval echo configure:92330: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_dn_expand=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_dn_expand=no" -+fi -+rm -f conftest* -+fi - -- echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 --echo "configure:87438: checking for sqlite_open in -lsqlite" >&5 --ac_lib_var=`echo sqlite'_'sqlite_open | sed 'y%./+-%__p_%'` -+if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 -+echo "configure:92348: checking for __dn_expand" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __dn_expand(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___dn_expand) || defined (__stub_____dn_expand) -+choke me -+#else -+__dn_expand(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:92376: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func___dn_expand=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func___dn_expand=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ -+fi -+ -+ -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_DN_EXPAND 1 -+EOF -+ -+ ac_cv_func_dn_expand=yes -+ ;; -+ -+ *) -+ -+ unset ac_cv_lib_resolv_dn_expand -+ unset ac_cv_lib_resolv___dn_expand -+ unset found -+ echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 -+echo "configure:92414: checking for dn_expand in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'dn_expand | 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="-lsqlite $LIBS" -+LIBS="-lresolv $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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 -+echo "configure:92453: checking for __dn_expand in -lresolv" >&5 -+ac_lib_var=`echo resolv'_'__dn_expand | 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="-lresolv $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:92472: \"$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 -@@ -87468,880 +92483,1297 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- -- if test "$ext_shared" = "yes"; then -- SQLITE_SHARED_LIBADD="-lsqlite $SQLITE_SHARED_LIBADD" -- if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then -- -- if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$SQLITE_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" -- fi -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -- -- if test "$ext_shared" = "yes"; then -- SQLITE_SHARED_LIBADD="-L$ai_p $SQLITE_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SQLITE_SHARED_LIBADD="$ld_runpath_switch$ai_p $SQLITE_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 - -- fi -- else -- - -- if test -n "$SQLITE_DIR/$PHP_LIBDIR"; then -- -- if test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$SQLITE_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$SQLITE_DIR/$PHP_LIBDIR" || echo "$SQLITE_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$SQLITE_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $SQLITE_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SQLITE_DIR/$PHP_LIBDIR\"`" -- fi -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - -- -- -- -- -- 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" -- -+ LIBS=$ac_libs - fi - -- -+ if test "$found" = "yes"; then - -- fi -- -- fi - -- -- case sqlite in -+ case resolv in - c|c_r|pthread*) ;; - *) -- LIBS="-lsqlite $LIBS" -+ LIBS="-lresolv $LIBS" - ;; - esac - - -+ cat >> confdefs.h <<\EOF -+#define HAVE_DN_EXPAND 1 -+EOF - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBRESOLV 1 -+EOF - -- fi -- -- -- -- if test "$SQLITE_DIR/include" != "/usr/include"; then -- -- if test -z "$SQLITE_DIR/include" || echo "$SQLITE_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$SQLITE_DIR/include -+ ac_cv_func_dn_expand=yes - else - -- ep_dir="`echo $SQLITE_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SQLITE_DIR/include\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -- -- - -+ unset ac_cv_lib_bind_dn_expand -+ unset ac_cv_lib_bind___dn_expand -+ unset found -+ echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 -+echo "configure:92550: checking for dn_expand in -lbind" >&5 -+ac_lib_var=`echo bind'_'dn_expand | 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 -- echo "$ac_t""no" 1>&6 -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $LIBS" -+cat > conftest.$ac_ext <&2; exit 1; } -- -- -+int main() { -+dn_expand() -+; return 0; } -+EOF -+if { (eval echo configure:92569: \"$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 -+ 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" - -- SQLITE_MODULE_TYPE=external -- PHP_SQLITE_CFLAGS=$pdo_inc_path -- sqlite_extra_sources="libsqlite/src/encode.c" -- else -- # use bundled library -- -- # we only support certain lemon versions -- lemon_version_list="1.0" -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - -- # Extract the first word of "lemon", so it can be a program name with args. --set dummy lemon; ac_word=$2 --echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:87630: checking for $ac_word" >&5 --if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then -+ echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 -+echo "configure:92589: checking for __dn_expand in -lbind" >&5 -+ac_lib_var=`echo bind'_'__dn_expand | 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 -- if test -n "$LEMON"; then -- ac_cv_prog_LEMON="$LEMON" # Let the user override the test. -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $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 -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_LEMON="lemon" -- break -- fi -- done -- IFS="$ac_save_ifs" -+ 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 --LEMON="$ac_cv_prog_LEMON" --if test -n "$LEMON"; then -- echo "$ac_t""$LEMON" 1>&6 -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes - else - echo "$ac_t""no" 1>&6 -+found=no - fi - -- if test "$LEMON"; then -- echo $ac_n "checking for lemon version""... $ac_c" 1>&6 --echo "configure:87658: checking for lemon version" >&5 --if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else - -- lemon_version=`$LEMON -x 2>/dev/null | $SED -e 's/^.* //'` -- php_cv_lemon_version=invalid -- for lemon_check_version in $lemon_version_list; do -- if test "$lemon_version" = "$lemon_check_version"; then -- php_cv_lemon_version="$lemon_check_version (ok)" -- fi -- done -- - fi - --echo "$ac_t""$php_cv_lemon_version" 1>&6 -- else -- lemon_version=none -- fi -- case $php_cv_lemon_version in -- ""|invalid) -- lemon_msg="lemon versions supported for regeneration of libsqlite parsers: $lemon_version_list (found: $lemon_version)." -- echo "configure: warning: $lemon_msg" 1>&2 -- LEMON="exit 0;" -- ;; -- esac -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST LEMON" - -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lbind" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - -- SQLITE_MODULE_TYPE=builtin -- PHP_SQLITE_CFLAGS="-I@ext_srcdir@/libsqlite/src -I@ext_builddir@/libsqlite/src $pdo_inc_path" -- sqlite_extra_sources="libsqlite/src/opcodes.c \ -- libsqlite/src/parse.c libsqlite/src/encode.c \ -- libsqlite/src/auth.c libsqlite/src/btree.c libsqlite/src/build.c \ -- libsqlite/src/delete.c libsqlite/src/expr.c libsqlite/src/func.c \ -- libsqlite/src/hash.c libsqlite/src/insert.c libsqlite/src/main.c \ -- libsqlite/src/os.c libsqlite/src/pager.c \ -- libsqlite/src/printf.c libsqlite/src/random.c \ -- libsqlite/src/select.c libsqlite/src/table.c libsqlite/src/tokenize.c \ -- libsqlite/src/update.c libsqlite/src/util.c libsqlite/src/vdbe.c \ -- libsqlite/src/attach.c libsqlite/src/btree_rb.c libsqlite/src/pragma.c \ -- libsqlite/src/vacuum.c libsqlite/src/copy.c \ -- libsqlite/src/vdbeaux.c libsqlite/src/date.c \ -- libsqlite/src/where.c libsqlite/src/trigger.c" -+ LIBS=$ac_libs - fi -- sqlite_sources="sqlite.c sess_sqlite.c pdo_sqlite2.c $sqlite_extra_sources" -- -- ext_builddir=ext/sqlite -- ext_srcdir=$abs_srcdir/ext/sqlite -- -- ac_extra=`echo "$PHP_SQLITE_CFLAGS"|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SQLITE_SHARED=no -+ if test "$found" = "yes"; then - - -- case ext/sqlite in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ case bind in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lbind $LIBS" -+ ;; - esac -- -- - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ cat >> confdefs.h <<\EOF -+#define HAVE_DN_EXPAND 1 -+EOF - -- old_IFS=$IFS -- for ac_src in $sqlite_sources; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBBIND 1 -+EOF - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ ac_cv_func_dn_expand=yes -+ else -+ -+ -+ unset ac_cv_lib_socket_dn_expand -+ unset ac_cv_lib_socket___dn_expand -+ unset found -+ echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 -+echo "configure:92686: checking for dn_expand in -lsocket" >&5 -+ac_lib_var=`echo socket'_'dn_expand | 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="-lsocket $LIBS" -+cat > conftest.$ac_ext <>Makefile.objects<&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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - -- EXT_STATIC="$EXT_STATIC sqlite" -- if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" -- fi -- else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SQLITE_SHARED=yes -- -- case ext/sqlite in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -+ echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 -+echo "configure:92725: checking for __dn_expand in -lsocket" >&5 -+ac_lib_var=`echo socket'_'__dn_expand | 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="-lsocket $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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -- old_IFS=$IFS -- for ac_src in $sqlite_sources; do - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_sqlite="$shared_objects_sqlite $ac_bdir$ac_obj.lo" -+fi - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsqlite.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsqlite.$suffix" -+ LIBS=$ac_libs - fi -+ -+ if test "$found" = "yes"; then -+ - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" -+ case socket in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsocket $LIBS" -+ ;; -+ esac - -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_DN_EXPAND 1 -+EOF - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 - EOF - -- ;; -- *) -- -- install_modules="install-modules" -+ ac_cv_func_dn_expand=yes -+ else -+ -+ : - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sqlite.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sqlite.so '$ext_builddir'/sqlite.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SQLITE, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sqlite) $(SQLITE_SHARED_LIBADD)' -- ;; -- esac -+ fi -+ - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sqlite.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/sqlite.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sqlite" - -- cat >>Makefile.objects<&6 -+echo "configure:92837: checking for dn_skipname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char dn_skipname(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_dn_skipname) || defined (__stub___dn_skipname) -+choke me -+#else -+dn_skipname(); -+#endif -+ -+; return 0; } - EOF -+if { (eval echo configure:92865: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_dn_skipname=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_dn_skipname=no" -+fi -+rm -f conftest* -+fi - -- ;; -- esac -- cat >> confdefs.h <&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 -+echo "configure:92883: checking for __dn_skipname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __dn_skipname(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname) -+choke me -+#else -+__dn_skipname(); -+#endif -+ -+; return 0; } - EOF -+if { (eval echo configure:92911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func___dn_skipname=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func___dn_skipname=no" -+fi -+rm -f conftest* -+fi - -- fi -- fi -+if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ -+fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SQLITE_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -- -- -- case ext/sqlite in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_DN_SKIPNAME 1 -+EOF -+ -+ ac_cv_func_dn_skipname=yes -+ ;; - -+ *) - -+ unset ac_cv_lib_resolv_dn_skipname -+ unset ac_cv_lib_resolv___dn_skipname -+ unset found -+ echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 -+echo "configure:92949: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $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" - -- old_IFS=$IFS -- for ac_src in $sqlite_sources; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 -+echo "configure:92988: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $LIBS" -+cat > conftest.$ac_ext <>Makefile.objects<&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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -- EXT_STATIC="$EXT_STATIC sqlite" -- ;; -- *) -- -- -- case ext/sqlite in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sqlite"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sqlite/"; ac_bdir="ext/sqlite/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- - -+fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi -+ -+ LIBS=$ac_libs -+ fi - -- old_IFS=$IFS -- for ac_src in $sqlite_sources; do -+ if test "$found" = "yes"; then -+ - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ case resolv in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lresolv $LIBS" -+ ;; -+ esac - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_DN_SKIPNAME 1 - EOF -- done - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBRESOLV 1 -+EOF - -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC sqlite" -- fi -- -- -- BUILD_DIR="$BUILD_DIR $ext_builddir" -+ ac_cv_func_dn_skipname=yes -+ else -+ - -+ unset ac_cv_lib_bind_dn_skipname -+ unset ac_cv_lib_bind___dn_skipname -+ unset found -+ echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 -+echo "configure:93085: checking for dn_skipname in -lbind" >&5 -+ac_lib_var=`echo bind'_'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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $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" - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=sqlite -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - -- fi -+ echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 -+echo "configure:93124: checking for __dn_skipname in -lbind" >&5 -+ac_lib_var=`echo bind'_'__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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $LIBS" -+cat > conftest.$ac_ext <&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension sqlite, which depends on extension spl, --but you've either not enabled spl, or have disabled it. --" 1>&2; exit 1; } -- fi -- -- -- am_i_shared=$PHP_SQLITE_SHARED -- is_it_shared=$PHP_PDO_SHARED -- is_it_enabled=$PHP_PDO -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension sqlite to build statically, but it --depends on extension pdo, which you've configured to build shared. --You either need to build sqlite shared or build pdo statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -- { echo "configure: error: --You've configured extension sqlite, which depends on extension pdo, --but you've either not enabled pdo, or have disabled it. --" 1>&2; exit 1; } -- fi -- -+int main() { -+__dn_skipname() -+; return 0; } -+EOF -+if { (eval echo configure:93143: \"$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 -+ 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" - -- -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - - -- PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_SHARED_LIBADD" -+fi -+ -+ -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lbind" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - -- -- -- for header_file in $ext_builddir/libsqlite/src/sqlite.h; do -- -- -- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INSTALLHEADERS$unique=set" -- -- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -- -+ LIBS=$ac_libs - fi - -- done -+ if test "$found" = "yes"; then -+ - -+ case bind in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lbind $LIBS" -+ ;; -+ esac - -- -- if test "$SQLITE_MODULE_TYPE" = "builtin"; then -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_DN_SKIPNAME 1 -+EOF -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBBIND 1 -+EOF -+ -+ ac_cv_func_dn_skipname=yes -+ else - - -- $php_shtool mkdir -p $ext_builddir/libsqlite/src -- -+ unset ac_cv_lib_socket_dn_skipname -+ unset ac_cv_lib_socket___dn_skipname -+ unset found -+ echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 -+echo "configure:93221: checking for dn_skipname in -lsocket" >&5 -+ac_lib_var=`echo socket'_'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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $LIBS" -+cat > conftest.$ac_ext <&6 --echo "configure:88071: checking size of char *" >&5 --if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then -+int main() { -+dn_skipname() -+; return 0; } -+EOF -+if { (eval echo configure:93240: \"$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 -+ 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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 -+echo "configure:93260: checking for __dn_skipname in -lsocket" >&5 -+ac_lib_var=`echo socket'_'__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 - else -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_char_p=4 -+ ac_save_LIBS="$LIBS" -+LIBS="-lsocket $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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ -+ -+fi -+ -+ -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lsocket" -+ if test "$cross_compiling" = yes; then -+ found=no - else - cat > conftest.$ac_ext < --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(char *)); -- exit(0); --} -+main() { return (0); } - EOF --if { (eval echo configure:88090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93315: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- ac_cv_sizeof_char_p=`cat conftestval` -+ found=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- ac_cv_sizeof_char_p=0 -+ found=no - fi - rm -fr conftest* - fi - --fi --echo "$ac_t""$ac_cv_sizeof_char_p" 1>&6 --cat >> confdefs.h <> confdefs.h <<\EOF --#define SQLITE_PTR_SZ SIZEOF_CHAR_P -+#define HAVE_DN_SKIPNAME 1 - EOF - -- if test "$PHP_SQLITE_UTF8" = "yes"; then -- SQLITE_ENCODING="UTF8" -- cat >> confdefs.h <<\EOF --#define SQLITE_UTF8 1 -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 - EOF - -- else -- SQLITE_ENCODING="ISO8859" -- fi -+ ac_cv_func_dn_skipname=yes -+ else - -- PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_ENCODING" -+ : - -+ fi -+ - -- SQLITE_VERSION=`cat $ext_srcdir/libsqlite/VERSION` -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST SQLITE_VERSION" -+ fi -+ - -+ fi -+ -+ ;; -+ -+ esac - -- sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in > $ext_builddir/libsqlite/src/sqlite.h - -- if test "$ext_shared" = "no" || test "$ext_srcdir" != "$abs_srcdir"; then -- echo '#include ' > $ext_builddir/libsqlite/src/config.h -- else -- echo "#include \"$abs_builddir/config.h\"" > $ext_builddir/libsqlite/src/config.h -- fi -- -- cat >> $ext_builddir/libsqlite/src/config.h <&6 --echo "configure:88152: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "checking for res_search""... $ac_c" 1>&6 -+echo "configure:93374: checking for res_search" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char $ac_func(); -+char res_search(); - - int main() { - - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+#if defined (__stub_res_search) || defined (__stub___res_search) - choke me - #else --$ac_func(); -+res_search(); - #endif - - ; return 0; } - EOF --if { (eval echo configure:88180: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:93402: \"$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" -+ eval "ac_cv_func_res_search=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" -+ eval "ac_cv_func_res_search=no" - fi - rm -f conftest* - fi - --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <&6 -+ echo $ac_n "checking for __res_search""... $ac_c" 1>&6 -+echo "configure:93420: checking for __res_search" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __res_search(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___res_search) || defined (__stub_____res_search) -+choke me -+#else -+__res_search(); -+#endif -+ -+; return 0; } - EOF -- -+if { (eval echo configure:93448: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func___res_search=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func___res_search=no" -+fi -+rm -f conftest* -+fi -+ -+if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes - else - echo "$ac_t""no" 1>&6 -+found=no -+fi -+ - fi --done - -- for ac_hdr in time.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:88208: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_SEARCH 1 -+EOF -+ -+ ac_cv_func_res_search=yes -+ ;; -+ -+ *) -+ -+ unset ac_cv_lib_resolv_res_search -+ unset ac_cv_lib_resolv___res_search -+ unset found -+ echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:93486: 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 - else -- cat > conftest.$ac_ext < conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char res_search(); -+ -+int main() { -+res_search() -+; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:88218: \"$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 -+if { (eval echo configure:93505: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" -+ eval "ac_cv_lib_$ac_lib_var=yes" - else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* -+LIBS="$ac_save_LIBS" -+ - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 -+ -+ echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 -+echo "configure:93525: 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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lresolv $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 --done -+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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -+ -+fi - - --echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 --echo "configure:88249: checking whether flush should be called explicitly after a buffered io" >&5 --if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lresolv" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi -+ -+ LIBS=$ac_libs -+ fi -+ -+ if test "$found" = "yes"; then -+ - --if test "$cross_compiling" = yes; then -+ case resolv in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lresolv $LIBS" -+ ;; -+ esac -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_SEARCH 1 -+EOF -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBRESOLV 1 -+EOF -+ -+ ac_cv_func_res_search=yes -+ else -+ - -- ac_cv_flush_io=no -+ unset ac_cv_lib_bind_res_search -+ unset ac_cv_lib_bind___res_search -+ unset found -+ echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 -+echo "configure:93622: checking for res_search in -lbind" >&5 -+ac_lib_var=`echo bind'_'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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $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 -- cat > conftest.$ac_ext <&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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 -+echo "configure:93661: checking for __res_search in -lbind" >&5 -+ac_lib_var=`echo bind'_'__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 -+else -+ ac_save_LIBS="$LIBS" -+LIBS="-lbind $LIBS" -+cat > conftest.$ac_ext < --#include -+int main() { -+__res_search() -+; return 0; } -+EOF -+if { (eval echo configure:93680: \"$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 -+ 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" - --int main(int argc, char **argv) --{ -- char *filename = tmpnam(NULL); -- char buffer[64]; -- int result = 0; -- -- FILE *fp = fopen(filename, "wb"); -- if (NULL == fp) -- return 0; -- fputs("line 1\n", fp); -- fputs("line 2\n", fp); -- fclose(fp); -- -- fp = fopen(filename, "rb+"); -- if (NULL == fp) -- return 0; -- fgets(buffer, sizeof(buffer), fp); -- fputs("line 3\n", fp); -- rewind(fp); -- fgets(buffer, sizeof(buffer), fp); -- if (0 != strcmp(buffer, "line 1\n")) -- result = 1; -- fgets(buffer, sizeof(buffer), fp); -- if (0 != strcmp(buffer, "line 3\n")) -- result = 1; -- fclose(fp); -- unlink(filename); -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ -+ -+fi - -- exit(result); --} - -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lbind" -+ if test "$cross_compiling" = yes; then -+ found=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:93716: \"$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 -- -+ found=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- -- ac_cv_flush_io=yes -- -+ found=no - fi - rm -fr conftest* - fi - --fi -+ LIBS=$ac_libs -+ fi - --echo "$ac_t""$ac_cv_flush_io" 1>&6 --if test "$ac_cv_flush_io" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_FLUSHIO 1 -+ if test "$found" = "yes"; then -+ -+ -+ case bind in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lbind $LIBS" -+ ;; -+ esac -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_SEARCH 1 - EOF - --fi -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBBIND 1 -+EOF - --if test "$ac_cv_func_crypt" = "no"; then -- echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 --echo "configure:88326: checking for crypt in -lcrypt" >&5 --ac_lib_var=`echo crypt'_'crypt | sed 'y%./+-%__p_%'` -+ ac_cv_func_res_search=yes -+ else -+ -+ -+ unset ac_cv_lib_socket_res_search -+ unset ac_cv_lib_socket___res_search -+ unset found -+ echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:93758: 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 - else - ac_save_LIBS="$LIBS" --LIBS="-lcrypt $LIBS" -+LIBS="-lsocket $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:93777: \"$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 -@@ -88356,229 +93788,161 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- LIBS="-lcrypt $LIBS -lcrypt" -- cat >> confdefs.h <<\EOF --#define HAVE_CRYPT 1 --EOF -- -- -+ found=yes - else - echo "$ac_t""no" 1>&6 --fi - --fi -- --echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 --echo "configure:88374: checking for standard DES crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_des'+set}'`\" = set"; then -+ echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 -+echo "configure:93797: 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 - else -- -- if test "$cross_compiling" = yes; then -- -- ac_cv_crypt_des=yes -- --else -- cat > conftest.$ac_ext < conftest.$ac_ext < --#endif -- --#if HAVE_CRYPT_H --#include --#endif -- --main() { --#if HAVE_CRYPT -- exit (strcmp((char *)crypt("rasmuslerdorf","rl"),"rl.3StKT.4T8M")); --#else -- exit(0); --#endif --} -+int main() { -+__res_search() -+; return 0; } - EOF --if { (eval echo configure:88404: \"$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 -- -+if { (eval echo configure:93816: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_crypt_des=no -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" -+fi -+rm -f conftest* -+LIBS="$ac_save_LIBS" - - fi --rm -fr conftest* -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no - fi - -+ - fi - --echo "$ac_t""$ac_cv_crypt_des" 1>&6 -- --echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 --echo "configure:88425: 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 -- -- if test "$cross_compiling" = yes; then -- -- ac_cv_crypt_ext_des=no - -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lsocket" -+ if test "$cross_compiling" = yes; then -+ found=no - else - cat > conftest.$ac_ext < --#endif -- --#if HAVE_CRYPT_H --#include --#endif -- --main() { --#if HAVE_CRYPT -- exit (strcmp((char *)crypt("rasmuslerdorf","_J9..rasm"),"_J9..rasmBYk8r9AiWNc")); --#else -- exit(0); --#endif --} -+main() { return (0); } - EOF --if { (eval echo configure:88455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93852: \"$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 -- -+ found=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- -- ac_cv_crypt_ext_des=no -- -+ found=no - fi - rm -fr conftest* - fi - --fi -- --echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 -+ LIBS=$ac_libs -+ fi - --echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 --echo "configure:88476: 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 -- --if test "$cross_compiling" = yes; then -+ if test "$found" = "yes"; then -+ - -- ac_cv_crypt_md5=no -+ case socket in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsocket $LIBS" -+ ;; -+ esac - --else -- cat > conftest.$ac_ext < --#endif -+ cat >> confdefs.h <<\EOF -+#define HAVE_RES_SEARCH 1 -+EOF - --#if HAVE_CRYPT_H --#include --#endif -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBSOCKET 1 -+EOF - --main() { --#if HAVE_CRYPT -- char salt[15], answer[40]; -+ ac_cv_func_res_search=yes -+ else -+ -+ : - -- salt[0]='$'; salt[1]='1'; salt[2]='$'; -- salt[3]='r'; salt[4]='a'; salt[5]='s'; -- salt[6]='m'; salt[7]='u'; salt[8]='s'; -- salt[9]='l'; salt[10]='e'; salt[11]='$'; -- salt[12]='\0'; -- strcpy(answer,salt); -- strcat(answer,"rISCgZzpwk3UhDidwXvin0"); -- exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); --#else -- exit(0); --#endif --} --EOF --if { (eval echo configure:88515: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -+ fi - -- ac_cv_crypt_md5=yes - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ fi - -- ac_cv_crypt_md5=no -- --fi --rm -fr conftest* --fi - --fi -+ fi -+ -+ ;; -+ -+ esac - --echo "$ac_t""$ac_cv_crypt_md5" 1>&6 - --echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 --echo "configure:88536: checking for Blowfish crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_blowfish'+set}'`\" = set"; then -+echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 -+echo "configure:93905: checking whether atof() accepts NAN" >&5 -+if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - if test "$cross_compiling" = yes; then - -- ac_cv_crypt_blowfish=no -+ ac_cv_atof_accept_nan=no - - else - cat > conftest.$ac_ext < --#endif -- --#if HAVE_CRYPT_H --#include --#endif -+#include -+#include - --main() { --#if HAVE_CRYPT -- char salt[30], answer[70]; -- -- salt[0]='$'; salt[1]='2'; salt[2]='a'; salt[3]='$'; salt[4]='0'; salt[5]='7'; salt[6]='$'; salt[7]='\0'; -- strcat(salt,"rasmuslerd............"); -- strcpy(answer,salt); -- strcpy(&answer[29],"nIdrcHdxcUxWomQX9j6kvERCFjTg7Ra"); -- exit (strcmp((char *)crypt("rasmuslerdorf",salt),answer)); -+#ifdef HAVE_ISNAN -+#define zend_isnan(a) isnan(a) -+#elif defined(HAVE_FPCLASS) -+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) - #else -- exit(0); -+#define zend_isnan(a) 0 - #endif -+ -+int main(int argc, char** argv) -+{ -+ return zend_isnan(atof("NAN")) ? 0 : 1; - } -+ - EOF --if { (eval echo configure:88572: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93936: \"$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 -+ ac_cv_atof_accept_nan=yes - - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - -- ac_cv_crypt_blowfish=no -+ ac_cv_atof_accept_nan=no - - fi - rm -fr conftest* -@@ -88586,55 +93950,60 @@ fi - - fi - --echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 -+echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 -+if test "$ac_cv_atof_accept_nan" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ATOF_ACCEPTS_NAN 1 -+EOF - --echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 --echo "configure:88593: checking for SHA512 crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then -+fi -+ -+echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 -+echo "configure:93963: checking whether atof() accepts INF" >&5 -+if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - if test "$cross_compiling" = yes; then - -- ac_cv_crypt_SHA512=no -+ ac_cv_atof_accept_inf=no - - else - cat > conftest.$ac_ext < --#endif -- --#if HAVE_CRYPT_H --#include --#endif -+#include -+#include - --main() { --#if HAVE_CRYPT -- char salt[30], answer[80]; -- -- salt[0]='$'; salt[1]='6'; salt[2]='$'; salt[3]='$'; salt[4]='b'; salt[5]='a'; salt[6]='r'; salt[7]='\0'; -- strcpy(answer, salt); -- strcpy(&answer[29],"$6$$QMXjqd7rHQZPQ1yHsXkQqC1FBzDiVfTHXL.LaeDAeVV.IzMaV9VU4MQ8kPuZa2SOP1A0RPm772EaFYjpEJtdu."); -- exit (strcmp((char *)crypt("foo",salt),answer)); -+#ifdef HAVE_ISINF -+#define zend_isinf(a) isinf(a) -+#elif defined(INFINITY) -+/* Might not work, but is required by ISO C99 */ -+#define zend_isinf(a) (((a)==INFINITY)?1:0) -+#elif defined(HAVE_FPCLASS) -+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) - #else -- exit(0); -+#define zend_isinf(a) 0 - #endif -+ -+int main(int argc, char** argv) -+{ -+ return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1; - } -+ - EOF --if { (eval echo configure:88628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:93997: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - -- ac_cv_crypt_SHA512=yes -+ ac_cv_atof_accept_inf=yes - - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - -- ac_cv_crypt_SHA512=no -+ ac_cv_atof_accept_inf=no - - fi - rm -fr conftest* -@@ -88642,55 +94011,60 @@ fi - - fi - --echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6 -+echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 -+if test "$ac_cv_atof_accept_inf" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_ATOF_ACCEPTS_INF 1 -+EOF - --echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 --echo "configure:88649: checking for SHA256 crypt" >&5 --if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then -+fi -+ -+echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 -+echo "configure:94024: checking whether HUGE_VAL == INF" >&5 -+if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - - if test "$cross_compiling" = yes; then - -- ac_cv_crypt_SHA256=no -+ ac_cv_huge_val_inf=yes - - else - cat > conftest.$ac_ext < --#endif -- --#if HAVE_CRYPT_H --#include --#endif -+#include -+#include - --main() { --#if HAVE_CRYPT -- char salt[30], answer[80]; -- salt[0]='$'; salt[1]='5'; salt[2]='$'; salt[3]='$'; salt[4]='s'; salt[5]='a'; salt[6]='l'; salt[7]='t'; salt[8]='s'; salt[9]='t'; salt[10]='r'; salt[11]='i'; salt[12]='n'; salt[13]='g'; salt[14]='\0'; -- strcat(salt,""); -- strcpy(answer, salt); -- strcpy(&answer[29], "$5$saltstring$5B8vYYiY.CVt1RlTTf8KbXBH3hsxY/GNooZaBBGWEc5"); -- exit (strcmp((char *)crypt("foo",salt),answer)); -+#ifdef HAVE_ISINF -+#define zend_isinf(a) isinf(a) -+#elif defined(INFINITY) -+/* Might not work, but is required by ISO C99 */ -+#define zend_isinf(a) (((a)==INFINITY)?1:0) -+#elif defined(HAVE_FPCLASS) -+#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) - #else -- exit(0); -+#define zend_isinf(a) 0 - #endif -+ -+int main(int argc, char** argv) -+{ -+ return zend_isinf(HUGE_VAL) ? 0 : 1; - } -+ - EOF --if { (eval echo configure:88684: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:94058: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - -- ac_cv_crypt_SHA256=yes -+ ac_cv_huge_val_inf=yes - - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* - -- ac_cv_crypt_SHA256=no -+ ac_cv_huge_val_inf=no - - fi - rm -fr conftest* -@@ -88698,254 +94072,173 @@ fi - - fi - --echo "$ac_t""$ac_cv_crypt_SHA256" 1>&6 -- -- --if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then -- -- echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 --echo "configure:88708: checking whether the compiler supports __alignof__" >&5 --if eval "test \"`echo '$''{'ac_cv_alignof_exists'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- -- ac_cv_alignof_exists=yes -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- -- ac_cv_alignof_exists=no -- --fi --rm -f conftest* --fi -- --echo "$ac_t""$ac_cv_alignof_exists" 1>&6 -- if test "$ac_cv_alignof_exists" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_ALIGNOF 1 --EOF -- -- fi -- -- echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 --echo "configure:88749: checking whether the compiler supports aligned attribute" >&5 --if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- -- ac_cv_attribute_aligned=yes -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- -- ac_cv_attribute_aligned=no -- --fi --rm -f conftest* --fi -- --echo "$ac_t""$ac_cv_attribute_aligned" 1>&6 -- if test "$ac_cv_attribute_aligned" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_ATTRIBUTE_ALIGNED 1 --EOF -- -- fi -- -- -- cat >> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <> confdefs.h <&6 -+if test "$ac_cv_huge_val_inf" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_HUGE_VAL_INF 1 -+EOF -+ -+fi -+ -+echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 -+echo "configure:94085: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 -+if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -+if test "$cross_compiling" = yes; then - -+ ac_cv_huge_val_nan=yes - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+else -+ cat > conftest.$ac_ext < -+#include - -- old_IFS=$IFS -- for ac_src in crypt_freesec.c crypt_blowfish.c crypt_sha512.c crypt_sha256.c php_crypt_r.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+#ifdef HAVE_ISNAN -+#define zend_isnan(a) isnan(a) -+#elif defined(HAVE_FPCLASS) -+#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) -+#else -+#define zend_isnan(a) 0 -+#endif - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+int main(int argc, char** argv) -+{ -+#if defined(__sparc__) && !(__GNUC__ >= 3) -+ /* prevent bug #27830 */ -+ return 1; -+#else -+ return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1; -+#endif -+} - -- cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ ac_cv_huge_val_nan=yes - - else -- if test "$ac_cv_crypt_des" = "yes"; then -- ac_result=1 -- ac_crypt_des=1 -- else -- ac_result=0 -- ac_crypt_des=0 -- fi -- cat >> confdefs.h <&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ ac_cv_huge_val_nan=no -+ -+fi -+rm -fr conftest* -+fi - -+fi - -- if test "$ac_cv_crypt_blowfish" = "yes"; then -- ac_result=1 -- ac_crypt_blowfish=1 -- else -- ac_result=0 -- ac_crypt_blowfish=0 -- fi -- cat >> confdefs.h <&6 -+if test "$ac_cv_huge_val_nan" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_HUGE_VAL_NAN 1 - EOF - -+fi -+ -+echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 -+echo "configure:94148: checking whether strptime() declaration fails" >&5 -+if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+cat > conftest.$ac_ext <> confdefs.h < - -+int main() { - -- if test "$ac_cv_crypt_md5" = "yes"; then -- ac_result=1 -- ac_crypt_md5=1 -- else -- ac_result=0 -- ac_crypt_md5=0 -- fi -- cat >> confdefs.h <&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* - -+ ac_cv_strptime_decl_fails=no -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* - -- if test "$ac_cv_crypt_sha512" = "yes"; then -- ac_result=1 -- ac_crypt_sha512=1 -- else -- ac_result=0 -- ac_crypt_sha512=0 -- fi -- cat >> confdefs.h <> confdefs.h <&6 -+if test "$ac_cv_strptime_decl_fails" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_STRPTIME_DECL_FAILS 1 - EOF - -+fi - -+for ac_hdr in wchar.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:94198: 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:94208: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` - cat >> confdefs.h <&6 - fi -+done - --for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy -+for ac_func in mblen - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:88944: checking for $ac_func" >&5 -+echo "configure:94237: 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:94265: \"$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 -@@ -88992,55 +94285,15 @@ else - fi - done - --echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 --echo "configure:88997: checking for working fnmatch" >&5 --if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- # Some versions of Solaris or SCO have a broken fnmatch function. --# So we run a test program. If we are cross-compiling, take no chance. --# Thanks to John Oleynick and Franc,ois Pinard for this test. --if test "$cross_compiling" = yes; then -- ac_cv_func_fnmatch_works=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- ac_cv_func_fnmatch_works=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_func_fnmatch_works=no --fi --rm -fr conftest* --fi -- --fi -- --echo "$ac_t""$ac_cv_func_fnmatch_works" 1>&6 --if test $ac_cv_func_fnmatch_works = yes; then -- cat >> confdefs.h <<\EOF --#define HAVE_FNMATCH 1 --EOF -- --fi -- -- -- --for ac_func in fork CreateProcess -+for ac_func in mbrlen mbsinit - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:89039: checking for $ac_func" >&5 -+echo "configure:94292: 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:94320: \"$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 -@@ -89082,1243 +94335,1194 @@ if eval "test \"`echo '$ac_cv_func_'$ac_ - #define $ac_tr_func 1 - EOF - -- php_can_support_proc_open=yes -- break -+else -+ echo "$ac_t""no" 1>&6 -+fi -+done -+ -+echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 -+echo "configure:94345: checking for mbstate_t" >&5 -+if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+cat > conftest.$ac_ext < -+#endif -+ -+int main() { -+ -+int __tmp__() { mbstate_t a; } -+ -+; return 0; } -+EOF -+if { (eval echo configure:94364: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ -+ ac_cv_type_mbstate_t=yes -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ -+ ac_cv_type_mbstate_t=no -+ -+fi -+rm -f conftest* -+fi -+ -+echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6 -+if test "$ac_cv_type_mbstate_t" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_MBSTATE_T 1 -+EOF -+ -+fi -+ -+for ac_hdr in atomic.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:94392: 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:94402: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done -+ -+ -+ -+ ext_builddir=ext/standard -+ ext_srcdir=$abs_srcdir/ext/standard -+ -+ ac_extra= -+ -+ if test "" != "shared" && test "" != "yes" && test "" != "cli"; then -+ PHP_STANDARD_SHARED=no -+ -+ -+ case ext/standard in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -+ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -+ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -+ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -+ microtime.c pack.c pageinfo.c quot_print.c rand.c \ -+ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -+ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -+ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -+ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -+ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -+ filters.c proc_open.c streamsfuncs.c http.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<&6 --php_can_support_proc_open=no -+ cat >>Makefile.objects<&6 --echo "configure:89097: checking if your OS can spawn processes with inherited handles" >&5 --if test "$php_can_support_proc_open" = "yes"; then -- echo "$ac_t""yes" 1>&6 -- cat >> confdefs.h <<\EOF --#define PHP_CAN_SUPPORT_PROC_OPEN 1 - EOF - --else -- echo "$ac_t""no" 1>&6 --fi -- --if test "$PHP_SAPI" = "cgi" || test "$PHP_SAPI" = "cli" || test "$PHP_SAPI" = "embed"; then -- cat >> confdefs.h <<\EOF --#define ENABLE_CHROOT_FUNC 1 -+ ;; -+ esac -+ cat >> confdefs.h <&6 --echo "configure:89121: checking for res_nsearch" >&5 --if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char res_nsearch(); - --int main() { -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_res_nsearch) || defined (__stub___res_nsearch) --choke me --#else --res_nsearch(); --#endif - --; return 0; } -+ old_IFS=$IFS -+ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -+ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -+ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -+ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -+ microtime.c pack.c pageinfo.c quot_print.c rand.c \ -+ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -+ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -+ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -+ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -+ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -+ filters.c proc_open.c streamsfuncs.c http.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_res_nsearch=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_res_nsearch=no" --fi --rm -f conftest* --fi -+ done - --if eval "test \"`echo '$ac_cv_func_'res_nsearch`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 --echo "configure:89167: checking for __res_nsearch" >&5 --if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char __res_nsearch(); - --int main() { -+ EXT_STATIC="$EXT_STATIC standard" -+ ;; -+ *) -+ -+ -+ case ext/standard in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub___res_nsearch) || defined (__stub_____res_nsearch) --choke me --#else --__res_nsearch(); --#endif -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --; return 0; } --EOF --if { (eval echo configure:89195: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func___res_nsearch=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func___res_nsearch=no" --fi --rm -f conftest* --fi - --if eval "test \"`echo '$ac_cv_func_'__res_nsearch`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- --fi -+ old_IFS=$IFS -+ for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -+ cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -+ flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -+ info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -+ microtime.c pack.c pageinfo.c quot_print.c rand.c \ -+ soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -+ var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -+ incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -+ http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -+ var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -+ filters.c proc_open.c streamsfuncs.c http.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_RES_NSEARCH 1 -+ cat >>Makefile.objects<&6 --echo "configure:89233: checking for res_nsearch in -lresolv" >&5 --ac_lib_var=`echo resolv'_'res_nsearch | 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="-lresolv $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" -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 - -- echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6 --echo "configure:89272: checking for __res_nsearch in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__res_nsearch | 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="-lresolv $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 - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi - -- --fi - -+ src=$ext_srcdir/Makefile.frag -+ ac_srcdir=$ext_srcdir -+ ac_builddir=$ext_builddir -+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lresolv" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi - -- LIBS=$ac_libs -+ -+ for header_file in ext/standard/; do -+ -+ -+ unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" -+ -+ INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -+ - fi - -- if test "$found" = "yes"; then -- -+ done - -- case resolv in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lresolv $LIBS" -- ;; -- esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_RES_NSEARCH 1 --EOF - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF - -- ac_cv_func_res_nsearch=yes -- else -- -- -- unset ac_cv_lib_bind_res_nsearch -- unset ac_cv_lib_bind___res_nsearch -- unset found -- echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 --echo "configure:89369: checking for res_nsearch in -lbind" >&5 --ac_lib_var=`echo bind'_'res_nsearch | 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="-lbind $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" -+echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 -+echo "configure:94792: checking for Sybase-CT support" >&5 -+# Check whether --with-sybase-ct or --without-sybase-ct was given. -+if test "${with_sybase_ct+set}" = set; then -+ withval="$with_sybase_ct" -+ PHP_SYBASE_CT=$withval - 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" -+ -+ PHP_SYBASE_CT=no -+ test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL - - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 - -- echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 --echo "configure:89408: checking for __res_nsearch in -lbind" >&5 --ac_lib_var=`echo bind'_'__res_nsearch | 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="-lbind $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 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SYBASE_CT in -+shared,*) -+ PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SYBASE_CT=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - -- --fi - - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lbind" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&6 -+ -+ -+ -+ -+if test "$PHP_SYBASE_CT" != "no"; then -+ -+ if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then -+ { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } -+ fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_SYBASE_CT 1 - EOF --if { (eval echo configure:89463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi - -- LIBS=$ac_libs -- fi -+ -+ ext_builddir=ext/sybase_ct -+ ext_srcdir=$abs_srcdir/ext/sybase_ct -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SYBASE_CT_SHARED=no -+ -+ -+ case ext/sybase_ct in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ - -- if test "$found" = "yes"; then -- -+ old_IFS=$IFS -+ for ac_src in php_sybase_ct.c; do - -- case bind in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lbind $LIBS" -- ;; -- esac -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_RES_NSEARCH 1 -+ cat >>Makefile.objects<> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF - -- ac_cv_func_res_nsearch=yes -+ EXT_STATIC="$EXT_STATIC sybase_ct" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" -+ fi - else -- -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_SYBASE_CT_SHARED=yes -+ -+ case ext/sybase_ct in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ - -- unset ac_cv_lib_socket_res_nsearch -- unset ac_cv_lib_socket___res_nsearch -- unset found -- echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 --echo "configure:89505: checking for res_nsearch in -lsocket" >&5 --ac_lib_var=`echo socket'_'res_nsearch | 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="-lsocket $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" -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 - -- echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 --echo "configure:89544: checking for __res_nsearch in -lsocket" >&5 --ac_lib_var=`echo socket'_'__res_nsearch | 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="-lsocket $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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" -+ done - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -+ case $host_alias in -+ *netware*) -+ -+ install_modules="install-modules" -+ -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsybase_ct.so '$ext_builddir'/phpsybase_ct.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD)' -+ ;; -+ esac - -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" -+ fi - --fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" - -+ cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi - -- LIBS=$ac_libs -- fi -+ ;; -+ *) -+ -+ install_modules="install-modules" - -- if test "$found" = "yes"; then -- -- -- case socket in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsocket $LIBS" -- ;; -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(SYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sybase_ct.so '$ext_builddir'/sybase_ct.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYBASE_CT, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(SYBASE_CT_SHARED_LIBADD)' -+ ;; - esac - -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sybase_ct.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/sybase_ct.$suffix" -+ fi -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" - -- cat >> confdefs.h <<\EOF --#define HAVE_RES_NSEARCH 1 --EOF -+ cat >>Makefile.objects<> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 - EOF - -- ac_cv_func_res_nsearch=yes -- else -- -- : -+ ;; -+ esac -+ cat >> confdefs.h <&6 --echo "configure:89656: checking for dns_search" >&5 --if eval "test \"`echo '$''{'ac_cv_func_dns_search'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dns_search(); - --int main() { -+ old_IFS=$IFS -+ for ac_src in php_sybase_ct.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_dns_search) || defined (__stub___dns_search) --choke me --#else --dns_search(); --#endif -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - --; return 0; } -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_dns_search=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_dns_search=no" --fi --rm -f conftest* --fi -+ done - --if eval "test \"`echo '$ac_cv_func_'dns_search`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 --echo "configure:89702: checking for __dns_search" >&5 --if eval "test \"`echo '$''{'ac_cv_func___dns_search'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char __dns_search(); - --int main() { -+ EXT_STATIC="$EXT_STATIC sybase_ct" -+ ;; -+ *) -+ -+ -+ case ext/sybase_ct in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub___dns_search) || defined (__stub_____dns_search) --choke me --#else --__dns_search(); --#endif -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --; return 0; } --EOF --if { (eval echo configure:89730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func___dns_search=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func___dns_search=no" --fi --rm -f conftest* --fi - --if eval "test \"`echo '$ac_cv_func_'__dns_search`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- --fi -+ old_IFS=$IFS -+ for ac_src in php_sybase_ct.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_DNS_SEARCH 1 -+ cat >>Makefile.objects<&6 --echo "configure:89768: checking for dns_search in -lresolv" >&5 --ac_lib_var=`echo resolv'_'dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $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 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- -- echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 --echo "configure:89807: checking for __dns_search in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $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 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ -+ -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sybase_ct -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ -+ fi - - --fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST SYBASE_CT_SHARED_LIBADD" - -+ -+ if test "$PHP_SYBASE_CT" = "yes"; then -+ SYBASE_CT_INCDIR=/home/sybase/include -+ SYBASE_CT_LIBDIR=/home/sybase/lib -+ else -+ SYBASE_CT_INCDIR=$PHP_SYBASE_CT/include -+ SYBASE_CT_LIBDIR=$PHP_SYBASE_CT/lib -+ fi - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lresolv" -- if test "$cross_compiling" = yes; then -- found=no -+ echo $ac_n "checking size of long int""... $ac_c" 1>&6 -+echo "configure:95147: checking size of long int" >&5 -+if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_long_int=4 - else - cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(long int)); -+ exit(0); -+} - EOF --if { (eval echo configure:89862: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:95167: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- found=yes -+ ac_cv_sizeof_long_int=`cat conftestval` - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- found=no -+ ac_cv_sizeof_long_int=0 - fi - rm -fr conftest* - fi - -- LIBS=$ac_libs -- fi -- -- if test "$found" = "yes"; then -- -- -- case resolv in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lresolv $LIBS" -- ;; -- esac -- -- -- cat >> confdefs.h <<\EOF --#define HAVE_DNS_SEARCH 1 -+fi -+echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 -+cat >> confdefs.h <> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF - -- ac_cv_func_dns_search=yes -+ echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 -+echo "configure:95187: checking checking if we're on a 64-bit platform" >&5 -+ if test "$ac_cv_sizeof_long_int" = "4"; then -+ echo "$ac_t""no" 1>&6 -+ PHP_SYBASE_64=no - else -- -- -- unset ac_cv_lib_bind_dns_search -- unset ac_cv_lib_bind___dns_search -- unset found -- echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 --echo "configure:89904: checking for dns_search in -lbind" >&5 --ac_lib_var=`echo bind'_'dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" --cat > conftest.$ac_ext <&6 -+ PHP_SYBASE_64=yes -+ fi - --int main() { --dns_search() --; return 0; } --EOF --if { (eval echo configure:89923: \"$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 -- 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 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6 -+echo "configure:95198: checking Checking for ctpublic.h" >&5 -+ if test -f $SYBASE_CT_INCDIR/ctpublic.h; then -+ echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 -+ -+ if test "$SYBASE_CT_INCDIR" != "/usr/include"; then -+ -+ if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$SYBASE_CT_INCDIR -+ else -+ -+ ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" -+ fi - -- echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 --echo "configure:89943: checking for __dns_search in -lbind" >&5 --ac_lib_var=`echo bind'_'__dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $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 - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -+ else -+ { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } -+ fi -+ -+ echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6 -+echo "configure:95237: checking Checking Sybase libdir" >&5 -+ echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 -+ -+ echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 -+echo "configure:95241: checking Checking for Sybase platform libraries" >&5 - - --fi -+ if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && 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"; then -+ SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_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 - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lbind" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi - -- LIBS=$ac_libs -+ fi -+ - fi - -- if test "$found" = "yes"; then -+ if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then - - -- case bind in -+ case ct in - c|c_r|pthread*) ;; - *) -- LIBS="-lbind $LIBS" -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case ct in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lct $LIBS" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_DNS_SEARCH 1 --EOF -+ fi -+ ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF - -- ac_cv_func_dns_search=yes -- else -+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lct" -+ echo "$ac_t""FreeTDS: $SYBASE_CT_LIBS" 1>&6 -+ elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then - - -- unset ac_cv_lib_socket_dns_search -- unset ac_cv_lib_socket___dns_search -- unset found -- echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 --echo "configure:90040: checking for dns_search in -lsocket" >&5 --ac_lib_var=`echo socket'_'dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsocket $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 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ case sybcs64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybcs64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybcs64 $LIBS" -+ ;; -+ esac - -- echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 --echo "configure:90079: checking for __dns_search in -lsocket" >&5 --ac_lib_var=`echo socket'_'__dns_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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsocket $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 -+ ;; -+ esac - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi - -+ - --fi -+ case sybct64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybct64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybct64 $LIBS" -+ ;; -+ esac - - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lsocket" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi -+ fi -+ ;; -+ esac - -- LIBS=$ac_libs -- fi - -- if test "$found" = "yes"; then - - -- case socket in -+ case sybcomn64 in - c|c_r|pthread*) ;; - *) -- LIBS="-lsocket $LIBS" -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybcomn64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybcomn64 $LIBS" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_DNS_SEARCH 1 --EOF -+ fi -+ ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 --EOF - -- ac_cv_func_dns_search=yes -- else - -- : -- -- fi - -- -- fi -+ case sybintl64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ - -+ case sybintl64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybintl64 $LIBS" -+ ;; -+ esac - -- fi -- -- ;; -- -+ -+ fi -+ ;; - esac - - -- unset ac_cv_func_dn_expand -- unset ac_cv_func___dn_expand -- unset found -- -- echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 --echo "configure:90191: checking for dn_expand" >&5 --if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char dn_expand(); - --int main() { -+ ac_solid_uname_s=`uname -s 2>/dev/null` -+ case $ac_solid_uname_s in -+ *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define -+ *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # -+ esac -+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" -+ echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6 -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ $SYBASE_CT_LIBS -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_dn_expand) || defined (__stub___dn_expand) --choke me --#else --dn_expand(); --#endif -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - --; return 0; } --EOF --if { (eval echo configure:90219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_dn_expand=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_dn_expand=no" --fi --rm -f conftest* --fi - --if eval "test \"`echo '$ac_cv_func_'dn_expand`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 --echo "configure:90237: checking for __dn_expand" >&5 --if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char __dn_expand(); -+ fi -+ ;; -+ esac - --int main() { - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub___dn_expand) || defined (__stub_____dn_expand) --choke me --#else --__dn_expand(); --#endif -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - --; return 0; } --EOF --if { (eval echo configure:90265: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func___dn_expand=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func___dn_expand=no" --fi --rm -f conftest* --fi -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 - --if eval "test \"`echo '$ac_cv_func_'__dn_expand`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- --fi - -+ fi -+ -+ fi - -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_DN_EXPAND 1 --EOF -+ ;; -+ esac -+ done - -- ac_cv_func_dn_expand=yes -- ;; -- -- *) -- -- unset ac_cv_lib_resolv_dn_expand -- unset ac_cv_lib_resolv___dn_expand -- unset found -- echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 --echo "configure:90303: checking for dn_expand in -lresolv" >&5 --ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 -+echo "configure:95507: checking for netg_errstr in -lsybtcl64" >&5 -+ac_lib_var=`echo sybtcl64'_'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="-lresolv $LIBS" -+LIBS="-lsybtcl64 $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95526: \"$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 -@@ -90333,167 +95537,186 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ -+ case sybtcl64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybtcl64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybtcl64 $LIBS" -+ ;; -+ esac - -- echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 --echo "configure:90342: checking for __dn_expand in -lresolv" >&5 --ac_lib_var=`echo resolv'_'__dn_expand | 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="-lresolv $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 -+ ;; -+ esac - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes -+ -+ -+ - else - echo "$ac_t""no" 1>&6 --found=no --fi - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_sybtcl64_netg_errstr -+ -+ - --fi -+ case sybtcl64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybtcl64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybtcl64 $LIBS" -+ ;; -+ esac - - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lresolv" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* -+ fi -+ ;; -+ esac -+ -+ -+ -+ - fi - -- LIBS=$ac_libs -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- if test "$found" = "yes"; then -- -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- case resolv in -+ case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lresolv $LIBS" -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_DN_EXPAND 1 --EOF -+ fi -+ ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF - -- ac_cv_func_dn_expand=yes -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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" - -- unset ac_cv_lib_bind_dn_expand -- unset ac_cv_lib_bind___dn_expand -- unset found -- echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 --echo "configure:90439: checking for dn_expand in -lbind" >&5 --ac_lib_var=`echo bind'_'dn_expand | 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="-lbind $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 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ fi -+ -+ fi - -- echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 --echo "configure:90478: checking for __dn_expand in -lbind" >&5 --ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 -+echo "configure:95701: checking for insck__getVdate in -linsck64" >&5 -+ac_lib_var=`echo insck64'_'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="-lbind $LIBS" -+LIBS="-linsck64 $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95720: \"$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 -@@ -90508,89 +95731,159 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ case insck64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case insck64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-linsck64 $LIBS" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ - else - echo "$ac_t""no" 1>&6 --found=no --fi - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck64_insck__getVdate -+ - - fi - -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lbind" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - -- LIBS=$ac_libs -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - -- if test "$found" = "yes"; then - -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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" - -- case bind in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lbind $LIBS" -- ;; -- esac -+ fi - - -- cat >> confdefs.h <<\EOF --#define HAVE_DN_EXPAND 1 --EOF -+ fi -+ -+ fi - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF -+ ;; -+ esac -+ done - -- ac_cv_func_dn_expand=yes -- else -- -- -- unset ac_cv_lib_socket_dn_expand -- unset ac_cv_lib_socket___dn_expand -- unset found -- echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 --echo "configure:90575: checking for dn_expand in -lsocket" >&5 --ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 -+echo "configure:95868: checking for bsd_tcp in -linsck64" >&5 -+ac_lib_var=`echo insck64'_'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="-lsocket $LIBS" -+LIBS="-linsck64 $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:95887: \"$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 -@@ -90605,255 +95898,452 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ case insck64 in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case insck64 in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-linsck64 $LIBS" -+ ;; -+ esac - -- echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 --echo "configure:90614: checking for __dn_expand in -lsocket" >&5 --ac_lib_var=`echo socket'_'__dn_expand | 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="-lsocket $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 -+ ;; -+ esac - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes -+ -+ - else - echo "$ac_t""no" 1>&6 --found=no --fi - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck64_bsd_tcp -+ - - fi - -+ elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then -+ -+ -+ case sybcs in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybcs in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybcs $LIBS" -+ ;; -+ esac - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lsocket" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi - -- LIBS=$ac_libs -- fi -+ fi -+ ;; -+ esac -+ - -- if test "$found" = "yes"; then - - -- case socket in -+ case sybct in - c|c_r|pthread*) ;; - *) -- LIBS="-lsocket $LIBS" -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybct in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybct $LIBS" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_DN_EXPAND 1 --EOF -+ fi -+ ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 --EOF - -- ac_cv_func_dn_expand=yes -- else - -- : -- -- fi - -+ case sybcomn in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybcomn in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybcomn $LIBS" -+ ;; -+ esac - -- fi -+ -+ fi -+ ;; -+ esac -+ -+ -+ -+ -+ case sybintl in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" -+ else -+ - -+ case sybintl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybintl $LIBS" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac - -+ -+ -+ SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" -+ echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ $SYBASE_CT_LIBS -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- ;; -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ - -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; - esac - - -- unset ac_cv_func_dn_skipname -- unset ac_cv_func___dn_skipname -- unset found -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - -- echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6 --echo "configure:90726: checking for dn_skipname" >&5 --if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+set}'`\" = set"; then -+ -+ 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 -+ -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 -+echo "configure:96134: checking for netg_errstr in -lsybtcl" >&5 -+ac_lib_var=`echo sybtcl'_'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 -- cat > conftest.$ac_ext < conftest.$ac_ext < - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char dn_skipname(); -+char netg_errstr(); - - int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_dn_skipname) || defined (__stub___dn_skipname) --choke me --#else --dn_skipname(); --#endif -- -+netg_errstr() - ; return 0; } - EOF --if { (eval echo configure:90754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96153: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_func_dn_skipname=yes" -+ 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_func_dn_skipname=no" -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* --fi -+LIBS="$ac_save_LIBS" - --if eval "test \"`echo '$ac_cv_func_'dn_skipname`\" = yes"; then -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybtcl $LIBS" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ -+ - else - echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 --echo "configure:90772: checking for __dn_skipname" >&5 --if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char __dn_skipname(); - --int main() { -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_sybtcl_netg_errstr -+ -+ -+ -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybtcl $LIBS" -+ ;; -+ esac - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub___dn_skipname) || defined (__stub_____dn_skipname) --choke me --#else --__dn_skipname(); --#endif - --; return 0; } --EOF --if { (eval echo configure:90800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func___dn_skipname=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func___dn_skipname=no" --fi --rm -f conftest* -+ fi -+ ;; -+ esac -+ -+ -+ -+ - fi - --if eval "test \"`echo '$ac_cv_func_'__dn_skipname`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- --fi -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 - -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_DN_SKIPNAME 1 --EOF -+ ;; -+ esac -+ done - -- ac_cv_func_dn_skipname=yes -- ;; -- -- *) -- -- unset ac_cv_lib_resolv_dn_skipname -- unset ac_cv_lib_resolv___dn_skipname -- unset found -- echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 --echo "configure:90838: checking for dn_skipname in -lresolv" >&5 --ac_lib_var=`echo resolv'_'dn_skipname | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -+echo "configure:96328: 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="-lresolv $LIBS" -+LIBS="-linsck $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96347: \"$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 -@@ -90868,167 +96358,159 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ case insck in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case insck in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-linsck $LIBS" -+ ;; -+ esac - -- echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 --echo "configure:90877: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $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 -+ ;; -+ esac - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes -+ -+ - else - echo "$ac_t""no" 1>&6 --found=no --fi - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_insck__getVdate -+ - - fi - -- -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lresolv" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi -- -- LIBS=$ac_libs -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- if test "$found" = "yes"; then -- -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- case resolv in -+ case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lresolv $LIBS" -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_DN_SKIPNAME 1 --EOF -+ fi -+ ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF - -- ac_cv_func_dn_skipname=yes -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - -- unset ac_cv_lib_bind_dn_skipname -- unset ac_cv_lib_bind___dn_skipname -- unset found -- echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 --echo "configure:90974: checking for dn_skipname in -lbind" >&5 --ac_lib_var=`echo bind'_'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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $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 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ fi -+ -+ fi - -- echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 --echo "configure:91013: checking for __dn_skipname in -lbind" >&5 --ac_lib_var=`echo bind'_'__dn_skipname | sed 'y%./+-%__p_%'` -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -+echo "configure:96495: 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="-lbind $LIBS" -+LIBS="-linsck $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96514: \"$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 -@@ -91043,128 +96525,258 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ case insck in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case insck in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-linsck $LIBS" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ - else - echo "$ac_t""no" 1>&6 --found=no --fi - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_bsd_tcp -+ - - fi - -+ else -+ -+ -+ case cs in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case cs in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lcs $LIBS" -+ ;; -+ esac -+ - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lbind" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi -+ fi -+ ;; -+ esac - -- LIBS=$ac_libs -- fi - -- if test "$found" = "yes"; then - - -- case bind in -+ case ct in - c|c_r|pthread*) ;; - *) -- LIBS="-lbind $LIBS" -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case ct in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lct $LIBS" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_DN_SKIPNAME 1 --EOF -+ fi -+ ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 --EOF - -- ac_cv_func_dn_skipname=yes -- else - - -- unset ac_cv_lib_socket_dn_skipname -- unset ac_cv_lib_socket___dn_skipname -- unset found -- echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 --echo "configure:91110: checking for dn_skipname in -lsocket" >&5 --ac_lib_var=`echo socket'_'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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" --cat > conftest.$ac_ext <&6 -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ $SYBASE_CT_LIBS -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 - --int main() { --dn_skipname() --; return 0; } --EOF --if { (eval echo configure:91129: \"$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 -- 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 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ fi -+ -+ fi - -- echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 --echo "configure:91149: checking for __dn_skipname in -lsocket" >&5 --ac_lib_var=`echo socket'_'__dn_skipname | sed 'y%./+-%__p_%'` -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 -+echo "configure:96761: 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="-lsocket $LIBS" -+LIBS="-ltcl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96780: \"$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 -@@ -91179,218 +96791,186 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- - --fi -- -- -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lsocket" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi -- -- LIBS=$ac_libs -- fi -- -- if test "$found" = "yes"; then -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared - -+ - -- case socket in -+ case tcl in - c|c_r|pthread*) ;; - *) -- LIBS="-lsocket $LIBS" -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case tcl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-ltcl $LIBS" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_DN_SKIPNAME 1 --EOF -+ fi -+ ;; -+ esac - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 --EOF - -- ac_cv_func_dn_skipname=yes -- else - -- : -- -- fi -- -- -- fi - -+else -+ echo "$ac_t""no" 1>&6 - -- fi -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_tcl_netg_errstr -+ -+ - -- ;; -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -+ else -+ - -+ case sybtcl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lsybtcl $LIBS" -+ ;; - esac - - -+ fi -+ ;; -+ esac - - -- unset ac_cv_func_res_search -- unset ac_cv_func___res_search -- unset found -+ - -- echo $ac_n "checking for res_search""... $ac_c" 1>&6 --echo "configure:91263: checking for res_search" >&5 --if eval "test \"`echo '$''{'ac_cv_func_res_search'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char res_search(); -+fi - --int main() { -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_res_search) || defined (__stub___res_search) --choke me --#else --res_search(); --#endif -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - --; return 0; } --EOF --if { (eval echo configure:91291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func_res_search=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_res_search=no" --fi --rm -f conftest* --fi - --if eval "test \"`echo '$ac_cv_func_'res_search`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -- echo $ac_n "checking for __res_search""... $ac_c" 1>&6 --echo "configure:91309: checking for __res_search" >&5 --if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- cat > conftest.$ac_ext < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char __res_search(); -+ fi -+ ;; -+ esac - --int main() { - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub___res_search) || defined (__stub_____res_search) --choke me --#else --__res_search(); --#endif -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - --; return 0; } --EOF --if { (eval echo configure:91337: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -- rm -rf conftest* -- eval "ac_cv_func___res_search=yes" --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func___res_search=no" --fi --rm -f conftest* --fi -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 - --if eval "test \"`echo '$ac_cv_func_'__res_search`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -- --fi - -+ fi -+ -+ fi - -- case $found in -- yes) -- cat >> confdefs.h <<\EOF --#define HAVE_RES_SEARCH 1 --EOF -+ ;; -+ esac -+ done - -- ac_cv_func_res_search=yes -- ;; -- -- *) -- -- unset ac_cv_lib_resolv_res_search -- unset ac_cv_lib_resolv___res_search -- unset found -- echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 --echo "configure:91375: checking for res_search in -lresolv" >&5 --ac_lib_var=`echo resolv'_'res_search | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 -+echo "configure:96955: 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="-lresolv $LIBS" -+LIBS="-linsck $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:96974: \"$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 -@@ -91405,128 +96985,159 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ case insck in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case insck in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-linsck $LIBS" -+ ;; -+ esac - -- echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 --echo "configure:91414: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lresolv $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 -+ ;; -+ esac - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes -+ -+ - else - echo "$ac_t""no" 1>&6 --found=no --fi - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_insck__getVdate -+ - - fi - -- -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lresolv" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi -- -- LIBS=$ac_libs -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="-L$SYBASE_CT_LIBDIR" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- if test "$found" = "yes"; then -- -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- case resolv in -+ case $ac_ii in - c|c_r|pthread*) ;; - *) -- LIBS="-lresolv $LIBS" -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" - ;; - esac - - -- cat >> confdefs.h <<\EOF --#define HAVE_RES_SEARCH 1 --EOF -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBRESOLV 1 --EOF - -- ac_cv_func_res_search=yes -- else -+ fi - -- -- unset ac_cv_lib_bind_res_search -- unset ac_cv_lib_bind___res_search -- unset found -- echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 --echo "configure:91511: checking for res_search in -lbind" >&5 --ac_lib_var=`echo bind'_'res_search | sed 'y%./+-%__p_%'` -+ fi -+ -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 -+echo "configure:97122: 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="-lbind $LIBS" -+LIBS="-linsck $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:97141: \"$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 -@@ -91541,793 +97152,880 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ -+ case insck in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -+ else -+ -+ -+ case insck in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-linsck $LIBS" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ - else - echo "$ac_t""no" 1>&6 - -- echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 --echo "configure:91550: checking for __res_search in -lbind" >&5 --ac_lib_var=`echo bind'_'__res_search | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_insck_bsd_tcp -+ -+ -+fi -+ -+ fi -+fi -+ -+ -+ -+php_enable_sysvmsg=no -+ -+echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 -+echo "configure:97201: checking whether to enable System V IPC support" >&5 -+# Check whether --enable-sysvmsg or --disable-sysvmsg was given. -+if test "${enable_sysvmsg+set}" = set; then -+ enableval="$enable_sysvmsg" -+ PHP_SYSVMSG=$enableval -+else -+ -+ PHP_SYSVMSG=no -+ test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SYSVMSG in -+shared,*) -+ PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SYSVMSG=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_SYSVMSG" != "no"; then -+ ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 -+echo "configure:97244: checking for sys/msg.h" >&5 -+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_save_LIBS="$LIBS" --LIBS="-lbind $LIBS" --cat > conftest.$ac_ext < conftest.$ac_ext < - EOF --if { (eval echo configure:91569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:97254: \"$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* -- eval "ac_cv_lib_$ac_lib_var=yes" -+ eval "ac_cv_header_$ac_safe=yes" - else -+ echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ eval "ac_cv_header_$ac_safe=no" - fi - rm -f conftest* --LIBS="$ac_save_LIBS" -- - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- found=yes -+ : - else - echo "$ac_t""no" 1>&6 --found=no --fi -- -+{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } - - fi - - -- if test "$found" = "yes"; then -- ac_libs=$LIBS -- LIBS="$LIBS -lbind" -- if test "$cross_compiling" = yes; then -- found=no --else -- cat > conftest.$ac_ext <> confdefs.h <<\EOF -+#define HAVE_SYSVMSG 1 - EOF --if { (eval echo configure:91605: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi - -- LIBS=$ac_libs -- fi -+ -+ ext_builddir=ext/sysvmsg -+ ext_srcdir=$abs_srcdir/ext/sysvmsg - -- if test "$found" = "yes"; then -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SYSVMSG_SHARED=no - - -- case bind in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lbind $LIBS" -- ;; -+ case ext/sysvmsg in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - - -- cat >> confdefs.h <<\EOF --#define HAVE_RES_SEARCH 1 --EOF -+ old_IFS=$IFS -+ for ac_src in sysvmsg.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBBIND 1 -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&6 --echo "configure:91647: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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" -+ done - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- found=yes --else -- echo "$ac_t""no" 1>&6 -+ case $host_alias in -+ *netware*) -+ -+ install_modules="install-modules" - -- echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 --echo "configure:91686: 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 --else -- ac_save_LIBS="$LIBS" --LIBS="-lsocket $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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 -- found=yes --else -- echo "$ac_t""no" 1>&6 --found=no --fi -+ ;; -+ *) -+ -+ install_modules="install-modules" -+ -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/sysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(SYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/sysvmsg.so '$ext_builddir'/sysvmsg.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(SYSVMSG, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(SYSVMSG_SHARED_LIBADD)' -+ ;; -+ esac - -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvmsg.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvmsg.$suffix" -+ fi - --fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" - -+ cat >>Makefile.objects< conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- found=yes --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- found=no --fi --rm -fr conftest* --fi - -- LIBS=$ac_libs -+ ;; -+ esac -+ cat >> confdefs.h <> confdefs.h <<\EOF --#define HAVE_RES_SEARCH 1 -+ old_IFS=$IFS -+ for ac_src in sysvmsg.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<> confdefs.h <<\EOF --#define HAVE_LIBSOCKET 1 -+ cat >>Makefile.objects<&6 --echo "configure:91794: checking whether atof() accepts NAN" >&5 --if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- --if test "$cross_compiling" = yes; then -- -- ac_cv_atof_accept_nan=no -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sysvmsg -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - --else -- cat > conftest.$ac_ext < --#include -+fi - --#ifdef HAVE_ISNAN --#define zend_isnan(a) isnan(a) --#elif defined(HAVE_FPCLASS) --#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) --#else --#define zend_isnan(a) 0 --#endif - --int main(int argc, char** argv) --{ -- return zend_isnan(atof("NAN")) ? 0 : 1; --} - --EOF --if { (eval echo configure:91825: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_atof_accept_nan=yes -+php_enable_sysvsem=no - -+echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 -+echo "configure:97581: 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" -+ PHP_SYSVSEM=$enableval - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* - -- ac_cv_atof_accept_nan=no -+ PHP_SYSVSEM=no -+ test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL - - fi --rm -fr conftest* --fi - --fi - --echo "$ac_t""$ac_cv_atof_accept_nan" 1>&6 --if test "$ac_cv_atof_accept_nan" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_ATOF_ACCEPTS_NAN 1 --EOF - --fi -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SYSVSEM in -+shared,*) -+ PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SYSVSEM=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - --echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 --echo "configure:91852: checking whether atof() accepts INF" >&5 --if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- --if test "$cross_compiling" = yes; then -- -- ac_cv_atof_accept_inf=no - --else -- cat > conftest.$ac_ext < --#include -+echo "$ac_t""$ext_output" 1>&6 - --#ifdef HAVE_ISINF --#define zend_isinf(a) isinf(a) --#elif defined(INFINITY) --/* Might not work, but is required by ISO C99 */ --#define zend_isinf(a) (((a)==INFINITY)?1:0) --#elif defined(HAVE_FPCLASS) --#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) --#else --#define zend_isinf(a) 0 --#endif - --int main(int argc, char** argv) --{ -- return zend_isinf(atof("INF")) && zend_isinf(atof("-INF")) ? 0 : 1; --} - --EOF --if { (eval echo configure:91886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_atof_accept_inf=yes - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+if test "$PHP_SYSVSEM" != "no"; then -+ -+ ext_builddir=ext/sysvsem -+ ext_srcdir=$abs_srcdir/ext/sysvsem -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SYSVSEM_SHARED=no -+ -+ -+ case ext/sysvsem in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ - -- ac_cv_atof_accept_inf=no - --fi --rm -fr conftest* --fi -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --fi - --echo "$ac_t""$ac_cv_atof_accept_inf" 1>&6 --if test "$ac_cv_atof_accept_inf" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_ATOF_ACCEPTS_INF 1 -+ old_IFS=$IFS -+ for ac_src in sysvsem.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&6 --echo "configure:91913: checking whether HUGE_VAL == INF" >&5 --if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -+ EXT_STATIC="$EXT_STATIC sysvsem" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" -+ fi -+ else -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_SYSVSEM_SHARED=yes -+ -+ case ext/sysvsem in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - --if test "$cross_compiling" = yes; then - -- ac_cv_huge_val_inf=yes - --else -- cat > conftest.$ac_ext < --#include - --#ifdef HAVE_ISINF --#define zend_isinf(a) isinf(a) --#elif defined(INFINITY) --/* Might not work, but is required by ISO C99 */ --#define zend_isinf(a) (((a)==INFINITY)?1:0) --#elif defined(HAVE_FPCLASS) --#define zend_isinf(a) ((fpclass(a) == FP_PINF) || (fpclass(a) == FP_NINF)) --#else --#define zend_isinf(a) 0 --#endif -+ old_IFS=$IFS -+ for ac_src in sysvsem.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo" - --int main(int argc, char** argv) --{ -- return zend_isinf(HUGE_VAL) ? 0 : 1; --} -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -+ cat >>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_huge_val_inf=yes -+ done - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ case $host_alias in -+ *netware*) -+ -+ install_modules="install-modules" -+ -+ case $host_alias in -+ *aix*) -+ suffix=so -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvsem.so '$ext_builddir'/phpsysvsem.so' -+ ;; -+ *netware*) -+ suffix=nlm -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)' -+ ;; -+ *) -+ suffix=la -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD)' -+ ;; -+ esac -+ -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix" -+ fi - -- ac_cv_huge_val_inf=no -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" - --fi --rm -fr conftest* --fi -+ cat >>Makefile.objects<&6 --if test "$ac_cv_huge_val_inf" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_HUGE_VAL_INF 1 - EOF - --fi -- --echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 --echo "configure:91974: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 --if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- --if test "$cross_compiling" = yes; then -- -- ac_cv_huge_val_nan=yes -+ ;; -+ *) -+ -+ install_modules="install-modules" - --else -- cat > conftest.$ac_ext < --#include -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/sysvsem.$suffix" -+ else -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/sysvsem.$suffix" -+ fi -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" - --#ifdef HAVE_ISNAN --#define zend_isnan(a) isnan(a) --#elif defined(HAVE_FPCLASS) --#define zend_isnan(a) ((fpclass(a) == FP_SNAN) || (fpclass(a) == FP_QNAN)) --#else --#define zend_isnan(a) 0 --#endif -+ cat >>Makefile.objects<= 3) -- /* prevent bug #27830 */ -- return 1; --#else -- return zend_isnan(HUGE_VAL + -HUGE_VAL) ? 0 : 1; --#endif --} -+$ext_builddir/sysvsem.$suffix: \$(shared_objects_sysvsem) \$(SYSVSEM_SHARED_DEPENDENCIES) -+ $link_cmd - - EOF --if { (eval echo configure:92010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- ac_cv_huge_val_nan=yes - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- ac_cv_huge_val_nan=no -+ ;; -+ esac -+ cat >> confdefs.h <&6 --if test "$ac_cv_huge_val_nan" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_HUGE_VAL_NAN 1 --EOF -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --fi - --echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 --echo "configure:92037: checking whether strptime() declaration fails" >&5 --if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -+ old_IFS=$IFS -+ for ac_src in sysvsem.c; do - --cat > conftest.$ac_ext < -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - --int main() { -+ cat >>Makefile.objects<&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -+ EXT_STATIC="$EXT_STATIC sysvsem" -+ ;; -+ *) -+ -+ -+ case ext/sysvsem in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- ac_cv_strptime_decl_fails=no -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* - -- ac_cv_strptime_decl_fails=yes -- --fi --rm -f conftest* --fi - --echo "$ac_t""$ac_cv_strptime_decl_fails" 1>&6 --if test "$ac_cv_strptime_decl_fails" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_STRPTIME_DECL_FAILS 1 --EOF -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - --fi - --for ac_hdr in wchar.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:92087: 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:92097: \"$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* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <>Makefile.objects<&6 --fi --done -+ done - --for ac_func in mblen --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:92126: 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 < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); - --int main() { -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" -+ fi -+ -+ -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --$ac_func(); --#endif - --; return 0; } --EOF --if { (eval echo configure:92154: \"$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 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" --fi --rm -f conftest* --fi -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=sysvsem -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_SYSVSEM 1 - EOF -- --else -- echo "$ac_t""no" 1>&6 --fi --done - --for ac_func in mbrlen mbsinit --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:92181: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ echo $ac_n "checking for union semun""... $ac_c" 1>&6 -+echo "configure:97919: 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 < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); - -+#include -+#include -+#include -+ - int main() { -- --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --$ac_func(); --#endif -- -+union semun x; - ; return 0; } - EOF --if { (eval echo configure:92209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:97935: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* -- eval "ac_cv_func_$ac_func=yes" -+ -+ php_cv_semun=yes -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" -+ -+ php_cv_semun=no -+ - fi - rm -f conftest* -+ - fi - --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <&6 -+ if test "$php_cv_semun" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_SEMUN 1 - EOF -- --else -- echo "$ac_t""no" 1>&6 --fi --done - --echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 --echo "configure:92234: checking for mbstate_t" >&5 --if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- --cat > conftest.$ac_ext <> confdefs.h <<\EOF -+#define HAVE_SEMUN 0 -+EOF - --#ifdef HAVE_WCHAR_H --# include --#endif -+ fi -+fi - --int main() { - --int __tmp__() { mbstate_t a; } - --; return 0; } --EOF --if { (eval echo configure:92253: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* -- -- ac_cv_type_mbstate_t=yes -+php_enable_sysvshm=no - -+echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 -+echo "configure:97971: 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" -+ PHP_SYSVSHM=$enableval - else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* - -- ac_cv_type_mbstate_t=no -+ PHP_SYSVSHM=no -+ test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL - - fi --rm -f conftest* --fi - --echo "$ac_t""$ac_cv_type_mbstate_t" 1>&6 --if test "$ac_cv_type_mbstate_t" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_MBSTATE_T 1 --EOF - --fi - --for ac_hdr in atomic.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:92281: 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:92291: \"$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* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 --fi --done -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_SYSVSHM in -+shared,*) -+ PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_SYSVSHM=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - - - -- ext_builddir=ext/standard -- ext_srcdir=$abs_srcdir/ext/standard -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_SYSVSHM" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_SYSVSHM 1 -+EOF -+ -+ -+ ext_builddir=ext/sysvshm -+ ext_srcdir=$abs_srcdir/ext/sysvshm - - ac_extra= - -- if test "" != "shared" && test "" != "yes" && test "" != "cli"; then -- PHP_STANDARD_SHARED=no -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_SYSVSHM_SHARED=no - - -- case ext/standard in -+ case ext/sysvshm in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -92342,17 +98040,7 @@ done - - - old_IFS=$IFS -- for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -- cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -- flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -- info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -- microtime.c pack.c pageinfo.c quot_print.c rand.c \ -- soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -- var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -- incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -- http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -- var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -- filters.c proc_open.c streamsfuncs.c http.c; do -+ for ac_src in sysvshm.c; do - - IFS=. - set $ac_src -@@ -92375,18 +98063,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC standard" -- if test "" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC standard" -+ EXT_STATIC="$EXT_STATIC sysvshm" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" - fi - else -- if test "" = "shared" || test "" = "yes"; then -- PHP_STANDARD_SHARED=yes -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_SYSVSHM_SHARED=yes - -- case ext/standard in -+ case ext/sysvshm in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/standard"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/standard/"; ac_bdir="ext/standard/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -92401,24 +98089,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in array.c base64.c basic_functions.c browscap.c crc32.c crypt.c \ -- cyr_convert.c datetime.c dir.c dl.c dns.c exec.c file.c filestat.c \ -- flock_compat.c formatted_print.c fsock.c head.c html.c image.c \ -- info.c iptc.c lcg.c link.c mail.c math.c md5.c metaphone.c \ -- microtime.c pack.c pageinfo.c quot_print.c rand.c \ -- soundex.c string.c scanf.c syslog.c type.c uniqid.c url.c \ -- var.c versioning.c assert.c strnatcmp.c levenshtein.c \ -- incomplete_class.c url_scanner_ex.c ftp_fopen_wrapper.c \ -- http_fopen_wrapper.c php_fopen_wrapper.c credits.c css.c \ -- var_unserializer.c ftok.c sha1.c user_filters.c uuencode.c \ -- filters.c proc_open.c streamsfuncs.c http.c; do -+ for ac_src in sysvshm.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_standard="$shared_objects_standard $ac_bdir$ac_obj.lo" -+ shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -92441,31 +98119,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpstandard.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpstandard.so '$ext_builddir'/phpstandard.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvshm.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvshm.so '$ext_builddir'/phpsysvshm.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSTANDARD, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSHM, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_standard) $(PHPSTANDARD_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvshm) $(PHPSYSVSHM_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpstandard.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvshm.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpstandard.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_standard" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 -+echo "configure:98315: checking for TIDY support" >&5 -+# Check whether --with-tidy or --without-tidy was given. -+if test "${with_tidy+set}" = set; then -+ withval="$with_tidy" -+ PHP_TIDY=$withval -+else -+ -+ PHP_TIDY=no -+ test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_TIDY in -+shared,*) -+ PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_TIDY=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_TIDY" != "no"; then -+ -+ if test "$PHP_TIDY" != "yes"; then -+ TIDY_SEARCH_DIRS=$PHP_TIDY -+ else -+ TIDY_SEARCH_DIRS="/usr/local /usr" -+ fi -+ -+ for i in $TIDY_SEARCH_DIRS; do -+ if test -f $i/include/tidy/tidy.h; then -+ TIDY_DIR=$i -+ TIDY_INCDIR=$i/include/tidy -+ elif test -f $i/include/tidy.h; then -+ TIDY_DIR=$i -+ TIDY_INCDIR=$i/include -+ fi -+ done -+ -+ if test -z "$TIDY_DIR"; then -+ { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } -+ fi -+ -+ TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" -+ if test -n "$TIDY_LIBDIR"; then -+ -+ if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$TIDY_LIBDIR -+ else -+ -+ ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_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 "$TIDY_LIBDIR"; then -+ -+ if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$TIDY_LIBDIR -+ else -+ -+ ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" - fi -+ -+ -+ - - -- BUILD_DIR="$BUILD_DIR $ext_builddir" -+ 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 - - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=standard - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ fi - - fi -+ -+ -+ case tidy in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-ltidy $LIBS" -+ ;; -+ esac - - - -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -+ -+ fi - - - -- for header_file in ext/standard/; do -- -+ if test "$TIDY_INCDIR" != "/usr/include"; then -+ -+ if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$TIDY_INCDIR -+ else -+ -+ ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" -+ fi -+ -+ - -- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INSTALLHEADERS$unique=set" -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi - -- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -- - fi - -- done -- -+ fi - - -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="" -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - --php_with_sybase_ct=no - --echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 --echo "configure:92681: checking for Sybase-CT support" >&5 --# Check whether --with-sybase-ct or --without-sybase-ct was given. --if test "${with_sybase_ct+set}" = set; then -- withval="$with_sybase_ct" -- PHP_SYBASE_CT=$withval --else -- -- PHP_SYBASE_CT=no -- test "$PHP_ENABLE_ALL" && PHP_SYBASE_CT=$PHP_ENABLE_ALL -+ fi -+ ;; -+ esac - --fi - -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 - --ext_output="yes, shared" --ext_shared=yes --case $PHP_SYBASE_CT in --shared,*) -- PHP_SYBASE_CT=`echo "$PHP_SYBASE_CT"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SYBASE_CT=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac - -+ fi -+ -+ fi - -+ ;; -+ esac -+ done - --echo "$ac_t""$ext_output" 1>&6 -+ echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 -+echo "configure:98604: checking for tidyOptGetDoc in -ltidy" >&5 -+ac_lib_var=`echo tidy'_'tidyOptGetDoc | 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="-ltidy $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_TIDYOPTGETDOC 1 -+EOF - -+ -+ -+else -+ echo "$ac_t""no" 1>&6 - --if test "$PHP_SYBASE_CT" != "no"; then -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_tidy_tidyOptGetDoc -+ -+ -+fi - -- if test "$PHP_SYBASE" && test "$PHP_SYBASE" != "no" && test "$ext_shared" = "no"; then -- { echo "configure: error: You can not use both --with-sybase and --with-sybase-ct in same build!" 1>&2; exit 1; } -- fi - -- cat >> confdefs.h <<\EOF --#define HAVE_SYBASE_CT 1 --EOF - - -- ext_builddir=ext/sybase_ct -- ext_srcdir=$abs_srcdir/ext/sybase_ct -+ ext_builddir=ext/tidy -+ ext_srcdir=$abs_srcdir/ext/tidy - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYBASE_CT_SHARED=no -+ PHP_TIDY_SHARED=no - - -- case ext/sybase_ct in -+ case ext/tidy in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -92755,7 +98684,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in php_sybase_ct.c; do -+ for ac_src in tidy.c; do - - IFS=. - set $ac_src -@@ -92778,18 +98707,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC sybase_ct" -+ EXT_STATIC="$EXT_STATIC tidy" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sybase_ct" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SYBASE_CT_SHARED=yes -+ PHP_TIDY_SHARED=yes - -- case ext/sybase_ct in -+ case ext/tidy in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sybase_ct"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sybase_ct/"; ac_bdir="ext/sybase_ct/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -92804,14 +98733,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in php_sybase_ct.c; do -+ for ac_src in tidy.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_sybase_ct="$shared_objects_sybase_ct $ac_bdir$ac_obj.lo" -+ shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -92834,31 +98763,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsybase_ct.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsybase_ct.so '$ext_builddir'/phpsybase_ct.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptidy.so '$ext_builddir'/phptidy.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYBASE_CT, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sybase_ct) $(PHPSYBASE_CT_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsybase_ct.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsybase_ct.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sybase_ct" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<&6 --echo "configure:93036: checking size of long int" >&5 --if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_long_int=4 --else -- cat > conftest.$ac_ext < --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(long int)); -- exit(0); --} --EOF --if { (eval echo configure:93055: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- ac_cv_sizeof_long_int=`cat conftestval` --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_long_int=0 --fi --rm -fr conftest* --fi -- --fi --echo "$ac_t""$ac_cv_sizeof_long_int" 1>&6 --cat >> confdefs.h <&6 --echo "configure:93075: checking checking if we're on a 64-bit platform" >&5 -- if test "$ac_cv_sizeof_long_int" = "4"; then -- echo "$ac_t""no" 1>&6 -- PHP_SYBASE_64=no -- else -- echo "$ac_t""yes" 1>&6 -- PHP_SYBASE_64=yes -- fi -- -- -- echo $ac_n "checking Checking for ctpublic.h""... $ac_c" 1>&6 --echo "configure:93086: checking Checking for ctpublic.h" >&5 -- if test -f $SYBASE_CT_INCDIR/ctpublic.h; then -- echo "$ac_t""found in $SYBASE_CT_INCDIR" 1>&6 -- -- if test "$SYBASE_CT_INCDIR" != "/usr/include"; then -- -- if test -z "$SYBASE_CT_INCDIR" || echo "$SYBASE_CT_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$SYBASE_CT_INCDIR -- else -- -- ep_dir="`echo $SYBASE_CT_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$SYBASE_CT_INCDIR\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -- -- else -- { echo "configure: error: ctpublic.h missing!" 1>&2; exit 1; } -- fi -- -- echo $ac_n "checking Checking Sybase libdir""... $ac_c" 1>&6 --echo "configure:93125: checking Checking Sybase libdir" >&5 -- echo "$ac_t""Have $SYBASE_CT_LIBDIR" 1>&6 -- -- echo $ac_n "checking Checking for Sybase platform libraries""... $ac_c" 1>&6 --echo "configure:93129: checking Checking for Sybase platform libraries" >&5 -- -- -- if test "$SYBASE_CT_LIBDIR" != "/usr/$PHP_LIBDIR" && 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"; then -- SYBASE_CT_SHARED_LIBADD="-L$ai_p $SYBASE_CT_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && SYBASE_CT_SHARED_LIBADD="$ld_runpath_switch$ai_p $SYBASE_CT_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" -+ /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ - -- fi - -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - -- fi -- -- fi - -- if test -f $SYBASE_CT_INCDIR/tds.h || test -f $SYBASE_CT_INCDIR/tds_sysdep_public.h; then -- -+ old_IFS=$IFS -+ for ac_src in tidy.c; do - -- case ct in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" -- else -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- -- case ct in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lct $LIBS" -- ;; -- esac -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- fi -- ;; -- esac -+ cat >>Makefile.objects<&6 -- elif test -f $SYBASE_CT_LIBDIR/libsybct64.so && test $PHP_SYBASE_64 = "yes"; then -- -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" -+ fi - -- case sybcs64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcs64 $SYBASE_CT_SHARED_LIBADD" -- else -- - -- case sybcs64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybcs64 $LIBS" -- ;; -- esac -+ BUILD_DIR="$BUILD_DIR $ext_builddir" -+ - - -- fi -- ;; -- esac -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=tidy -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - -+ fi - -- -- -- case sybct64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybct64 $SYBASE_CT_SHARED_LIBADD" -- else -- - -- case sybct64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybct64 $LIBS" -- ;; -- esac -- -+ PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" - -- fi -- ;; -- esac -+ cat >> confdefs.h <<\EOF -+#define HAVE_TIDY 1 -+EOF - -+fi - -- -- -- case sybcomn64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcomn64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybcomn64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybcomn64 $LIBS" -- ;; -- esac - - -- fi -- ;; -- esac - -+php_enable_tokenizer=yes - -- -- -- case sybintl64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybintl64 $SYBASE_CT_SHARED_LIBADD" -- else -- -+echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 -+echo "configure:98967: checking whether to enable tokenizer support" >&5 -+# Check whether --enable-tokenizer or --disable-tokenizer was given. -+if test "${enable_tokenizer+set}" = set; then -+ enableval="$enable_tokenizer" -+ PHP_TOKENIZER=$enableval -+else - -- case sybintl64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybintl64 $LIBS" -- ;; -- esac -+ PHP_TOKENIZER=yes -+ test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL - -+fi - -- fi -- ;; -- esac - - -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_TOKENIZER in -+shared,*) -+ PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_TOKENIZER=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - -- ac_solid_uname_s=`uname -s 2>/dev/null` -- case $ac_solid_uname_s in -- *OSF*) ;; # Tru64/DEC OSF does NOT use the SYB_LP64 define -- *) CFLAGS="${CFLAGS} -DSYB_LP64" ;; # -- esac -- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs64 -lsybct64 -lsybcomn64 -lsybintl64" -- echo "$ac_t""Sybase64: $SYBASE_CT_LIBS" 1>&6 -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SYBASE_CT_LIBS -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac - -+echo "$ac_t""$ext_output" 1>&6 - -- fi -- ;; -- esac - - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi - -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -+if test "$PHP_TOKENIZER" != "no"; then - -+ ext_builddir=ext/tokenizer -+ ext_srcdir=$abs_srcdir/ext/tokenizer -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_TOKENIZER_SHARED=no -+ - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ case ext/tokenizer in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- 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 - -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - -- fi -- -- fi - -- ;; -- esac -- done -+ old_IFS=$IFS -+ for ac_src in tokenizer.c tokenizer_data.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 --echo "configure:93395: checking for netg_errstr in -lsybtcl64" >&5 --ac_lib_var=`echo sybtcl64'_'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="-lsybtcl64 $LIBS" --cat > conftest.$ac_ext <>Makefile.objects<&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 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl64 $LIBS" -- ;; -- esac -+ done - - -+ EXT_STATIC="$EXT_STATIC tokenizer" -+ if test "$ext_shared" != "nocli"; then -+ EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" - fi -- ;; -+ else -+ if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -+ PHP_TOKENIZER_SHARED=yes -+ -+ case ext/tokenizer in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac -+ -+ - -+ b_c_pre=$shared_c_pre -+ b_cxx_pre=$shared_cxx_pre -+ b_c_meta=$shared_c_meta -+ b_cxx_meta=$shared_cxx_meta -+ b_c_post=$shared_c_post -+ b_cxx_post=$shared_cxx_post -+ b_lo=$shared_lo - -- -- --else -- echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_sybtcl64_netg_errstr -- -- -+ old_IFS=$IFS -+ for ac_src in tokenizer.c tokenizer_data.c; do - -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl64 $SYBASE_CT_SHARED_LIBADD" -- else -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -- -- case sybtcl64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl64 $LIBS" -- ;; -- esac -+ shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" - -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- fi -- ;; -- esac -+ cat >>Makefile.objects<>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tokenizer.$suffix" - else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/tokenizer.$suffix" - fi -- -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- 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 -- -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" - -- fi -- -- fi -+ cat >>Makefile.objects<&6 --echo "configure:93589: checking for insck__getVdate in -linsck64" >&5 --ac_lib_var=`echo insck64'_'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="-linsck64 $LIBS" --cat > conftest.$ac_ext <> confdefs.h <&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 -+ fi -+ fi -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -+ PHP_TOKENIZER_SHARED=no -+ case "$PHP_SAPI" in -+ cgi|embed) -+ - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -+ case ext/tokenizer in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" -- else -- - -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck64 $LIBS" -- ;; -- esac -- - -- fi -- ;; -- esac -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - - -+ old_IFS=$IFS -+ for ac_src in tokenizer.c tokenizer_data.c; do - --else -- echo "$ac_t""no" 1>&6 -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck64_insck__getVdate -- -- --fi -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -+ cat >>Makefile.objects<>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ;; -+ esac -+ EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" - fi -- -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- 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" -+ BUILD_DIR="$BUILD_DIR $ext_builddir" - -- fi - - -- fi -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=tokenizer - -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ - fi - -- ;; -- esac -- done -+ -+ src=$ext_srcdir/Makefile.frag -+ ac_srcdir=$ext_srcdir -+ ac_builddir=$ext_builddir -+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments - -- echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 --echo "configure:93756: checking for bsd_tcp in -linsck64" >&5 --ac_lib_var=`echo insck64'_'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="-linsck64 $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" -+ -+ -+php_enable_wddx=no -+ -+echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 -+echo "configure:99313: 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 - 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" -+ -+ PHP_WDDX=no -+ test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL - - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck64 $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case insck64 in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck64 $LIBS" -- ;; -- esac - - -- fi -- ;; -- esac -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_WDDX in -+shared,*) -+ PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_WDDX=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - - -- --else -- echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck64_bsd_tcp -- -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test -z "$PHP_LIBXML_DIR"; then - --fi -+php_with_libxml_dir=no - -- elif test -f $SYBASE_CT_LIBDIR/libsybct.so; then -- -+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:99358: checking libxml2 install dir" >&5 -+# Check whether --with-libxml-dir or --without-libxml-dir was given. -+if test "${with_libxml_dir+set}" = set; then -+ withval="$with_libxml_dir" -+ PHP_LIBXML_DIR=$withval -+else - -- case sybcs in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcs $SYBASE_CT_SHARED_LIBADD" -- else -- -+ PHP_LIBXML_DIR=no - -- case sybcs in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybcs $LIBS" -- ;; -- esac - -+fi - -- fi -- ;; -- esac - -+ext_output=$PHP_LIBXML_DIR -+echo "$ac_t""$ext_output" 1>&6 - -- -- -- case sybct in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybct $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybct in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybct $LIBS" -- ;; -- esac - - -- fi -- ;; -- esac -+fi - - -- -+php_with_libexpat_dir=no -+ -+echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 -+echo "configure:99382: checking libexpat dir for WDDX" >&5 -+# Check whether --with-libexpat-dir or --without-libexpat-dir was given. -+if test "${with_libexpat_dir+set}" = set; then -+ withval="$with_libexpat_dir" -+ PHP_LIBEXPAT_DIR=$withval -+else - -- case sybcomn in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybcomn $SYBASE_CT_SHARED_LIBADD" -- else -- -+ PHP_LIBEXPAT_DIR=no - -- case sybcomn in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybcomn $LIBS" -- ;; -- esac - -+fi - -- fi -- ;; -- esac - -+ext_output=$PHP_LIBEXPAT_DIR -+echo "$ac_t""$ext_output" 1>&6 - -- -- -- case sybintl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybintl $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case sybintl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybintl $LIBS" -- ;; -- esac - - -- fi -- ;; -- esac - -+if test "$PHP_WDDX" != "no"; then -+ -+ if test "$PHP_LIBEXPAT_DIR" = "no"; then -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi - -- -- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lsybcs -lsybct -lsybcomn -lsybintl" -- echo "$ac_t""Sybase32 syb-prefix: $SYBASE_CT_LIBS" 1>&6 -- - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SYBASE_CT_LIBS -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:99410: checking for xml2-config path" >&5 -+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -- for ac_i in $ac_stuff; do -+ for i in $PHP_LIBXML_DIR /usr/local /usr; do -+ if test -x "$i/bin/xml2-config"; then -+ ac_cv_php_xml2_config_path="$i/bin/xml2-config" -+ break -+ fi -+ done -+ -+fi -+ -+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -+ -+ if test -x "$ac_cv_php_xml2_config_path"; then -+ XML2_CONFIG="$ac_cv_php_xml2_config_path" -+ libxml_full_version=`$XML2_CONFIG --version` -+ ac_IFS=$IFS -+ IFS="." -+ set $libxml_full_version -+ IFS=$ac_IFS -+ LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -+ if test "$LIBXML_VERSION" -ge "2006011"; then -+ LIBXML_LIBS=`$XML2_CONFIG --libs` -+ LIBXML_INCS=`$XML2_CONFIG --cflags` -+ -+ for ac_i in $LIBXML_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -+ WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" - else - - -@@ -93955,7 +99460,7 @@ fi - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -+ WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" - else - - -@@ -93990,8 +99495,8 @@ fi - - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" - else - - -@@ -94017,550 +99522,773 @@ fi - esac - done - -- echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 --echo "configure:94022: checking for netg_errstr in -lsybtcl" >&5 --ac_lib_var=`echo sybtcl'_'netg_errstr | sed 'y%./+-%__p_%'` --if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then -+ -+ for ac_i in $LIBXML_INCS; do -+ case $ac_i in -+ -I*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/include"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ ;; -+ esac -+ done -+ -+ -+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:99568: checking whether libxml build works" >&5 -+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_save_LIBS="$LIBS" --LIBS="-lsybtcl $LIBS" --cat > conftest.$ac_ext < 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" -+if { (eval echo configure:99595: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=yes -+ -+ - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_lib_$ac_lib_var=no" -+ rm -fr conftest* -+ -+ LIBS=$old_LIBS -+ -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ -+ -+fi -+rm -fr conftest* - 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 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -+ -+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -+ if test "$php_cv_libxml_build_works" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBXML 1 -+EOF -+ -+ fi - -+ if test "$PHP_XML" = "no"; then -+ - -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -- else -+ case ext/xml in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in compat.c; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -+ -+ fi -+ -+ fi - -+ if test "$PHP_LIBEXPAT_DIR" != "no"; then -+ for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do -+ if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then -+ EXPAT_DIR=$i -+ break -+ fi -+ done - -+ if test -z "$EXPAT_DIR"; then -+ { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } - fi -- ;; -- esac - -+ -+ if test "$EXPAT_DIR/include" != "/usr/include"; then -+ -+ if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$EXPAT_DIR/include -+ else -+ -+ ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" -+ fi - - - --else -- echo "$ac_t""no" 1>&6 -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_sybtcl_netg_errstr -- -+ fi -+ -+ -+ -+ if test "$ext_shared" = "yes"; then -+ WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD" -+ if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then - -+ if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EXPAT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" -+ else -+ - -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_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 "$EXPAT_DIR/$PHP_LIBDIR"; then -+ -+ if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EXPAT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ - - -- case sybtcl in -+ -+ 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 -+ -+ -+ case expat in - c|c_r|pthread*) ;; - *) -- LIBS="-lsybtcl $LIBS" -+ LIBS="-lexpat $LIBS" - ;; - esac - - -- fi -- ;; -- esac - - -- -- --fi -+ fi -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBEXPAT 1 -+EOF -+ -+ fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_WDDX 1 -+EOF - - -+ ext_builddir=ext/wddx -+ ext_srcdir=$abs_srcdir/ext/wddx -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_WDDX_SHARED=no - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" - -- save_ext_shared=$ext_shared -- ext_shared=yes -+ case ext/wddx in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in wddx.c; do - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+EOF -+ -+ ;; -+ esac -+ cat >> confdefs.h <&6 --echo "configure:94216: 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 <>Makefile.objects<&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" -+ done - --fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -+ -+ EXT_STATIC="$EXT_STATIC wddx" -+ ;; -+ *) -+ - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -+ case ext/wddx in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- case insck in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -- else -- - -- case insck in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck $LIBS" -- ;; -- esac -- - -- fi -- ;; -- esac -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - - -+ old_IFS=$IFS -+ for ac_src in wddx.c; do - --else -- echo "$ac_t""no" 1>&6 -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_insck__getVdate -- -- --fi -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac - -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -+ cat >>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=wddx - -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ - fi - -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- - -+ am_i_shared=$PHP_WDDX_SHARED -+ is_it_shared=$PHP_LIBXML_SHARED -+ is_it_enabled=$PHP_LIBXML -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension wddx to build statically, but it -+depends on extension libxml, which you've configured to build shared. -+You either need to build wddx shared or build libxml statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension wddx, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } -+ fi - -- 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 -+ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" - -+fi - -- fi -- -- fi - -- ;; -- esac -- done - -- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 --echo "configure:94383: 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" -+echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 -+echo "configure:100162: checking whether to enable 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 - 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" -+ -+ PHP_XML=yes -+ test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL - - fi --if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck $LIBS" -- ;; -- esac - - -- fi -- ;; -- esac -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_XML in -+shared,*) -+ PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_XML=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac - - -- --else -- echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_bsd_tcp -- -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test -z "$PHP_LIBXML_DIR"; then - --fi -+php_with_libxml_dir=no - -- else -- -+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:100207: checking libxml2 install dir" >&5 -+# Check whether --with-libxml-dir or --without-libxml-dir was given. -+if test "${with_libxml_dir+set}" = set; then -+ withval="$with_libxml_dir" -+ PHP_LIBXML_DIR=$withval -+else - -- case cs in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lcs $SYBASE_CT_SHARED_LIBADD" -- else -- -+ PHP_LIBXML_DIR=no - -- case cs in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lcs $LIBS" -- ;; -- esac - -+fi - -- fi -- ;; -- esac - -+ext_output=$PHP_LIBXML_DIR -+echo "$ac_t""$ext_output" 1>&6 - -- -- -- case ct in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lct $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case ct in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lct $LIBS" -- ;; -- esac - - -- fi -- ;; -- esac -+fi - - -- -+php_with_libexpat_dir=no -+ -+echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 -+echo "configure:100231: checking libexpat install dir" >&5 -+# Check whether --with-libexpat-dir or --without-libexpat-dir was given. -+if test "${with_libexpat_dir+set}" = set; then -+ withval="$with_libexpat_dir" -+ PHP_LIBEXPAT_DIR=$withval -+else - -- case comn in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lcomn $SYBASE_CT_SHARED_LIBADD" -- else -- -+ PHP_LIBEXPAT_DIR=no - -- case comn in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lcomn $LIBS" -- ;; -- esac - -+fi - -- fi -- ;; -- esac - -+ext_output=$PHP_LIBEXPAT_DIR -+echo "$ac_t""$ext_output" 1>&6 - -- -- -- case intl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lintl $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case intl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lintl $LIBS" -- ;; -- esac - - -+ -+if test "$PHP_XML" != "no"; then -+ -+ if test "$PHP_LIBEXPAT_DIR" = "no"; then -+ -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi -+ -+ -+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:100260: checking for xml2-config path" >&5 -+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ for i in $PHP_LIBXML_DIR /usr/local /usr; do -+ if test -x "$i/bin/xml2-config"; then -+ ac_cv_php_xml2_config_path="$i/bin/xml2-config" -+ break - fi -- ;; -- esac -+ done - -+fi - -- -- SYBASE_CT_LIBS="-L$SYBASE_CT_LIBDIR -lcs -lct -lcomn -lintl" -- echo "$ac_t""Sybase32 default: $SYBASE_CT_LIBS" 1>&6 -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- $SYBASE_CT_LIBS -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -+ -+ if test -x "$ac_cv_php_xml2_config_path"; then -+ XML2_CONFIG="$ac_cv_php_xml2_config_path" -+ libxml_full_version=`$XML2_CONFIG --version` -+ ac_IFS=$IFS -+ IFS="." -+ set $libxml_full_version -+ IFS=$ac_IFS -+ LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -+ if test "$LIBXML_VERSION" -ge "2006011"; then -+ LIBXML_LIBS=`$XML2_CONFIG --libs` -+ LIBXML_INCS=`$XML2_CONFIG --cflags` -+ -+ for ac_i in $LIBXML_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -+ XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread" - else - - -@@ -94582,7 +100310,7 @@ fi - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -+ XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" - else - - -@@ -94617,8 +100345,8 @@ fi - - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" - else - - -@@ -94644,160 +100372,13 @@ fi - esac - done - -- echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 --echo "configure:94649: 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 $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 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- -- case tcl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-ltcl $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case tcl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-ltcl $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- -- --else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_tcl_netg_errstr -- -- -- -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-lsybtcl $SYBASE_CT_SHARED_LIBADD" -- else - -- -- case sybtcl in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lsybtcl $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- -- --fi -- -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -+ for ac_i in $LIBXML_INCS; do - case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- ;; -- -L*) -+ -I*) - ac_ii=`echo $ac_i|cut -c 3-` - -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ if test "$ac_ii" != "/usr/include"; then - - if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then - ai_p=$ac_ii -@@ -94810,176 +100391,187 @@ fi - fi - - -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -- - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -+ eval "INCLUDEPATH$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 -- -- -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" - fi - - fi - -+ fi -+ - ;; - esac - done - -- echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 --echo "configure:94843: 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 "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:100418: checking whether libxml build works" >&5 -+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- ac_save_LIBS="$LIBS" --LIBS="-linsck $LIBS" --cat > conftest.$ac_ext < 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" -+if { (eval echo configure:100445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=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 -+ rm -fr conftest* - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -+ LIBS=$old_LIBS - -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ - -- case insck in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -- else -+fi -+rm -fr conftest* -+fi -+ -+ - -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck $LIBS" -- ;; -- esac -+fi - -+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -+ if test "$php_cv_libxml_build_works" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBXML 1 -+EOF - -+ fi -+ -+ xml_extra_sources="compat.c" -+ -+ am_i_shared=$PHP_XML_SHARED -+ is_it_shared=$PHP_LIBXML_SHARED -+ is_it_enabled=$PHP_LIBXML -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension xml to build statically, but it -+depends on extension libxml, which you've configured to build shared. -+You either need to build xml shared or build libxml statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension xml, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ else -+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } - fi -- ;; -- esac -- -+else -+ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -+ -+ fi - -+ fi - --else -- echo "$ac_t""no" 1>&6 -+ if test "$PHP_LIBEXPAT_DIR" != "no"; then -+ for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do -+ if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then -+ EXPAT_DIR=$i -+ break -+ fi -+ done -+ -+ if test -z "$EXPAT_DIR"; then -+ { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } -+ fi - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_insck__getVdate - -- --fi -+ if test "$EXPAT_DIR/include" != "/usr/include"; then -+ -+ if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$EXPAT_DIR/include -+ else -+ -+ ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" -+ fi - - -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff="-L$SYBASE_CT_LIBDIR" -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" - fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -+ -+ fi - -- fi -- ;; -- esac -+ fi - -+ - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -+ if test "$ext_shared" = "yes"; then -+ XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" -+ if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then - -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EXPAT_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" - else - - -@@ -94997,189 +100589,84 @@ fi - fi - - -- fi -- -- fi -- -- ;; -- esac -- done -- -- echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 --echo "configure:95010: 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 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- SYBASE_CT_SHARED_LIBADD="-linsck $SYBASE_CT_SHARED_LIBADD" -- else -- -- -- case insck in -- c|c_r|pthread*) ;; -- *) -- LIBS="-linsck $LIBS" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- --else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_insck_bsd_tcp -- -- --fi -- -- fi --fi -- -- -- --php_enable_sysvmsg=no -+ fi -+ -+ fi - --echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 --echo "configure:95089: checking whether to enable System V IPC support" >&5 --# Check whether --enable-sysvmsg or --disable-sysvmsg was given. --if test "${enable_sysvmsg+set}" = set; then -- enableval="$enable_sysvmsg" -- PHP_SYSVMSG=$enableval --else -- -- PHP_SYSVMSG=no -- test "$PHP_ENABLE_ALL" && PHP_SYSVMSG=$PHP_ENABLE_ALL -+ fi -+ else -+ - --fi -+ if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -+ -+ if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EXPAT_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ fi - -+ -+ -+ -+ -+ 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 - - --ext_output="yes, shared" --ext_shared=yes --case $PHP_SYSVMSG in --shared,*) -- PHP_SYSVMSG=`echo "$PHP_SYSVMSG"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_SYSVMSG=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -+ -+ fi - -+ fi -+ -+ -+ case expat in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lexpat $LIBS" -+ ;; -+ esac - - --echo "$ac_t""$ext_output" 1>&6 - - -+ fi - - --if test "$PHP_SYSVMSG" != "no"; then -- ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 --echo "configure:95132: checking for sys/msg.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 < -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBEXPAT 1 - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:95142: \"$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* -- eval "ac_cv_header_$ac_safe=yes" --else -- echo "$ac_err" >&5 -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" --fi --rm -f conftest* --fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -- echo "$ac_t""yes" 1>&6 -- : --else -- echo "$ac_t""no" 1>&6 --{ echo "configure: error: Cannot enable System V IPC support, sys/msg.h is missing" 1>&2; exit 1; } -- --fi -- - -- cat >> confdefs.h <<\EOF --#define HAVE_SYSVMSG 1 --EOF -+ fi - - -- ext_builddir=ext/sysvmsg -- ext_srcdir=$abs_srcdir/ext/sysvmsg -+ ext_builddir=ext/xml -+ ext_srcdir=$abs_srcdir/ext/xml - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYSVMSG_SHARED=no -+ PHP_XML_SHARED=no - - -- case ext/sysvmsg in -+ case ext/xml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -95194,7 +100681,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in sysvmsg.c; do -+ for ac_src in xml.c $xml_extra_sources; do - - IFS=. - set $ac_src -@@ -95217,18 +100704,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC sysvmsg" -+ EXT_STATIC="$EXT_STATIC xml" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvmsg" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xml" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SYSVMSG_SHARED=yes -+ PHP_XML_SHARED=yes - -- case ext/sysvmsg in -+ case ext/xml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvmsg"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvmsg/"; ac_bdir="ext/sysvmsg/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -95243,14 +100730,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in sysvmsg.c; do -+ for ac_src in xml.c $xml_extra_sources; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_sysvmsg="$shared_objects_sysvmsg $ac_bdir$ac_obj.lo" -+ shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -95273,31 +100760,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvmsg.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvmsg.so '$ext_builddir'/phpsysvmsg.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxml.so '$ext_builddir'/phpxml.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVMSG, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvmsg) $(PHPSYSVMSG_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvmsg.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvmsg.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvmsg" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_XML 1 -+EOF -+ - fi - - - --php_enable_sysvsem=no -+php_enable_xmlreader=yes - --echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 --echo "configure:95469: 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" -- PHP_SYSVSEM=$enableval -+echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 -+echo "configure:100981: checking whether to enable XMLReader support" >&5 -+# Check whether --enable-xmlreader or --disable-xmlreader was given. -+if test "${enable_xmlreader+set}" = set; then -+ enableval="$enable_xmlreader" -+ PHP_XMLREADER=$enableval - else - -- PHP_SYSVSEM=no -- test "$PHP_ENABLE_ALL" && PHP_SYSVSEM=$PHP_ENABLE_ALL -+ PHP_XMLREADER=yes -+ test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL - - fi - -@@ -95481,12 +100993,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_SYSVSEM in -+case $PHP_XMLREADER in - shared,*) -- PHP_SYSVSEM=`echo "$PHP_SYSVSEM"|$SED 's/^shared,//'` -+ PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'` - ;; - shared) -- PHP_SYSVSEM=yes -+ PHP_XMLREADER=yes - ;; - no) - ext_output=no -@@ -95505,21 +101017,277 @@ echo "$ac_t""$ext_output" 1>&6 - - - --if test "$PHP_SYSVSEM" != "no"; then -- -- ext_builddir=ext/sysvsem -- ext_srcdir=$abs_srcdir/ext/sysvsem -+if test -z "$PHP_LIBXML_DIR"; then -+ -+php_with_libxml_dir=no -+ -+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:101026: checking libxml2 install dir" >&5 -+# Check whether --with-libxml-dir or --without-libxml-dir was given. -+if test "${with_libxml_dir+set}" = set; then -+ withval="$with_libxml_dir" -+ PHP_LIBXML_DIR=$withval -+else -+ -+ PHP_LIBXML_DIR=no -+ -+ -+fi -+ -+ -+ext_output=$PHP_LIBXML_DIR -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+fi -+ -+if test "$PHP_XMLREADER" != "no"; then -+ -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi -+ -+ -+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:101054: checking for xml2-config path" >&5 -+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ for i in $PHP_LIBXML_DIR /usr/local /usr; do -+ if test -x "$i/bin/xml2-config"; then -+ ac_cv_php_xml2_config_path="$i/bin/xml2-config" -+ break -+ fi -+ done -+ -+fi -+ -+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -+ -+ if test -x "$ac_cv_php_xml2_config_path"; then -+ XML2_CONFIG="$ac_cv_php_xml2_config_path" -+ libxml_full_version=`$XML2_CONFIG --version` -+ ac_IFS=$IFS -+ IFS="." -+ set $libxml_full_version -+ IFS=$ac_IFS -+ LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -+ if test "$LIBXML_VERSION" -ge "2006011"; then -+ LIBXML_LIBS=`$XML2_CONFIG --libs` -+ LIBXML_INCS=`$XML2_CONFIG --cflags` -+ -+ for ac_i in $LIBXML_LIBS; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_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 -+ -+ ;; -+ esac -+ done -+ -+ -+ for ac_i in $LIBXML_INCS; do -+ case $ac_i in -+ -I*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/include"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ ;; -+ esac -+ done -+ -+ -+ echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 -+echo "configure:101212: checking whether libxml build works" >&5 -+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ -+ old_LIBS=$LIBS -+ LIBS=" -+ $XMLREADER_SHARED_LIBADD -+ $LIBS" -+ if test "$cross_compiling" = yes; then -+ -+ LIBS=$old_LIBS -+ -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=yes -+ -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ LIBS=$old_LIBS -+ -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ -+ -+fi -+rm -fr conftest* -+fi -+ -+ -+ -+fi -+ -+echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -+ if test "$php_cv_libxml_build_works" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBXML 1 -+EOF -+ -+ fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_XMLREADER 1 -+EOF -+ -+ -+ ext_builddir=ext/xmlreader -+ ext_srcdir=$abs_srcdir/ext/xmlreader - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYSVSEM_SHARED=no -+ PHP_XMLREADER_SHARED=no - - -- case ext/sysvsem in -+ case ext/xmlreader in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -95534,7 +101302,7 @@ if test "$PHP_SYSVSEM" != "no"; then - - - old_IFS=$IFS -- for ac_src in sysvsem.c; do -+ for ac_src in php_xmlreader.c; do - - IFS=. - set $ac_src -@@ -95557,18 +101325,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC sysvsem" -+ EXT_STATIC="$EXT_STATIC xmlreader" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvsem" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SYSVSEM_SHARED=yes -+ PHP_XMLREADER_SHARED=yes - -- case ext/sysvsem in -+ case ext/xmlreader in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvsem"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvsem/"; ac_bdir="ext/sysvsem/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -95583,14 +101351,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in sysvsem.c; do -+ for ac_src in php_xmlreader.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_sysvsem="$shared_objects_sysvsem $ac_bdir$ac_obj.lo" -+ shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -95613,31 +101381,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpsysvsem.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpsysvsem.so '$ext_builddir'/phpsysvsem.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlreader.so '$ext_builddir'/phpxmlreader.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPSYSVSEM, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_sysvsem) $(PHPSYSVSEM_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpsysvsem.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvsem.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvsem" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <> confdefs.h <<\EOF --#define HAVE_SYSVSEM 1 --EOF -- -- echo $ac_n "checking for union semun""... $ac_c" 1>&6 --echo "configure:95807: 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 <&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension xmlreader, which depends on extension dom, -+but you've either not enabled dom, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD" - --#include --#include --#include -- --int main() { --union semun x; --; return 0; } --EOF --if { (eval echo configure:95823: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -- rm -rf conftest* - -- php_cv_semun=yes -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -rf conftest* -+ else -+ { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - -- php_cv_semun=no -- --fi --rm -f conftest* -- -+ fi -+ - fi - --echo "$ac_t""$php_cv_semun" 1>&6 -- if test "$php_cv_semun" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_SEMUN 1 --EOF - -- else -- cat >> confdefs.h <<\EOF --#define HAVE_SEMUN 0 --EOF -+# Local macros for automake & autoconf - -- fi --fi - - - --php_enable_sysvshm=no - --echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 --echo "configure:95859: 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" -- PHP_SYSVSHM=$enableval -+ -+ -+ -+ -+ -+ -+ -+ -+php_with_xmlrpc=no -+ -+echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 -+echo "configure:101621: checking for XMLRPC-EPI support" >&5 -+# Check whether --with-xmlrpc or --without-xmlrpc was given. -+if test "${with_xmlrpc+set}" = set; then -+ withval="$with_xmlrpc" -+ PHP_XMLRPC=$withval - else - -- PHP_SYSVSHM=no -- test "$PHP_ENABLE_ALL" && PHP_SYSVSHM=$PHP_ENABLE_ALL -+ PHP_XMLRPC=no -+ test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL - - fi - -@@ -95871,12 +101633,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_SYSVSHM in -+case $PHP_XMLRPC in - shared,*) -- PHP_SYSVSHM=`echo "$PHP_SYSVSHM"|$SED 's/^shared,//'` -+ PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'` - ;; - shared) -- PHP_SYSVSHM=yes -+ PHP_XMLRPC=yes - ;; - no) - ext_output=no -@@ -95895,203 +101657,341 @@ echo "$ac_t""$ext_output" 1>&6 - - - --if test "$PHP_SYSVSHM" != "no"; then -- cat >> confdefs.h <<\EOF --#define HAVE_SYSVSHM 1 --EOF -+if test -z "$PHP_LIBXML_DIR"; then -+ -+php_with_libxml_dir=no - -+echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 -+echo "configure:101666: checking libxml2 install dir" >&5 -+# Check whether --with-libxml-dir or --without-libxml-dir was given. -+if test "${with_libxml_dir+set}" = set; then -+ withval="$with_libxml_dir" -+ PHP_LIBXML_DIR=$withval -+else -+ -+ PHP_LIBXML_DIR=no - -- ext_builddir=ext/sysvshm -- ext_srcdir=$abs_srcdir/ext/sysvshm - -- ac_extra= -+fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_SYSVSHM_SHARED=no -- -- -- case ext/sysvshm in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ -+ext_output=$PHP_LIBXML_DIR -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+fi -+ -+ -+php_with_libexpat_dir=no -+ -+echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6 -+echo "configure:101690: checking libexpat dir for XMLRPC-EPI" >&5 -+# Check whether --with-libexpat-dir or --without-libexpat-dir was given. -+if test "${with_libexpat_dir+set}" = set; then -+ withval="$with_libexpat_dir" -+ PHP_LIBEXPAT_DIR=$withval -+else - -+ PHP_LIBEXPAT_DIR=no - - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+fi - - -- old_IFS=$IFS -- for ac_src in sysvshm.c; do -+ext_output=$PHP_LIBEXPAT_DIR -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+ -+php_with_iconv_dir=no -+ -+echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 -+echo "configure:101713: checking iconv dir for XMLRPC-EPI" >&5 -+# Check whether --with-iconv-dir or --without-iconv-dir was given. -+if test "${with_iconv_dir+set}" = set; then -+ withval="$with_iconv_dir" -+ PHP_ICONV_DIR=$withval -+else -+ -+ PHP_ICONV_DIR=no - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+fi - -- cat >>Makefile.objects<&6 -+ -+ -+ -+ -+if test "$PHP_XMLRPC" != "no"; then -+ -+ -+ am_i_shared=$PHP_XMLRPC_SHARED -+ is_it_shared=$PHP_LIBXML_SHARED -+ is_it_enabled=$PHP_LIBXML -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension xmlrpc to build statically, but it -+depends on extension libxml, which you've configured to build shared. -+You either need to build xmlrpc shared or build libxml statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension xmlrpc, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_XMLRPC 1 - EOF -- done - - -- EXT_STATIC="$EXT_STATIC sysvshm" -- if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC sysvshm" -+ if test "$PHP_LIBEXPAT_DIR" = "no"; then -+ -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi -- else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_SYSVSHM_SHARED=yes -+ -+ -+echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 -+echo "configure:101769: checking for xml2-config path" >&5 -+if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ -+ for i in $PHP_LIBXML_DIR /usr/local /usr; do -+ if test -x "$i/bin/xml2-config"; then -+ ac_cv_php_xml2_config_path="$i/bin/xml2-config" -+ break -+ fi -+ done -+ -+fi -+ -+echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -+ -+ if test -x "$ac_cv_php_xml2_config_path"; then -+ XML2_CONFIG="$ac_cv_php_xml2_config_path" -+ libxml_full_version=`$XML2_CONFIG --version` -+ ac_IFS=$IFS -+ IFS="." -+ set $libxml_full_version -+ IFS=$ac_IFS -+ LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -+ if test "$LIBXML_VERSION" -ge "2006011"; then -+ LIBXML_LIBS=`$XML2_CONFIG --libs` -+ LIBXML_INCS=`$XML2_CONFIG --cflags` - -- case ext/sysvshm in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ for ac_i in $LIBXML_LIBS; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread" -+ else -+ - -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - - -- old_IFS=$IFS -- for ac_src in sysvshm.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` - -- shared_objects_sysvshm="$shared_objects_sysvshm $ac_bdir$ac_obj.lo" -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_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 - -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$ac_ii - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpsysvshm.$suffix" -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" -- -- cat >>Makefile.objects<&6 -+echo "configure:101927: checking whether libxml build works" >&5 -+if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_sysvshm" -+ -+ old_LIBS=$LIBS -+ LIBS=" -+ $XMLRPC_SHARED_LIBADD -+ $LIBS" -+ if test "$cross_compiling" = yes; then -+ -+ LIBS=$old_LIBS -+ -+else -+ cat > conftest.$ac_ext <>Makefile.objects<&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ LIBS=$old_LIBS -+ -+ php_cv_libxml_build_works=yes -+ -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ LIBS=$old_LIBS -+ -+ echo "$ac_t""no" 1>&6 -+ { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -+ -+ -+fi -+rm -fr conftest* -+fi - --$ext_builddir/sysvshm.$suffix: \$(shared_objects_sysvshm) \$(SYSVSHM_SHARED_DEPENDENCIES) -- $link_cmd - --EOF -+ -+fi - -- ;; -- esac -- cat >> confdefs.h <&6 -+ if test "$php_cv_libxml_build_works" = "yes"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBXML 1 - EOF - -- fi -- fi -- -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_SYSVSHM_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -+ fi -+ -+ if test "$PHP_XML" = "no"; then - - -- case ext/sysvshm in -+ case ext/xml in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/sysvshm"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/sysvshm/"; ac_bdir="ext/sysvshm/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -96106,7 +102006,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in sysvshm.c; do -+ for ac_src in compat.c; do - - IFS=. - set $ac_src -@@ -96116,10 +102016,10 @@ EOF - PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - - case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ *.c) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; - esac - - cat >>Makefile.objects<&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -+ -+ fi -+ -+ else -+ testval=no -+ for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do -+ if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBEXPAT 1 -+EOF - -+ - -- old_IFS=$IFS -- for ac_src in sysvshm.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD" -+ if test -n "$i/$PHP_LIBDIR"; then - -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$i/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" -+ fi - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_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 - -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$i/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" - fi -+ -+ -+ - - -- BUILD_DIR="$BUILD_DIR $ext_builddir" -+ 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 - - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=sysvshm - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ fi - - fi -+ -+ -+ case expat in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lexpat $LIBS" -+ ;; -+ esac - --fi - - - --php_with_tidy=no -+ fi - --echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 --echo "configure:96203: checking for TIDY support" >&5 --# Check whether --with-tidy or --without-tidy was given. --if test "${with_tidy+set}" = set; then -- withval="$with_tidy" -- PHP_TIDY=$withval --else -+ -+ -+ if test "$i/include" != "/usr/include"; then -+ -+ if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then -+ ai_p=$i/include -+ else -+ -+ ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$i/include\"`" -+ fi -+ -+ - -- PHP_TIDY=no -- test "$PHP_ENABLE_ALL" && PHP_TIDY=$PHP_ENABLE_ALL -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - --fi -+ fi - -+ testval=yes -+ break -+ fi -+ done - -+ if test "$testval" = "no"; then -+ { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" 1>&2; exit 1; } -+ fi -+ fi - --ext_output="yes, shared" --ext_shared=yes --case $PHP_TIDY in --shared,*) -- PHP_TIDY=`echo "$PHP_TIDY"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_TIDY=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -+ if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then - -+ if test "$PHP_ICONV_DIR" != "no"; then -+ PHP_ICONV=$PHP_ICONV_DIR -+ fi -+ -+ if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then -+ PHP_ICONV=yes -+ fi -+ -+ -+ found_iconv=no -+ unset ICONV_DIR - -+ # Create the directories for a VPATH build: -+ $php_shtool mkdir -p ext/iconv - --echo "$ac_t""$ext_output" 1>&6 -+ echo > ext/iconv/php_have_bsd_iconv.h -+ echo > ext/iconv/php_have_ibm_iconv.h -+ echo > ext/iconv/php_have_glibc_iconv.h -+ echo > ext/iconv/php_have_libiconv.h -+ echo > ext/iconv/php_have_iconv.h -+ echo > ext/iconv/php_php_iconv_impl.h -+ echo > ext/iconv/php_iconv_aliased_libiconv.h -+ echo > ext/iconv/php_php_iconv_h_path.h -+ echo > ext/iconv/php_iconv_supports_errno.h - -+ if test "$PHP_ICONV" = "yes"; then -+ echo $ac_n "checking for iconv""... $ac_c" 1>&6 -+echo "configure:102223: checking for iconv" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char iconv(); - -+int main() { - -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_iconv) || defined (__stub___iconv) -+choke me -+#else -+iconv(); -+#endif - --if test "$PHP_TIDY" != "no"; then -+; return 0; } -+EOF -+if { (eval echo configure:102251: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_iconv=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_iconv=no" -+fi -+rm -f conftest* -+fi - -- if test "$PHP_TIDY" != "yes"; then -- TIDY_SEARCH_DIRS=$PHP_TIDY -- else -- TIDY_SEARCH_DIRS="/usr/local /usr" -- fi -+if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ found_iconv=yes -+ -+else -+ echo "$ac_t""no" 1>&6 - -- for i in $TIDY_SEARCH_DIRS; do -- if test -f $i/include/tidy/tidy.h; then -- TIDY_DIR=$i -- TIDY_INCDIR=$i/include/tidy -- elif test -f $i/include/tidy.h; then -- TIDY_DIR=$i -- TIDY_INCDIR=$i/include -- fi -- done -+ echo $ac_n "checking for libiconv""... $ac_c" 1>&6 -+echo "configure:102272: checking for libiconv" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char libiconv(); - -- if test -z "$TIDY_DIR"; then -- { echo "configure: error: Cannot find libtidy" 1>&2; exit 1; } -- fi -+int main() { - -- TIDY_LIBDIR=$TIDY_DIR/$PHP_LIBDIR -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_libiconv) || defined (__stub___libiconv) -+choke me -+#else -+libiconv(); -+#endif -+ -+; return 0; } -+EOF -+if { (eval echo configure:102300: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_libiconv=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_libiconv=no" -+fi -+rm -f conftest* -+fi - -+if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - -+ -+ echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h - -- if test "$ext_shared" = "yes"; then -- TIDY_SHARED_LIBADD="-ltidy $TIDY_SHARED_LIBADD" -- if test -n "$TIDY_LIBDIR"; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBICONV 1 -+EOF -+ -+ found_iconv=yes - -- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -- -- if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$TIDY_LIBDIR -- else -- -- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+else -+ echo "$ac_t""no" 1>&6 -+fi -+ - -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" -+fi -+ - fi - -- -+ if test "$found_iconv" = "no"; then -+ -+ for i in $PHP_ICONV /usr/local /usr; do -+ if test -r $i/include/giconv.h; then -+ cat >> confdefs.h <<\EOF -+#define HAVE_GICONV_H 1 -+EOF -+ -+ ICONV_DIR=$i -+ iconv_lib_name=giconv -+ break -+ elif test -r $i/include/iconv.h; then -+ ICONV_DIR=$i -+ iconv_lib_name=iconv -+ break -+ fi -+ done -+ -+ if test -z "$ICONV_DIR"; then -+ { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } -+ fi -+ -+ if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || -+ test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME -+ then -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff=" -+ -L$ICONV_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) - if test "$ext_shared" = "yes"; then -- TIDY_SHARED_LIBADD="-L$ai_p $TIDY_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && TIDY_SHARED_LIBADD="$ld_runpath_switch$ai_p $TIDY_SHARED_LIBADD" -+ LDFLAGS="$LDFLAGS -pthread" - else - - -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$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" -- -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -- - fi -- -- fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ - - fi -- else -- -+ ;; -+ esac - -- if test -n "$TIDY_LIBDIR"; then -- -- if test "$TIDY_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$TIDY_LIBDIR" != "/usr/lib"; then -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then - -- if test -z "$TIDY_LIBDIR" || echo "$TIDY_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$TIDY_LIBDIR -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -- ep_dir="`echo $TIDY_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$TIDY_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - - -- -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -96341,60 +102443,82 @@ if test "$PHP_TIDY" != "no"; then - fi - - -+ fi - - fi - -- fi -- -- -- case tidy in -- c|c_r|pthread*) ;; -- *) -- LIBS="-ltidy $LIBS" -- ;; -- esac -- -- -- -+ ;; -+ esac -+ done - -- fi -+ echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 -+echo "configure:102456: checking for libiconv in -l$iconv_lib_name" >&5 -+ac_lib_var=`echo $iconv_lib_name'_'libiconv | 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="-l$iconv_lib_name $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 - -- if test "$TIDY_INCDIR" != "/usr/include"; then -- -- if test -z "$TIDY_INCDIR" || echo "$TIDY_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$TIDY_INCDIR -- else -- -- ep_dir="`echo $TIDY_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared - -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$TIDY_INCDIR\"`" -- fi -+ found_iconv=yes -+ -+ echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h - -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBICONV 1 -+EOF - -- fi -+ -+ echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h - -+ cat >> confdefs.h <<\EOF -+#define ICONV_ALIASED_LIBICONV 1 -+EOF - -+ - -+else -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_$iconv_lib_name_libiconv -+ -+ - save_old_LDFLAGS=$LDFLAGS -- ac_stuff="" -+ ac_stuff=" -+ -L$ICONV_DIR/$PHP_LIBDIR -+ " - - save_ext_shared=$ext_shared - ext_shared=yes -@@ -96487,27 +102611,27 @@ if test "$PHP_TIDY" != "no"; then - esac - done - -- echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 --echo "configure:96492: checking for tidyOptGetDoc in -ltidy" >&5 --ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 -+echo "configure:102616: checking for iconv in -l$iconv_lib_name" >&5 -+ac_lib_var=`echo $iconv_lib_name'_'iconv | 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="-ltidy $LIBS" -+LIBS="-l$iconv_lib_name $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:102635: \"$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 -@@ -96526,386 +102650,749 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared - -- cat >> confdefs.h <<\EOF --#define HAVE_TIDYOPTGETDOC 1 --EOF -- -- -+ found_iconv=yes -+ - - else - echo "$ac_t""no" 1>&6 - - LDFLAGS=$save_old_LDFLAGS - ext_shared=$save_ext_shared -- unset ac_cv_lib_tidy_tidyOptGetDoc -+ unset ac_cv_lib_$iconv_lib_name_iconv - - - fi - -+ -+ -+fi -+ -+ fi -+ fi -+ -+ if test "$found_iconv" = "yes"; then -+ -+ echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_ICONV 1 -+EOF -+ -+ if test -n "$ICONV_DIR"; then -+ - -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" -+ if test -n "$ICONV_DIR/$PHP_LIBDIR"; then -+ -+ if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$ICONV_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" -+ fi - -+ -+ if test "$ext_shared" = "yes"; then -+ XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -+ else -+ - -- ext_builddir=ext/tidy -- ext_srcdir=$abs_srcdir/ext/tidy -+ -+ 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 - -- ac_extra= - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_TIDY_SHARED=no -+ fi -+ -+ fi -+ -+ fi -+ else -+ -+ -+ if test -n "$ICONV_DIR/$PHP_LIBDIR"; then -+ -+ if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$ICONV_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" -+ fi -+ - -+ - -- case ext/tidy in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tidy"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tidy/"; ac_bdir="ext/tidy/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac - -+ 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 - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ -+ fi - -- old_IFS=$IFS -- for ac_src in tidy.c; do -+ fi - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $iconv_lib_name in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-l$iconv_lib_name $LIBS" -+ ;; -+ esac - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$ICONV_DIR/include -+ else -+ -+ ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" -+ fi -+ -+ - -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo -+ fi - -+ fi -+ -+else -+ { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } -+ -+ fi - -- old_IFS=$IFS -- for ac_src in tidy.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_tidy="$shared_objects_tidy $ac_bdir$ac_obj.lo" -+ fi -+fi - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+if test "$PHP_XMLRPC" = "yes"; then -+ # 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:102825: 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 -+ if test -n "$RANLIB"; then -+ ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+else -+ IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -+ ac_dummy="$PATH" -+ for ac_dir in $ac_dummy; do -+ test -z "$ac_dir" && ac_dir=. -+ if test -f $ac_dir/$ac_word; then -+ ac_cv_prog_RANLIB="ranlib" -+ break -+ fi -+ done -+ IFS="$ac_save_ifs" -+ test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -+fi -+fi -+RANLIB="$ac_cv_prog_RANLIB" -+if test -n "$RANLIB"; then -+ echo "$ac_t""$RANLIB" 1>&6 -+else -+ echo "$ac_t""no" 1>&6 -+fi - -- cat >>Makefile.objects<&6 -+echo "configure:102853: 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 -+ rm -rf conftest* -+ ac_cv_c_inline=$ac_kw; break -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+fi -+rm -f conftest* -+done -+ -+fi -+ -+echo "$ac_t""$ac_cv_c_inline" 1>&6 -+case "$ac_cv_c_inline" in -+ inline | yes) ;; -+ no) cat >> confdefs.h <<\EOF -+#define inline -+EOF -+ ;; -+ *) cat >> confdefs.h <> confdefs.h <<\EOF -+#define UNDEF_THREADS_HACK -+EOF -+ -+ -+ -+echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 -+echo "configure:102905: 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 -+#include -+#include -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:102918: \"$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* -+ ac_cv_header_stdc=yes -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+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 -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "memchr" >/dev/null 2>&1; then -+ : -+else -+ rm -rf conftest* -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* -+ -+fi -+ -+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 -- done -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "free" >/dev/null 2>&1; then -+ : -+else -+ rm -rf conftest* -+ ac_cv_header_stdc=no -+fi -+rm -f conftest* - -- case $host_alias in -- *netware*) -- -- install_modules="install-modules" -+fi - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptidy.so '$ext_builddir'/phptidy.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTIDY, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(PHPTIDY_SHARED_LIBADD)' -- ;; -- esac -+if test $ac_cv_header_stdc = yes; then -+ # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. -+if test "$cross_compiling" = yes; then -+ : -+else -+ cat > conftest.$ac_ext < -+#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') -+#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) -+#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) -+int main () { int i; for (i = 0; i < 256; i++) -+if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); -+exit (0); } - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptidy.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptidy.$suffix" -- fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" -+EOF -+if { (eval echo configure:102985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ : -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_header_stdc=no -+fi -+rm -fr conftest* -+fi - -- cat >>Makefile.objects<&6 -+if test $ac_cv_header_stdc = yes; then -+ cat >> confdefs.h <<\EOF -+#define STDC_HEADERS 1 -+EOF -+ -+fi - -+for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:103012: 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:103022: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done - -- ;; -- *) -- -- install_modules="install-modules" - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/tidy.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(TIDY_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/tidy.so '$ext_builddir'/tidy.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(TIDY, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tidy) $(TIDY_SHARED_LIBADD)' -- ;; -- esac - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/tidy.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/tidy.$suffix" -- fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tidy" - -- cat >>Makefile.objects<&6 -+echo "configure:103054: 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 -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_char=1 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(char)); -+ exit(0); -+} - EOF -+if { (eval echo configure:103074: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_char=0 -+fi -+rm -fr conftest* -+fi - -- ;; -- esac -- cat >> confdefs.h <&6 -+cat >> confdefs.h <&6 -+echo "configure:103095: 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 -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_int=4 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(int)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:103115: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_int=0 -+fi -+rm -fr conftest* -+fi - -- old_IFS=$IFS -- for ac_src in tidy.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+fi -+echo "$ac_t""$ac_cv_sizeof_int" 1>&6 -+cat >> confdefs.h <>Makefile.objects<&6 -+echo "configure:103135: 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 -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_long=4 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(long)); -+ exit(0); -+} - EOF -- done -+if { (eval echo configure:103155: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_long=0 -+fi -+rm -fr conftest* -+fi - -+fi -+echo "$ac_t""$ac_cv_sizeof_long" 1>&6 -+cat >> confdefs.h <&6 -+echo "configure:103175: 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 -+ if test "$cross_compiling" = yes; then -+ ac_cv_sizeof_long_long=8 -+else -+ cat > conftest.$ac_ext < -+#include -+main() -+{ -+ FILE *f=fopen("conftestval", "w"); -+ if (!f) exit(1); -+ fprintf(f, "%d\n", sizeof(long long)); -+ exit(0); -+} -+EOF -+if { (eval echo configure:103195: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ ac_cv_sizeof_long_long=0 -+fi -+rm -fr conftest* -+fi - -+fi -+echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 -+cat >> confdefs.h <&6 -+echo "configure:103215: 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 -+#include -+#include -+#endif -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_size_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_size_t=no -+fi -+rm -f conftest* - -- cat >>Makefile.objects<&6 -+if test $ac_cv_type_size_t = no; then -+ cat >> confdefs.h <<\EOF -+#define size_t unsigned - EOF -- done - -+fi - -- ;; -- esac -- EXT_CLI_STATIC="$EXT_CLI_STATIC tidy" -- fi -- -- -- BUILD_DIR="$BUILD_DIR $ext_builddir" -- -+echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 -+echo "configure:103248: 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 -+#include -+int main() { -+struct tm *tp; -+; return 0; } -+EOF -+if { (eval echo configure:103262: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ rm -rf conftest* -+ ac_cv_header_time=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ ac_cv_header_time=no -+fi -+rm -f conftest* -+fi - -+echo "$ac_t""$ac_cv_header_time" 1>&6 -+if test $ac_cv_header_time = yes; then -+ cat >> confdefs.h <<\EOF -+#define TIME_WITH_SYS_TIME 1 -+EOF - -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=tidy -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+fi - -- fi -+echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 -+echo "configure:103283: 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 -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "uid_t" >/dev/null 2>&1; then -+ rm -rf conftest* -+ ac_cv_type_uid_t=yes -+else -+ rm -rf conftest* -+ ac_cv_type_uid_t=no -+fi -+rm -f conftest* - -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST TIDY_SHARED_LIBADD" -+fi - -+echo "$ac_t""$ac_cv_type_uid_t" 1>&6 -+if test $ac_cv_type_uid_t = no; then - cat >> confdefs.h <<\EOF --#define HAVE_TIDY 1 -+#define uid_t int - EOF - --fi -- -+ cat >> confdefs.h <<\EOF -+#define gid_t int -+EOF - -+fi - - --php_enable_tokenizer=yes - --echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 --echo "configure:96855: checking whether to enable tokenizer support" >&5 --# Check whether --enable-tokenizer or --disable-tokenizer was given. --if test "${enable_tokenizer+set}" = set; then -- enableval="$enable_tokenizer" -- PHP_TOKENIZER=$enableval --else -- -- PHP_TOKENIZER=yes -- test "$PHP_ENABLE_ALL" && PHP_TOKENIZER=$PHP_ENABLE_ALL - --fi - - -+# Standard XMLRPC list -+for ac_func in \ -+ strtoul strtoull snprintf \ -+ strstr strpbrk strerror\ -+ memcpy memmove -+do -+echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -+echo "configure:103328: 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 < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char $ac_func(); - --ext_output="yes, shared" --ext_shared=yes --case $PHP_TOKENIZER in --shared,*) -- PHP_TOKENIZER=`echo "$PHP_TOKENIZER"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_TOKENIZER=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -+int main() { - -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -+choke me -+#else -+$ac_func(); -+#endif - -+; return 0; } -+EOF -+if { (eval echo configure:103356: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_$ac_func=no" -+fi -+rm -f conftest* -+fi - --echo "$ac_t""$ext_output" 1>&6 -+if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -+ cat >> confdefs.h <&6 -+fi -+done - - - - --if test "$PHP_TOKENIZER" != "no"; then - -- ext_builddir=ext/tokenizer -- ext_srcdir=$abs_srcdir/ext/tokenizer -+ ext_builddir=ext/xmlrpc -+ ext_srcdir=$abs_srcdir/ext/xmlrpc - -- ac_extra= -+ ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_TOKENIZER_SHARED=no -+ PHP_XMLRPC_SHARED=no - - -- case ext/tokenizer in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -96920,7 +103407,12 @@ if test "$PHP_TOKENIZER" != "no"; then - - - old_IFS=$IFS -- for ac_src in tokenizer.c tokenizer_data.c; do -+ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -+ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -+ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -+ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -+ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -+ libxmlrpc/xml_to_soap.c; do - - IFS=. - set $ac_src -@@ -96943,18 +103435,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC tokenizer" -+ EXT_STATIC="$EXT_STATIC xmlrpc" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC tokenizer" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_TOKENIZER_SHARED=yes -+ PHP_XMLRPC_SHARED=yes - -- case ext/tokenizer in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/tokenizer"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/tokenizer/"; ac_bdir="ext/tokenizer/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -96969,14 +103461,19 @@ EOF - - - old_IFS=$IFS -- for ac_src in tokenizer.c tokenizer_data.c; do -+ for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -+ libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -+ libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -+ libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -+ libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -+ libxmlrpc/xml_to_soap.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_tokenizer="$shared_objects_tokenizer $ac_bdir$ac_obj.lo" -+ shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -96999,31 +103496,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phptokenizer.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phptokenizer.so '$ext_builddir'/phptokenizer.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPTOKENIZER, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_tokenizer) $(PHPTOKENIZER_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phptokenizer.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phptokenizer.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_tokenizer" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<> Makefile.fragments -- --fi -- -- -- --php_enable_wddx=no -- --echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 --echo "configure:97201: 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 --else -- -- PHP_WDDX=no -- test "$PHP_ENABLE_ALL" && PHP_WDDX=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_WDDX in --shared,*) -- PHP_WDDX=`echo "$PHP_WDDX"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_WDDX=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test -z "$PHP_LIBXML_DIR"; then -- --php_with_libxml_dir=no -- --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:97246: checking libxml2 install dir" >&5 --# Check whether --with-libxml-dir or --without-libxml-dir was given. --if test "${with_libxml_dir+set}" = set; then -- withval="$with_libxml_dir" -- PHP_LIBXML_DIR=$withval --else -- -- PHP_LIBXML_DIR=no -- -- --fi -- -- --ext_output=$PHP_LIBXML_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- --fi -- -- --php_with_libexpat_dir=no -- --echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 --echo "configure:97270: checking libexpat dir for WDDX" >&5 --# Check whether --with-libexpat-dir or --without-libexpat-dir was given. --if test "${with_libexpat_dir+set}" = set; then -- withval="$with_libexpat_dir" -- PHP_LIBEXPAT_DIR=$withval --else -- -- PHP_LIBEXPAT_DIR=no -- -- --fi -- -- --ext_output=$PHP_LIBEXPAT_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_WDDX" != "no"; then -- -- if test "$PHP_LIBEXPAT_DIR" = "no"; then -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: WDDX extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi -- -- --echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:97298: checking for xml2-config path" >&5 --if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -- --fi -- --echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -- -- if test -x "$ac_cv_php_xml2_config_path"; then -- XML2_CONFIG="$ac_cv_php_xml2_config_path" -- libxml_full_version=`$XML2_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $libxml_full_version -- IFS=$ac_IFS -- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -- if test "$LIBXML_VERSION" -ge "2006011"; then -- LIBXML_LIBS=`$XML2_CONFIG --libs` -- LIBXML_INCS=`$XML2_CONFIG --cflags` -- -- for ac_i in $LIBXML_LIBS; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="$WDDX_SHARED_LIBADD -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_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 -- -- ;; -- esac -- done -- -- -- for ac_i in $LIBXML_INCS; do -- case $ac_i in -- -I*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/include"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -- -- ;; -- esac -- done -- -- -- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:97456: checking whether libxml build works" >&5 --if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- -- old_LIBS=$LIBS -- LIBS=" -- $WDDX_SHARED_LIBADD -- $LIBS" -- if test "$cross_compiling" = yes; then -- -- LIBS=$old_LIBS -- --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- LIBS=$old_LIBS -- -- php_cv_libxml_build_works=yes -- -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- LIBS=$old_LIBS -- -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- -- --fi --rm -fr conftest* --fi -- -- -- --fi -- --echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 -+ cat >>Makefile.objects<>Makefile.objects<&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=xmlrpc - -- fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" - - fi - -- if test "$PHP_LIBEXPAT_DIR" != "no"; then -- for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do -- if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then -- EXPAT_DIR=$i -+ -+ -+ BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc" -+ -+ -+ XMLRPC_MODULE_TYPE=builtin -+ -+elif test "$PHP_XMLRPC" != "no"; then -+ -+ if test -r $PHP_XMLRPC/include/xmlrpc.h; then -+ XMLRPC_DIR=$PHP_XMLRPC/include -+ elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then -+ XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi -+ else -+ echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6 -+echo "configure:103710: checking for XMLRPC-EPI in default path" >&5 -+ for i in /usr/local /usr; do -+ if test -r $i/include/xmlrpc.h; then -+ XMLRPC_DIR=$i/include -+ echo "$ac_t""found in $i" 1>&6 - break - fi - done -+ fi - -- if test -z "$EXPAT_DIR"; then -- { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } -- fi -+ if test -z "$XMLRPC_DIR"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; } -+ fi - -+ -+ if test "$XMLRPC_DIR" != "/usr/include"; then - -- if test "$EXPAT_DIR/include" != "/usr/include"; then -- -- if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$EXPAT_DIR/include -+ if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then -+ ai_p=$XMLRPC_DIR - else - -- ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" -+ ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`" - fi - - -@@ -97618,28 +103752,28 @@ else - - fi - -- -+ - - if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="-lexpat $WDDX_SHARED_LIBADD" -- if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -+ XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" -+ if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then - -- if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$EXPAT_DIR/$PHP_LIBDIR -+ if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$XMLRPC_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then -- WDDX_SHARED_LIBADD="-L$ai_p $WDDX_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && WDDX_SHARED_LIBADD="$ld_runpath_switch$ai_p $WDDX_SHARED_LIBADD" -+ XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" - else - - -@@ -97665,18 +103799,18 @@ else - else - - -- if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -+ if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then - -- if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$EXPAT_DIR/$PHP_LIBDIR -+ if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$XMLRPC_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" - fi - - -@@ -97702,10 +103836,10 @@ else - fi - - -- case expat in -+ case xmlrpc in - c|c_r|pthread*) ;; - *) -- LIBS="-lexpat $LIBS" -+ LIBS="-lxmlrpc $LIBS" - ;; - esac - -@@ -97715,30 +103849,20 @@ else - fi - - -- cat >> confdefs.h <<\EOF --#define HAVE_LIBEXPAT 1 --EOF -- -- fi -- -- cat >> confdefs.h <<\EOF --#define HAVE_WDDX 1 --EOF -- - -- ext_builddir=ext/wddx -- ext_srcdir=$abs_srcdir/ext/wddx -+ ext_builddir=ext/xmlrpc -+ ext_srcdir=$abs_srcdir/ext/xmlrpc - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_WDDX_SHARED=no -+ PHP_XMLRPC_SHARED=no - - -- case ext/wddx in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -97753,7 +103877,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in wddx.c; do -+ for ac_src in xmlrpc-epi-php.c; do - - IFS=. - set $ac_src -@@ -97776,18 +103900,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC wddx" -+ EXT_STATIC="$EXT_STATIC xmlrpc" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC wddx" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlrpc" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_WDDX_SHARED=yes -+ PHP_XMLRPC_SHARED=yes - -- case ext/wddx in -+ case ext/xmlrpc in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/wddx"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/wddx/"; ac_bdir="ext/wddx/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -97802,14 +103926,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in wddx.c; do -+ for ac_src in xmlrpc-epi-php.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_wddx="$shared_objects_wddx $ac_bdir$ac_obj.lo" -+ shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -97832,31 +103956,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpwddx.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(PHPWDDX_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpwddx.so '$ext_builddir'/phpwddx.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlrpc.so '$ext_builddir'/phpxmlrpc.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPWDDX, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLRPC, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_wddx) $(PHPWDDX_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(PHPXMLRPC_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpwddx.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpwddx.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_wddx" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -- { echo "configure: error: --You've configured extension wddx, which depends on extension libxml, --but you've either not enabled libxml, or have disabled it. --" 1>&2; exit 1; } -- fi -- -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" -- -+ XMLRPC_MODULE_TYPE=external - fi - - - --php_enable_xml=yes -+php_enable_xmlwriter=yes - --echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 --echo "configure:98050: checking whether to enable 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 $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 -+echo "configure:104153: checking whether to enable XMLWriter support" >&5 -+# Check whether --enable-xmlwriter or --disable-xmlwriter was given. -+if test "${enable_xmlwriter+set}" = set; then -+ enableval="$enable_xmlwriter" -+ PHP_XMLWRITER=$enableval - else - -- PHP_XML=yes -- test "$PHP_ENABLE_ALL" && PHP_XML=$PHP_ENABLE_ALL -+ PHP_XMLWRITER=yes -+ test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL - - fi - -@@ -98062,12 +104165,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_XML in -+case $PHP_XMLWRITER in - shared,*) -- PHP_XML=`echo "$PHP_XML"|$SED 's/^shared,//'` -+ PHP_XMLWRITER=`echo "$PHP_XMLWRITER"|$SED 's/^shared,//'` - ;; - shared) -- PHP_XML=yes -+ PHP_XMLWRITER=yes - ;; - no) - ext_output=no -@@ -98091,7 +104194,7 @@ if test -z "$PHP_LIBXML_DIR"; then - php_with_libxml_dir=no - - echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:98095: checking libxml2 install dir" >&5 -+echo "configure:104198: checking libxml2 install dir" >&5 - # Check whether --with-libxml-dir or --without-libxml-dir was given. - if test "${with_libxml_dir+set}" = set; then - withval="$with_libxml_dir" -@@ -98111,40 +104214,15 @@ echo "$ac_t""$ext_output" 1>&6 - - fi - -+if test "$PHP_XMLWRITER" != "no"; then - --php_with_libexpat_dir=no -+ if test "$PHP_LIBXML" = "no"; then -+ { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ fi - --echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 --echo "configure:98119: checking libexpat install dir" >&5 --# Check whether --with-libexpat-dir or --without-libexpat-dir was given. --if test "${with_libexpat_dir+set}" = set; then -- withval="$with_libexpat_dir" -- PHP_LIBEXPAT_DIR=$withval --else -- -- PHP_LIBEXPAT_DIR=no - -- --fi -- -- --ext_output=$PHP_LIBEXPAT_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_XML" != "no"; then -- -- if test "$PHP_LIBEXPAT_DIR" = "no"; then -- -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: XML extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi -- -- - echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:98148: checking for xml2-config path" >&5 -+echo "configure:104226: checking for xml2-config path" >&5 - if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -98176,7 +104254,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="$XML_SHARED_LIBADD -pthread" -+ XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread" - else - - -@@ -98198,7 +104276,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="$XML_SHARED_LIBADD -l$ac_ii" -+ XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" - else - - -@@ -98233,8 +104311,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - - if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_SHARED_LIBADD" -+ XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD" - else - - -@@ -98302,7 +104380,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - - echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:98306: checking whether libxml build works" >&5 -+echo "configure:104384: checking whether libxml build works" >&5 - if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -98310,7 +104388,7 @@ else - - old_LIBS=$LIBS - LIBS=" -- $XML_SHARED_LIBADD -+ $XMLWRITER_SHARED_LIBADD - $LIBS" - if test "$cross_compiling" = yes; then - -@@ -98318,7 +104396,7 @@ else - - 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:104411: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBS=$old_LIBS -@@ -98364,197 +104442,24 @@ EOF - - fi - -- xml_extra_sources="compat.c" -- -- am_i_shared=$PHP_XML_SHARED -- is_it_shared=$PHP_LIBXML_SHARED -- is_it_enabled=$PHP_LIBXML -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension xml to build statically, but it --depends on extension libxml, which you've configured to build shared. --You either need to build xml shared or build libxml statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -- { echo "configure: error: --You've configured extension xml, which depends on extension libxml, --but you've either not enabled libxml, or have disabled it. --" 1>&2; exit 1; } -- fi -- -- -- else -- { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -- -- fi -- -- fi -- -- if test "$PHP_LIBEXPAT_DIR" != "no"; then -- for i in $PHP_XML $PHP_LIBEXPAT_DIR /usr /usr/local; do -- if test -f "$i/$PHP_LIBDIR/libexpat.a" || test -f "$i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME"; then -- EXPAT_DIR=$i -- break -- fi -- done -- -- if test -z "$EXPAT_DIR"; then -- { echo "configure: error: not found. Please reinstall the expat distribution." 1>&2; exit 1; } -- fi -- -- -- if test "$EXPAT_DIR/include" != "/usr/include"; then -- -- if test -z "$EXPAT_DIR/include" || echo "$EXPAT_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$EXPAT_DIR/include -- else -- -- ep_dir="`echo $EXPAT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/include\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -- -- -- -- if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="-lexpat $XML_SHARED_LIBADD" -- if test -n "$EXPAT_DIR/$PHP_LIBDIR"; then -- -- if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$EXPAT_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- XML_SHARED_LIBADD="-L$ai_p $XML_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XML_SHARED_LIBADD="$ld_runpath_switch$ai_p $XML_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 "$EXPAT_DIR/$PHP_LIBDIR"; then -- -- if test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EXPAT_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$EXPAT_DIR/$PHP_LIBDIR" || echo "$EXPAT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$EXPAT_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $EXPAT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$EXPAT_DIR/$PHP_LIBDIR\"`" -- fi -- -- -- -- -- -- 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 -- -- -- case expat in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lexpat $LIBS" -- ;; -- esac -- -- -- -- -- fi -- -- - cat >> confdefs.h <<\EOF --#define HAVE_LIBEXPAT 1 -+#define HAVE_XMLWRITER 1 - EOF - -- fi -- -- -- ext_builddir=ext/xml -- ext_srcdir=$abs_srcdir/ext/xml -+ -+ ext_builddir=ext/xmlwriter -+ ext_srcdir=$abs_srcdir/ext/xmlwriter - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XML_SHARED=no -+ PHP_XMLWRITER_SHARED=no - - -- case ext/xml in -+ case ext/xmlwriter in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -98569,7 +104474,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in xml.c $xml_extra_sources; do -+ for ac_src in php_xmlwriter.c; do - - IFS=. - set $ac_src -@@ -98592,18 +104497,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC xml" -+ EXT_STATIC="$EXT_STATIC xmlwriter" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC xml" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xmlwriter" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_XML_SHARED=yes -+ PHP_XMLWRITER_SHARED=yes - -- case ext/xml in -+ case ext/xmlwriter in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xml"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xml/"; ac_bdir="ext/xml/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -98618,14 +104523,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in xml.c $xml_extra_sources; do -+ for ac_src in php_xmlwriter.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_xml="$shared_objects_xml $ac_bdir$ac_obj.lo" -+ shared_objects_xmlwriter="$shared_objects_xmlwriter $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -98648,31 +104553,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxml.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxml.so '$ext_builddir'/phpxml.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlwriter.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlwriter.so '$ext_builddir'/phpxmlwriter.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXML, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLWRITER, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xml) $(PHPXML_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlwriter) $(PHPXMLWRITER_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxml.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlwriter.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxml.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlwriter.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xml" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } -+ fi -+else -+ { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } - -- for header_file in ext/xml/; do -- -- -- unique=`echo $header_file|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INSTALLHEADERS$unique=set" -- -- INSTALL_HEADERS="$INSTALL_HEADERS $header_file" -- - fi - -- done -- -- -- cat >> confdefs.h <<\EOF --#define HAVE_XML 1 --EOF -- - fi - - - --php_enable_xmlreader=yes -+php_with_xsl=no - --echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 --echo "configure:98869: checking whether to enable XMLReader support" >&5 --# Check whether --enable-xmlreader or --disable-xmlreader was given. --if test "${enable_xmlreader+set}" = set; then -- enableval="$enable_xmlreader" -- PHP_XMLREADER=$enableval -+echo $ac_n "checking for XSL support""... $ac_c" 1>&6 -+echo "configure:104761: checking for XSL support" >&5 -+# Check whether --with-xsl or --without-xsl was given. -+if test "${with_xsl+set}" = set; then -+ withval="$with_xsl" -+ PHP_XSL=$withval - else - -- PHP_XMLREADER=yes -- test "$PHP_ENABLE_ALL" && PHP_XMLREADER=$PHP_ENABLE_ALL -+ PHP_XSL=no -+ test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL - - fi - -@@ -98881,12 +104773,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_XMLREADER in -+case $PHP_XSL in - shared,*) -- PHP_XMLREADER=`echo "$PHP_XMLREADER"|$SED 's/^shared,//'` -+ PHP_XSL=`echo "$PHP_XSL"|$SED 's/^shared,//'` - ;; - shared) -- PHP_XMLREADER=yes -+ PHP_XSL=yes - ;; - no) - ext_output=no -@@ -98905,72 +104797,41 @@ echo "$ac_t""$ext_output" 1>&6 - - - --if test -z "$PHP_LIBXML_DIR"; then -- --php_with_libxml_dir=no -- --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:98914: checking libxml2 install dir" >&5 --# Check whether --with-libxml-dir or --without-libxml-dir was given. --if test "${with_libxml_dir+set}" = set; then -- withval="$with_libxml_dir" -- PHP_LIBXML_DIR=$withval --else -- -- PHP_LIBXML_DIR=no -- -- --fi -- -- --ext_output=$PHP_LIBXML_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -- --fi -- --if test "$PHP_XMLREADER" != "no"; then -+if test "$PHP_XSL" != "no"; then - - if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: XMLReader extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -+ { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi -- -- --echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:98942: checking for xml2-config path" >&5 --if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else - -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -+ if test "$PHP_DOM" = "no"; then -+ { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } -+ fi -+ -+ for i in $PHP_XSL /usr/local /usr; do -+ if test -x "$i/bin/xslt-config"; then -+ XSLT_CONFIG=$i/bin/xslt-config - break - fi - done - --fi -- --echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -- -- if test -x "$ac_cv_php_xml2_config_path"; then -- XML2_CONFIG="$ac_cv_php_xml2_config_path" -- libxml_full_version=`$XML2_CONFIG --version` -+ if test -z "$XSLT_CONFIG"; then -+ { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; } -+ else -+ libxslt_full_version=`$XSLT_CONFIG --version` - ac_IFS=$IFS - IFS="." -- set $libxml_full_version -+ set $libxslt_full_version - IFS=$ac_IFS -- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -- if test "$LIBXML_VERSION" -ge "2006011"; then -- LIBXML_LIBS=`$XML2_CONFIG --libs` -- LIBXML_INCS=`$XML2_CONFIG --cflags` -+ LIBXSLT_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -+ if test "$LIBXSLT_VERSION" -ge "1001000"; then -+ XSL_LIBS=`$XSLT_CONFIG --libs` -+ XSL_INCS=`$XSLT_CONFIG --cflags` - -- for ac_i in $LIBXML_LIBS; do -+ for ac_i in $XSL_LIBS; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -pthread" -+ XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread" - else - - -@@ -98992,7 +104853,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- XMLREADER_SHARED_LIBADD="$XMLREADER_SHARED_LIBADD -l$ac_ii" -+ XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" - else - - -@@ -99027,8 +104888,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - - if test "$ext_shared" = "yes"; then -- XMLREADER_SHARED_LIBADD="-L$ai_p $XMLREADER_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLREADER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLREADER_SHARED_LIBADD" -+ XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" - else - - -@@ -99055,7 +104916,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - done - - -- for ac_i in $LIBXML_INCS; do -+ for ac_i in $XSL_INCS; do - case $ac_i in - -I*) - ac_ii=`echo $ac_i|cut -c 3-` -@@ -99094,88 +104955,177 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - esac - done - -+ -+ echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 -+echo "configure:104961: checking for EXSLT support" >&5 -+ for i in $PHP_XSL /usr/local /usr; do -+ if test -r "$i/include/libexslt/exslt.h"; then -+ PHP_XSL_EXSL_DIR=$i -+ break -+ fi -+ done -+ if test -z "$PHP_XSL_EXSL_DIR"; then -+ echo "$ac_t""not found" 1>&6 -+ else -+ echo "$ac_t""found" 1>&6 -+ - -- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:99100: checking whether libxml build works" >&5 --if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -+ if test "$ext_shared" = "yes"; then -+ XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD" -+ if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then -+ -+ if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" -+ else - -- old_LIBS=$LIBS -- LIBS=" -- $XMLREADER_SHARED_LIBADD -- $LIBS" -- if test "$cross_compiling" = yes; then - -- LIBS=$old_LIBS - --else -- cat > conftest.$ac_ext </dev/null ; then -+ ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ - --EOF --if { (eval echo configure:99127: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then - -- LIBS=$old_LIBS -- -- php_cv_libxml_build_works=yes -- -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ 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" - -- LIBS=$old_LIBS -+ fi -+ -+ - -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- -+ fi -+ -+ fi - --fi --rm -fr conftest* --fi -+ -+ case exslt in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lexslt $LIBS" -+ ;; -+ esac - - -- --fi - --echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -+ -+ fi -+ -+ -+ -+ if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then -+ -+ if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_XSL_EXSL_DIR/include -+ else -+ -+ ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ - cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 -+#define HAVE_XSL_EXSLT 1 - EOF - - fi -- -- cat >> confdefs.h <<\EOF --#define HAVE_XMLREADER 1 -+ else -+ { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; } -+ fi -+ -+ -+ fi -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_XSL 1 - EOF - -- -- ext_builddir=ext/xmlreader -- ext_srcdir=$abs_srcdir/ext/xmlreader -+ -+ ext_builddir=ext/xsl -+ ext_srcdir=$abs_srcdir/ext/xsl - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XMLREADER_SHARED=no -+ PHP_XSL_SHARED=no - - -- case ext/xmlreader in -+ case ext/xsl in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -99190,7 +105140,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in php_xmlreader.c; do -+ for ac_src in php_xsl.c xsltprocessor.c; do - - IFS=. - set $ac_src -@@ -99213,18 +105163,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC xmlreader" -+ EXT_STATIC="$EXT_STATIC xsl" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC xmlreader" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC xsl" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_XMLREADER_SHARED=yes -+ PHP_XSL_SHARED=yes - -- case ext/xmlreader in -+ case ext/xsl in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlreader"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlreader/"; ac_bdir="ext/xmlreader/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -99239,14 +105189,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in php_xmlreader.c; do -+ for ac_src in php_xsl.c xsltprocessor.c; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_xmlreader="$shared_objects_xmlreader $ac_bdir$ac_obj.lo" -+ shared_objects_xsl="$shared_objects_xsl $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -99269,31 +105219,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxmlreader.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxmlreader.so '$ext_builddir'/phpxmlreader.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpxsl.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(PHPXSL_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpxsl.so '$ext_builddir'/phpxsl.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXMLREADER, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPXSL, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlreader) $(PHPXMLREADER_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xsl) $(PHPXSL_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlreader.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxsl.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlreader.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxsl.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlreader" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xsl" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&2; exit 1; } - fi -- if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then - { echo "configure: error: --You've configured extension xmlreader, which depends on extension dom, --but you've either not enabled dom, or have disabled it. --" 1>&2; exit 1; } -- fi -- -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST XMLREADER_SHARED_LIBADD" -- -- -- else -- { echo "configure: error: libxml2 version 2.6.11 or greater required." 1>&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -- -+You've configured extension xsl, which depends on extension libxml, -+but you've either not enabled libxml, or have disabled it. -+" 1>&2; exit 1; } - fi -- -+ - fi - - --# Local macros for automake & autoconf -- -- -- -- -- -- -- -- -- -- - -+php_enable_zip=no - -- --php_with_xmlrpc=no -- --echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 --echo "configure:99509: checking for XMLRPC-EPI support" >&5 --# Check whether --with-xmlrpc or --without-xmlrpc was given. --if test "${with_xmlrpc+set}" = set; then -- withval="$with_xmlrpc" -- PHP_XMLRPC=$withval -+echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 -+echo "configure:105437: checking for zip archive read/writesupport" >&5 -+# Check whether --enable-zip or --disable-zip was given. -+if test "${enable_zip+set}" = set; then -+ enableval="$enable_zip" -+ PHP_ZIP=$enableval - else - -- PHP_XMLRPC=no -- test "$PHP_ENABLE_ALL" && PHP_XMLRPC=$PHP_ENABLE_ALL -+ PHP_ZIP=no -+ test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL - - fi - -@@ -99521,12 +105449,12 @@ fi - - ext_output="yes, shared" - ext_shared=yes --case $PHP_XMLRPC in -+case $PHP_ZIP in - shared,*) -- PHP_XMLRPC=`echo "$PHP_XMLRPC"|$SED 's/^shared,//'` -+ PHP_ZIP=`echo "$PHP_ZIP"|$SED 's/^shared,//'` - ;; - shared) -- PHP_XMLRPC=yes -+ PHP_ZIP=yes - ;; - no) - ext_output=no -@@ -99545,25 +105473,25 @@ echo "$ac_t""$ext_output" 1>&6 - - - --if test -z "$PHP_LIBXML_DIR"; then -+if test -z "$PHP_ZLIB_DIR"; then - --php_with_libxml_dir=no -+php_with_zlib_dir=no - --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:99554: checking libxml2 install dir" >&5 --# Check whether --with-libxml-dir or --without-libxml-dir was given. --if test "${with_libxml_dir+set}" = set; then -- withval="$with_libxml_dir" -- PHP_LIBXML_DIR=$withval -+echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 -+echo "configure:105482: checking for the location of libz" >&5 -+# Check whether --with-zlib-dir or --without-zlib-dir was given. -+if test "${with_zlib_dir+set}" = set; then -+ withval="$with_zlib_dir" -+ PHP_ZLIB_DIR=$withval - else - -- PHP_LIBXML_DIR=no -+ PHP_ZLIB_DIR=no - - - fi - - --ext_output=$PHP_LIBXML_DIR -+ext_output=$PHP_ZLIB_DIR - echo "$ac_t""$ext_output" 1>&6 - - -@@ -99571,315 +105499,501 @@ echo "$ac_t""$ext_output" 1>&6 - fi - - --php_with_libexpat_dir=no -+php_with_pcre_dir=no - --echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6 --echo "configure:99578: checking libexpat dir for XMLRPC-EPI" >&5 --# Check whether --with-libexpat-dir or --without-libexpat-dir was given. --if test "${with_libexpat_dir+set}" = set; then -- withval="$with_libexpat_dir" -- PHP_LIBEXPAT_DIR=$withval -+echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 -+echo "configure:105506: checking pcre install prefix" >&5 -+# Check whether --with-pcre-dir or --without-pcre-dir was given. -+if test "${with_pcre_dir+set}" = set; then -+ withval="$with_pcre_dir" -+ PHP_PCRE_DIR=$withval - else - -- PHP_LIBEXPAT_DIR=no -+ PHP_PCRE_DIR=no - - - fi - - --ext_output=$PHP_LIBEXPAT_DIR -+ext_output=$PHP_PCRE_DIR - echo "$ac_t""$ext_output" 1>&6 - - - - -+if test "$PHP_ZIP" != "no"; then - --php_with_iconv_dir=no -- --echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 --echo "configure:99601: checking iconv dir for XMLRPC-EPI" >&5 --# Check whether --with-iconv-dir or --without-iconv-dir was given. --if test "${with_iconv_dir+set}" = set; then -- withval="$with_iconv_dir" -- PHP_ICONV_DIR=$withval --else -- -- PHP_ICONV_DIR=no -- -- --fi -- -- --ext_output=$PHP_ICONV_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -+ if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then -+ if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then -+ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" -+ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" -+ elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then -+ PHP_ZLIB_DIR="$PHP_ZLIB_DIR" -+ PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" -+ else -+ { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } -+ fi -+ else -+ for i in /usr/local /usr; do -+ if test -f "$i/include/zlib/zlib.h"; then -+ PHP_ZLIB_DIR="$i" -+ PHP_ZLIB_INCDIR="$i/include/zlib" -+ elif test -f "$i/include/zlib.h"; then -+ PHP_ZLIB_DIR="$i" -+ PHP_ZLIB_INCDIR="$i/include" -+ fi -+ done -+ fi - -+ echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 -+echo "configure:105550: checking for the location of zlib" >&5 -+ if test "$PHP_ZLIB_DIR" = "no"; then -+ { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir= to specify prefix where ZLIB include and library are located" 1>&2; exit 1; } -+ else -+ echo "$ac_t""$PHP_ZLIB_DIR" 1>&6 -+ - --if test "$PHP_XMLRPC" != "no"; then -+ if test "$ext_shared" = "yes"; then -+ ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD" -+ if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then -+ -+ if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" -+ fi - -+ -+ if test "$ext_shared" = "yes"; then -+ ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD" -+ else -+ - -- am_i_shared=$PHP_XMLRPC_SHARED -- is_it_shared=$PHP_LIBXML_SHARED -- is_it_enabled=$PHP_LIBXML -- if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -- { echo "configure: error: --You've configured extension xmlrpc to build statically, but it --depends on extension libxml, which you've configured to build shared. --You either need to build xmlrpc shared or build libxml statically for the --build to be successful. --" 1>&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -- { echo "configure: error: --You've configured extension xmlrpc, which depends on extension libxml, --but you've either not enabled libxml, or have disabled it. --" 1>&2; exit 1; } -- fi - -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- PHP_VAR_SUBST="$PHP_VAR_SUBST XMLRPC_SHARED_LIBADD" -- -- cat >> confdefs.h <<\EOF --#define HAVE_XMLRPC 1 --EOF -+ 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 - - -- if test "$PHP_LIBEXPAT_DIR" = "no"; then -+ fi -+ -+ fi - -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: XML-RPC extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } - fi -- -+ else - --echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:99657: checking for xml2-config path" >&5 --if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -- --fi - --echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -+ if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then -+ -+ if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" -+ fi - -- if test -x "$ac_cv_php_xml2_config_path"; then -- XML2_CONFIG="$ac_cv_php_xml2_config_path" -- libxml_full_version=`$XML2_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $libxml_full_version -- IFS=$ac_IFS -- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -- if test "$LIBXML_VERSION" -ge "2006011"; then -- LIBXML_LIBS=`$XML2_CONFIG --libs` -- LIBXML_INCS=`$XML2_CONFIG --cflags` -+ - -- for ac_i in $LIBXML_LIBS; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -pthread" -- else -- - -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ 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 "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ 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 -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -+ -+ -+ fi -+ -+ fi - -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="$XMLRPC_SHARED_LIBADD -l$ac_ii" -- else -- - -- case $ac_ii in -+ case z in - c|c_r|pthread*) ;; - *) -- LIBS="$LIBS -l$ac_ii" -+ LIBS="-lz $LIBS" - ;; - esac - - -- fi -- ;; -- esac - - -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ fi -+ -+ - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then -+ -+ if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$PHP_ZLIB_INCDIR - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`" - fi - - -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -- else -- -- - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "LIBPATH$unique=set" -+ eval "INCLUDEPATH$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" -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ fi -+ -+ old_CPPFLAGS=$CPPFLAGS -+ CPPFLAGS=$INCLUDES -+ cat > conftest.$ac_ext < -+#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ rm -rf conftest* -+ -+ PHP_PCRE_REGEX=yes -+ -+else -+ rm -rf conftest* -+ -+ cat > conftest.$ac_ext < -+#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) -+yes -+#endif -+ -+EOF -+if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -+ egrep "yes" >/dev/null 2>&1; then -+ rm -rf conftest* -+ -+ PHP_PCRE_REGEX=pecl -+ -+else -+ rm -rf conftest* -+ -+ PHP_PCRE_REGEX=no -+ -+fi -+rm -f conftest* -+ -+ -+fi -+rm -f conftest* -+ -+ CPPFLAGS=$old_CPPFLAGS -+ -+ PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \ -+ lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c \ -+ lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \ -+ lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \ -+ lib/zip_source_free.c lib/zip_unchange_all.c lib/zip_delete.c \ -+ lib/zip_error_get_sys_type.c lib/zip_file_get_offset.c \ -+ lib/zip_get_name.c lib/zip_replace.c lib/zip_source_function.c \ -+ lib/zip_unchange.c lib/zip_dirent.c lib/zip_error_strerror.c \ -+ lib/zip_filerange_crc.c lib/zip_file_strerror.c lib/zip_get_num_files.c \ -+ lib/zip_get_archive_flag.c lib/zip_set_archive_flag.c \ -+ lib/zip_set_name.c lib/zip_source_zip.c lib/zip_unchange_data.c \ -+ lib/zip_entry_free.c lib/zip_error_to_str.c lib/zip_fopen.c \ -+ lib/zip_name_locate.c lib/zip_source_buffer.c lib/zip_stat.c \ -+ lib/zip_entry_new.c lib/zip_err_str.c lib/zip_fopen_index.c \ -+ lib/zip_get_archive_comment.c lib/zip_get_file_comment.c \ -+ lib/zip_new.c lib/zip_source_file.c lib/zip_stat_index.c \ -+ lib/zip_set_archive_comment.c lib/zip_set_file_comment.c \ -+ lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \ -+ lib/zip_error_clear.c lib/zip_file_error_clear.c" -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_ZIP 1 -+EOF -+ -+ -+ ext_builddir=ext/zip -+ ext_srcdir=$abs_srcdir/ext/zip -+ -+ ac_extra= -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -+ PHP_ZIP_SHARED=no -+ -+ -+ case ext/zip in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac -+ -+ -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo -+ -+ -+ old_IFS=$IFS -+ for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS -+ -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<>Makefile.objects</dev/null ; then -- ai_p=$ac_ii -+ if test "x" = "xyes"; then -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/zip.$suffix" - else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/zip.$suffix" - fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip" - -- ;; -- esac -- done -+ cat >>Makefile.objects<&6 --echo "configure:99815: checking whether libxml build works" >&5 --if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- -- old_LIBS=$LIBS -- LIBS=" -- $XMLRPC_SHARED_LIBADD -- $LIBS" -- if test "$cross_compiling" = yes; then -- -- LIBS=$old_LIBS -- --else -- cat > conftest.$ac_ext <> confdefs.h <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- LIBS=$old_LIBS -- -- php_cv_libxml_build_works=yes -+ -+ fi -+ fi -+ -+ if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -+ PHP_ZIP_SHARED=no -+ case "$PHP_SAPI" in -+ cgi|embed) - - --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -+ case ext/zip in -+ "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ esac - -- LIBS=$old_LIBS -- -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- - --fi --rm -fr conftest* --fi -+ -+ b_c_pre=$php_c_pre -+ b_cxx_pre=$php_cxx_pre -+ b_c_meta=$php_c_meta -+ b_cxx_meta=$php_cxx_meta -+ b_c_post=$php_c_post -+ b_cxx_post=$php_cxx_post -+ b_lo=$php_lo - - -+ old_IFS=$IFS -+ for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do -+ -+ IFS=. -+ set $ac_src -+ ac_obj=$1 -+ IFS=$old_IFS - --fi -+ PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" - --echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 -+ case $ac_src in -+ *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -+ *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -+ esac -+ -+ cat >>Makefile.objects<>Makefile.objects<&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Use --with-libxml-dir=" 1>&2; exit 1; } -+ -+ if test "$ext_builddir" = "."; then -+ PHP_PECL_EXTENSION=zip - -+ PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -+ - fi - -- else -- testval=no -- for i in $PHP_LIBEXPAT_DIR $XMLRPC_DIR /usr/local /usr; do -- if test -f $i/$PHP_LIBDIR/libexpat.a || test -f $i/$PHP_LIBDIR/libexpat.$SHLIB_SUFFIX_NAME; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBEXPAT 1 --EOF -+ -+ -+ $php_shtool mkdir -p $ext_builddir/lib -+ - -- -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD" - -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-lexpat $XMLRPC_SHARED_LIBADD" -- if test -n "$i/$PHP_LIBDIR"; then -- -- if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$i/$PHP_LIBDIR -- else -- -- ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" -- fi - - -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -- else -- -- -+ src=$ext_srcdir/Makefile.frag -+ ac_srcdir=$ext_srcdir -+ ac_builddir=$ext_builddir -+ test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -+ -+fi -+ -+ -+ -+php_enable_http=no -+ -+echo $ac_n "checking whether to enable extended HTTP support""... $ac_c" 1>&6 -+echo "configure:106074: checking whether to enable extended HTTP support" >&5 -+# Check whether --enable-http or --disable-http was given. -+if test "${enable_http+set}" = set; then -+ enableval="$enable_http" -+ PHP_HTTP=$enableval -+else - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ PHP_HTTP=no -+ test "$PHP_ENABLE_ALL" && PHP_HTTP=$PHP_ENABLE_ALL -+ -+fi -+ -+ -+ -+ext_output="yes, shared" -+ext_shared=yes -+case $PHP_HTTP in -+shared,*) -+ PHP_HTTP=`echo "$PHP_HTTP"|$SED 's/^shared,//'` -+ ;; -+shared) -+ PHP_HTTP=yes -+ ;; -+no) -+ ext_output=no -+ ext_shared=no -+ ;; -+*) -+ ext_output=yes -+ ext_shared=no -+ ;; -+esac -+ -+ -+ -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+php_with_http_shared_deps=$PHP_HTTP -+ -+echo $ac_n "checking whether to depend on extensions which have been built shared""... $ac_c" 1>&6 -+echo "configure:106117: checking whether to depend on extensions which have been built shared" >&5 -+# Check whether --with-http-shared-deps or --without-http-shared-deps was given. -+if test "${with_http_shared_deps+set}" = set; then -+ withval="$with_http_shared_deps" -+ PHP_HTTP_SHARED_DEPS=$withval -+else - -- 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" -+ PHP_HTTP_SHARED_DEPS=$PHP_HTTP - -- fi - -+fi - -- fi -- -- fi - -- fi -- else -- -+ext_output=$PHP_HTTP_SHARED_DEPS -+echo "$ac_t""$ext_output" 1>&6 - -- if test -n "$i/$PHP_LIBDIR"; then -- -- if test "$i/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$i/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$i/$PHP_LIBDIR" || echo "$i/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$i/$PHP_LIBDIR -- else -- -- ep_dir="`echo $i/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$i/$PHP_LIBDIR\"`" -- fi - -- -- -+ -+ -+php_with_http_curl_requests=$PHP_HTTP -+ -+echo $ac_n "checking whether to enable cURL HTTP request support""... $ac_c" 1>&6 -+echo "configure:106139: checking whether to enable cURL HTTP request support" >&5 -+# Check whether --with-http-curl-requests or --without-http-curl-requests was given. -+if test "${with_http_curl_requests+set}" = set; then -+ withval="$with_http_curl_requests" -+ PHP_HTTP_CURL_REQUESTS=$withval -+else - -+ PHP_HTTP_CURL_REQUESTS=$PHP_HTTP - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+fi -+ -+ -+ext_output=$PHP_HTTP_CURL_REQUESTS -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+php_with_http_curl_libevent=$PHP_HTTP_CURL_REQUESTS -+ -+echo $ac_n "checking whether to enable libevent support fur cURL""... $ac_c" 1>&6 -+echo "configure:106161: checking whether to enable libevent support fur cURL" >&5 -+# Check whether --with-http-curl-libevent or --without-http-curl-libevent was given. -+if test "${with_http_curl_libevent+set}" = set; then -+ withval="$with_http_curl_libevent" -+ PHP_HTTP_CURL_LIBEVENT=$withval -+else - -- 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" -+ PHP_HTTP_CURL_LIBEVENT=$PHP_HTTP_CURL_REQUESTS - -- fi - -+fi - -- -- fi - -- fi -+ext_output=$PHP_HTTP_CURL_LIBEVENT -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+php_with_http_zlib_compression=$PHP_HTTP -+ -+echo $ac_n "checking whether to enable zlib encodings support""... $ac_c" 1>&6 -+echo "configure:106183: checking whether to enable zlib encodings support" >&5 -+# Check whether --with-http-zlib-compression or --without-http-zlib-compression was given. -+if test "${with_http_zlib_compression+set}" = set; then -+ withval="$with_http_zlib_compression" -+ PHP_HTTP_ZLIB_COMPRESSION=$withval -+else - -+ PHP_HTTP_ZLIB_COMPRESSION=$PHP_HTTP - -- case expat in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lexpat $LIBS" -- ;; -- esac - -+fi - - -+ext_output=$PHP_HTTP_ZLIB_COMPRESSION -+echo "$ac_t""$ext_output" 1>&6 - -- fi - - -- -- if test "$i/include" != "/usr/include"; then -- -- if test -z "$i/include" || echo "$i/include" | grep '^/' >/dev/null ; then -- ai_p=$i/include -- else -- -- ep_dir="`echo $i/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$i/include\"`" -- fi - -- -+php_with_http_magic_mime="no" -+ -+echo $ac_n "checking whether to enable response content type guessing""... $ac_c" 1>&6 -+echo "configure:106205: checking whether to enable response content type guessing" >&5 -+# Check whether --with-http-magic-mime or --without-http-magic-mime was given. -+if test "${with_http_magic_mime+set}" = set; then -+ withval="$with_http_magic_mime" -+ PHP_HTTP_MAGIC_MIME=$withval -+else - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ PHP_HTTP_MAGIC_MIME="no" - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -+ -+fi -+ -+ -+ext_output=$PHP_HTTP_MAGIC_MIME -+echo "$ac_t""$ext_output" 1>&6 -+ -+ -+ -+ -+if test "$PHP_HTTP" != "no"; then -+ -+ -+ echo $ac_n "checking for egrep""... $ac_c" 1>&6 -+echo "configure:106228: checking for egrep" >&5 -+if eval "test \"`echo '$''{'ac_cv_prog_egrep'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ if echo a | (grep -E '(a|b)') >/dev/null 2>&1 -+ then ac_cv_prog_egrep='grep -E' -+ else ac_cv_prog_egrep='egrep' -+ fi -+fi -+ -+echo "$ac_t""$ac_cv_prog_egrep" 1>&6 -+ EGREP=$ac_cv_prog_egrep -+ -+ -+ -+ -+ -+ echo $ac_n "checking for a sed that does not truncate output""... $ac_c" 1>&6 -+echo "configure:106246: checking for a sed that does not truncate output" >&5 -+if eval "test \"`echo '$''{'lt_cv_path_SED'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # Loop through the user's path and test for sed and gsed. -+# Then use that list of sed's as ones to test for truncation. -+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR -+for as_dir in $PATH -+do -+ IFS=$as_save_IFS -+ test -z "$as_dir" && as_dir=. -+ for lt_ac_prog in sed gsed; do -+ for ac_exec_ext in '' $ac_executable_extensions; do -+ if test -f "$as_dir/$lt_ac_prog$ac_exec_ext"; then -+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext" - fi -- -+ done -+ done -+done -+lt_ac_max=0 -+lt_ac_count=0 -+# Add /usr/xpg4/bin/sed as it is typically found on Solaris -+# along with /bin/sed that truncates output. -+for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do -+ test ! -f $lt_ac_sed && continue -+ cat /dev/null > conftest.in -+ lt_ac_count=0 -+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in -+ # Check for GNU sed and select it if it is found. -+ if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then -+ lt_cv_path_SED=$lt_ac_sed -+ break - fi -+ while true; do -+ cat conftest.in conftest.in >conftest.tmp -+ mv conftest.tmp conftest.in -+ cp conftest.in conftest.nl -+ echo >>conftest.nl -+ $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break -+ cmp -s conftest.out conftest.nl || break -+ # 10000 chars as input seems more than enough -+ test $lt_ac_count -gt 10 && break -+ lt_ac_count=`expr $lt_ac_count + 1` -+ if test $lt_ac_count -gt $lt_ac_max; then -+ lt_ac_max=$lt_ac_count -+ lt_cv_path_SED=$lt_ac_sed -+ fi -+ done -+done -+ -+fi -+ -+SED=$lt_cv_path_SED -+echo "$ac_t""$SED" 1>&6 -+ -+ -+ -+ -+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -+echo "configure:106305: checking how to run the C preprocessor" >&5 -+# On Suns, sometimes $CPP names a directory. -+if test -n "$CPP" && test -d "$CPP"; then -+ CPP= -+fi -+if test -z "$CPP"; then -+if eval "test \"`echo '$''{'ac_cv_prog_CPP'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ # This must be in double quotes, not single quotes, because CPP may get -+ # substituted into the Makefile and "${CC-cc}" will confuse make. -+ CPP="${CC-cc} -E" -+ # 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:106326: \"$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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ 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:106343: \"$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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ 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:106360: \"$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 -+ : -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ CPP=/lib/cpp -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+fi -+rm -f conftest* -+ ac_cv_prog_CPP="$CPP" -+fi -+ CPP="$ac_cv_prog_CPP" -+else -+ ac_cv_prog_CPP="$CPP" -+fi -+echo "$ac_t""$CPP" 1>&6 - -- fi -+ -+ if test "$PHP_HTTP_SHARED_DEPS" != "no"; then -+ cat >> confdefs.h <<\EOF -+#define HTTP_SHARED_DEPS 1 -+EOF - -- testval=yes -- break -- fi -- done -+ else -+ cat >> confdefs.h <<\EOF -+#define HTTP_SHARED_DEPS 0 -+EOF - -- if test "$testval" = "no"; then -- { echo "configure: error: XML-RPC support requires libexpat. Use --with-libexpat-dir= (deprecated!)" 1>&2; exit 1; } -- fi -- fi -+ fi -+ -+ -+ -+ -+ -+ if test "x$PHP_LIBDIR" = "x"; then -+ PHP_LIBDIR=lib -+ fi - -- if test "$PHP_ICONV_SHARED" = "yes" || test "$PHP_ICONV" = "no"; then -+ for ac_hdr in netdb.h unistd.h -+do -+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -+echo "configure:106409: 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:106419: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -+ cat >> confdefs.h <&6 -+fi -+done - -- if test "$PHP_ICONV_DIR" != "no"; then -- PHP_ICONV=$PHP_ICONV_DIR -- fi -- -- if test -z "$PHP_ICONV" || test "$PHP_ICONV" = "no"; then -- PHP_ICONV=yes -- fi -+ -+ unset ac_cv_func_gethostname -+ unset ac_cv_func___gethostname -+ unset found - -- -- found_iconv=no -- unset ICONV_DIR -- -- # Create the directories for a VPATH build: -- $php_shtool mkdir -p ext/iconv -- -- echo > ext/iconv/php_have_bsd_iconv.h -- echo > ext/iconv/php_have_ibm_iconv.h -- echo > ext/iconv/php_have_glibc_iconv.h -- echo > ext/iconv/php_have_libiconv.h -- echo > ext/iconv/php_have_iconv.h -- echo > ext/iconv/php_php_iconv_impl.h -- echo > ext/iconv/php_iconv_aliased_libiconv.h -- echo > ext/iconv/php_php_iconv_h_path.h -- echo > ext/iconv/php_iconv_supports_errno.h -- -- if test "$PHP_ICONV" = "yes"; then -- echo $ac_n "checking for iconv""... $ac_c" 1>&6 --echo "configure:100111: checking for iconv" >&5 --if eval "test \"`echo '$''{'ac_cv_func_iconv'+set}'`\" = set"; then -+ echo $ac_n "checking for gethostname""... $ac_c" 1>&6 -+echo "configure:106451: checking for gethostname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_gethostname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char iconv(); -+char gethostname(); - - int main() { - - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_iconv) || defined (__stub___iconv) -+#if defined (__stub_gethostname) || defined (__stub___gethostname) - choke me - #else --iconv(); -+gethostname(); - #endif - - ; return 0; } - EOF --if { (eval echo configure:100139: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:106479: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_func_iconv=yes" -+ eval "ac_cv_func_gethostname=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_iconv=no" -+ eval "ac_cv_func_gethostname=no" - fi - rm -f conftest* - fi - --if eval "test \"`echo '$ac_cv_func_'iconv`\" = yes"; then -+if eval "test \"`echo '$ac_cv_func_'gethostname`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- found_iconv=yes -- -+ found=yes - else - echo "$ac_t""no" 1>&6 -- -- echo $ac_n "checking for libiconv""... $ac_c" 1>&6 --echo "configure:100160: checking for libiconv" >&5 --if eval "test \"`echo '$''{'ac_cv_func_libiconv'+set}'`\" = set"; then -+ echo $ac_n "checking for __gethostname""... $ac_c" 1>&6 -+echo "configure:106497: checking for __gethostname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___gethostname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < - /* Override any gcc2 internal prototype to avoid an error. */ - /* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ --char libiconv(); -+char __gethostname(); - - int main() { - - /* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ --#if defined (__stub_libiconv) || defined (__stub___libiconv) -+#if defined (__stub___gethostname) || defined (__stub_____gethostname) - choke me - #else --libiconv(); -+__gethostname(); - #endif - - ; return 0; } - EOF --if { (eval echo configure:100188: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:106525: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_func_libiconv=yes" -+ eval "ac_cv_func___gethostname=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_libiconv=no" -+ eval "ac_cv_func___gethostname=no" - fi - rm -f conftest* - fi - --if eval "test \"`echo '$ac_cv_func_'libiconv`\" = yes"; then -+if eval "test \"`echo '$ac_cv_func_'__gethostname`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- -- echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h -- -- cat >> confdefs.h <<\EOF --#define HAVE_LIBICONV 1 --EOF -- -- found_iconv=yes -- -+ found=yes - else - echo "$ac_t""no" 1>&6 -+found=no - fi -- -- -+ - fi - -- fi -- -- if test "$found_iconv" = "no"; then - -- for i in $PHP_ICONV /usr/local /usr; do -- if test -r $i/include/giconv.h; then -- cat >> confdefs.h <<\EOF --#define HAVE_GICONV_H 1 -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETHOSTNAME 1 - EOF - -- ICONV_DIR=$i -- iconv_lib_name=giconv -- break -- elif test -r $i/include/iconv.h; then -- ICONV_DIR=$i -- iconv_lib_name=iconv -- break -- fi -- done -- -- if test -z "$ICONV_DIR"; then -- { echo "configure: error: Please specify the install prefix of iconv with --with-iconv=" 1>&2; exit 1; } -- fi -- -- if test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.a || -- test -f $ICONV_DIR/$PHP_LIBDIR/lib$iconv_lib_name.$SHLIB_SUFFIX_NAME -- then -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$ICONV_DIR/$PHP_LIBDIR -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- else -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ac_cv_func_gethostname=yes -+ ;; - -- 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 -- -- ;; -- esac -- done -- -- echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 --echo "configure:100344: checking for libiconv in -l$iconv_lib_name" >&5 --ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` -+ unset ac_cv_lib_nsl_gethostname -+ unset ac_cv_lib_nsl___gethostname -+ unset found -+ echo $ac_n "checking for gethostname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106563: 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 - else - ac_save_LIBS="$LIBS" --LIBS="-l$iconv_lib_name $LIBS" -+LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:106582: \"$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 -@@ -100374,152 +106593,31 @@ LIBS="$ac_save_LIBS" - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- found_iconv=yes -- -- echo "#define HAVE_LIBICONV 1" > ext/iconv/php_have_libiconv.h -- -- cat >> confdefs.h <<\EOF --#define HAVE_LIBICONV 1 --EOF -- -- -- echo "#define ICONV_ALIASED_LIBICONV 1" > ext/iconv/php_iconv_aliased_libiconv.h -- -- cat >> confdefs.h <<\EOF --#define ICONV_ALIASED_LIBICONV 1 --EOF -- -- -- -+ found=yes - else - echo "$ac_t""no" 1>&6 - -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_$iconv_lib_name_libiconv -- -- -- save_old_LDFLAGS=$LDFLAGS -- ac_stuff=" -- -L$ICONV_DIR/$PHP_LIBDIR -- " -- -- save_ext_shared=$ext_shared -- ext_shared=yes -- -- for ac_i in $ac_stuff; do -- case $ac_i in -- -pthread) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -pthread" -- else -- -- -- unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "EXTRA_LDFLAGS$unique=set" -- EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -- fi -- -- fi -- ;; -- -l*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- if test "$ext_shared" = "yes"; then -- LDFLAGS="$LDFLAGS -l$ac_ii" -- else -- -- -- case $ac_ii in -- c|c_r|pthread*) ;; -- *) -- LIBS="$LIBS -l$ac_ii" -- ;; -- esac -- -- -- fi -- ;; -- esac -- -- -- ;; -- -L*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -- -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -- else -- -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- LDFLAGS="-L$ai_p $LDFLAGS" -- test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -- 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 -- -- ;; -- esac -- done -- -- echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 --echo "configure:100504: checking for iconv in -l$iconv_lib_name" >&5 --ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` -+ echo $ac_n "checking for __gethostname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106602: 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 - else - ac_save_LIBS="$LIBS" --LIBS="-l$iconv_lib_name $LIBS" -+LIBS="-lnsl $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:106621: \"$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 -@@ -100531,1133 +106629,1544 @@ 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 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- -- found_iconv=yes -- -- --else -- echo "$ac_t""no" 1>&6 -- -- LDFLAGS=$save_old_LDFLAGS -- ext_shared=$save_ext_shared -- unset ac_cv_lib_$iconv_lib_name_iconv -- -- --fi -- -- -- --fi -- -- fi -- fi -- -- if test "$found_iconv" = "yes"; then -- -- echo "#define HAVE_ICONV 1" > ext/iconv/php_have_iconv.h -- -- cat >> confdefs.h <<\EOF --#define HAVE_ICONV 1 --EOF -- -- if test -n "$ICONV_DIR"; then -- -- -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-l$iconv_lib_name $XMLRPC_SHARED_LIBADD" -- if test -n "$ICONV_DIR/$PHP_LIBDIR"; then -- -- if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$ICONV_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" -- fi -- -- -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_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 -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -- fi -- -- fi -+ -+fi - -- fi -- else -- - -- if test -n "$ICONV_DIR/$PHP_LIBDIR"; then -- -- if test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ICONV_DIR/$PHP_LIBDIR" != "/usr/lib"; then -- -- if test -z "$ICONV_DIR/$PHP_LIBDIR" || echo "$ICONV_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$ICONV_DIR/$PHP_LIBDIR -- else -- -- ep_dir="`echo $ICONV_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ICONV_DIR/$PHP_LIBDIR\"`" -- fi -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lnsl" -+ if test "$cross_compiling" = yes; then -+ found=no -+else -+ cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no -+fi -+rm -fr conftest* -+fi - -- -- -- -- -- 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" -- -+ LIBS=$ac_libs - fi - -- -+ if test "$found" = "yes"; then - -- fi -- -- fi -- - -- case $iconv_lib_name in -+ case nsl in - c|c_r|pthread*) ;; - *) -- LIBS="-l$iconv_lib_name $LIBS" -+ LIBS="-lnsl $LIBS" - ;; - esac - - -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETHOSTNAME 1 -+EOF - -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBNSL 1 -+EOF - -- fi -- -- -- -- if test "$ICONV_DIR/include" != "/usr/include"; then -- -- if test -z "$ICONV_DIR/include" || echo "$ICONV_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$ICONV_DIR/include -+ ac_cv_func_gethostname=yes - else - -- ep_dir="`echo $ICONV_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ICONV_DIR/include\"`" -- fi -+ : - -- -+ fi - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ ;; - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -+ esac - -- fi -+ -+ unset ac_cv_func_getdomainname -+ unset ac_cv_func___getdomainname -+ unset found -+ -+ echo $ac_n "checking for getdomainname""... $ac_c" 1>&6 -+echo "configure:106708: checking for getdomainname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_getdomainname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char getdomainname(); - -- fi -- --else -- { echo "configure: error: iconv not found, in order to build xmlrpc you need the iconv library" 1>&2; exit 1; } -- -- fi -+int main() { - -- fi --fi -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_getdomainname) || defined (__stub___getdomainname) -+choke me -+#else -+getdomainname(); -+#endif - --if test "$PHP_XMLRPC" = "yes"; then -- # 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:100713: 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 -- if test -n "$RANLIB"; then -- ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. -+; return 0; } -+EOF -+if { (eval echo configure:106736: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_getdomainname=yes" - else -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" -- ac_dummy="$PATH" -- for ac_dir in $ac_dummy; do -- test -z "$ac_dir" && ac_dir=. -- if test -f $ac_dir/$ac_word; then -- ac_cv_prog_RANLIB="ranlib" -- break -- fi -- done -- IFS="$ac_save_ifs" -- test -z "$ac_cv_prog_RANLIB" && ac_cv_prog_RANLIB=":" -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func_getdomainname=no" - fi -+rm -f conftest* - fi --RANLIB="$ac_cv_prog_RANLIB" --if test -n "$RANLIB"; then -- echo "$ac_t""$RANLIB" 1>&6 -+ -+if eval "test \"`echo '$ac_cv_func_'getdomainname`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes - else - echo "$ac_t""no" 1>&6 --fi -- --echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:100741: checking for inline" >&5 --if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then -+ echo $ac_n "checking for __getdomainname""... $ac_c" 1>&6 -+echo "configure:106754: checking for __getdomainname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___getdomainname'+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 < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __getdomainname(); - - int main() { --} $ac_kw foo() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___getdomainname) || defined (__stub_____getdomainname) -+choke me -+#else -+__getdomainname(); -+#endif -+ - ; return 0; } - EOF --if { (eval echo configure:100755: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:106782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- ac_cv_c_inline=$ac_kw; break -+ eval "ac_cv_func___getdomainname=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func___getdomainname=no" - fi - rm -f conftest* --done -- - fi - --echo "$ac_t""$ac_cv_c_inline" 1>&6 --case "$ac_cv_c_inline" in -- inline | yes) ;; -- no) cat >> confdefs.h <<\EOF --#define inline --EOF -- ;; -- *) cat >> confdefs.h <&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ -+fi - - --cat >> confdefs.h <<\EOF --#define UNDEF_THREADS_HACK -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETDOMAINNAME 1 - EOF - -- -- --echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 --echo "configure:100793: checking for ANSI C header files" >&5 --if eval "test \"`echo '$''{'ac_cv_header_stdc'+set}'`\" = set"; then -+ ac_cv_func_getdomainname=yes -+ ;; -+ -+ *) -+ -+ unset ac_cv_lib_nsl_getdomainname -+ unset ac_cv_lib_nsl___getdomainname -+ unset found -+ echo $ac_n "checking for getdomainname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106820: checking for getdomainname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'getdomainname | 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 -- cat > conftest.$ac_ext < conftest.$ac_ext < --#include --#include --#include -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char getdomainname(); -+ -+int main() { -+getdomainname() -+; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:100806: \"$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 -+if { (eval echo configure:106839: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- ac_cv_header_stdc=yes -+ eval "ac_cv_lib_$ac_lib_var=yes" - else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- ac_cv_header_stdc=no -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* -+LIBS="$ac_save_LIBS" - --if test $ac_cv_header_stdc = yes; then -- # SunOS 4.x string.h does not declare mem*, contrary to ANSI. -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for __getdomainname in -lnsl""... $ac_c" 1>&6 -+echo "configure:106859: checking for __getdomainname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'__getdomainname | 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="-lnsl $LIBS" - cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __getdomainname(); -+ -+int main() { -+__getdomainname() -+; return 0; } - EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "memchr" >/dev/null 2>&1; then -- : -+if { (eval echo configure:106878: \"$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 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* -- ac_cv_header_stdc=no -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* -+LIBS="$ac_save_LIBS" - - fi -- --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 --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "free" >/dev/null 2>&1; then -- : -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes - else -- rm -rf conftest* -- ac_cv_header_stdc=no -+ echo "$ac_t""no" 1>&6 -+found=no - fi --rm -f conftest* - -+ - fi - --if test $ac_cv_header_stdc = yes; then -- # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi. --if test "$cross_compiling" = yes; then -- : -+ -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lnsl" -+ if test "$cross_compiling" = yes; then -+ found=no - else - cat > conftest.$ac_ext < --#define ISLOWER(c) ('a' <= (c) && (c) <= 'z') --#define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c)) --#define XOR(e, f) (((e) && !(f)) || (!(e) && (f))) --int main () { int i; for (i = 0; i < 256; i++) --if (XOR (islower (i), ISLOWER (i)) || toupper (i) != TOUPPER (i)) exit(2); --exit (0); } -- -+main() { return (0); } - EOF --if { (eval echo configure:100873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:106914: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then -- : -+ found=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- ac_cv_header_stdc=no -+ found=no - fi - rm -fr conftest* - fi - --fi --fi -+ LIBS=$ac_libs -+ fi - --echo "$ac_t""$ac_cv_header_stdc" 1>&6 --if test $ac_cv_header_stdc = yes; then -- cat >> confdefs.h <<\EOF --#define STDC_HEADERS 1 -+ if test "$found" = "yes"; then -+ -+ -+ case nsl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lnsl $LIBS" -+ ;; -+ esac -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETDOMAINNAME 1 - EOF - --fi -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBNSL 1 -+EOF - --for ac_hdr in xmlparse.h xmltok.h stdlib.h strings.h string.h --do --ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` --echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:100900: checking for $ac_hdr" >&5 --if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then -+ ac_cv_func_getdomainname=yes -+ else -+ -+ : -+ -+ fi -+ -+ ;; -+ -+ esac -+ -+ -+ unset ac_cv_func_getservbyport -+ unset ac_cv_func___getservbyport -+ unset found -+ -+ echo $ac_n "checking for getservbyport""... $ac_c" 1>&6 -+echo "configure:106965: checking for getservbyport" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_getservbyport'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char getservbyport(); below. */ -+#include -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char getservbyport(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_getservbyport) || defined (__stub___getservbyport) -+choke me -+#else -+getservbyport(); -+#endif -+ -+; return 0; } - EOF --ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:100910: \"$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 -+if { (eval echo configure:106993: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=yes" -+ eval "ac_cv_func_getservbyport=yes" - else -- echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_header_$ac_safe=no" -+ eval "ac_cv_func_getservbyport=no" - fi - rm -f conftest* - fi --if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ -+if eval "test \"`echo '$ac_cv_func_'getservbyport`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'` -- cat >> confdefs.h <&6 --fi --done -+ echo $ac_n "checking for __getservbyport""... $ac_c" 1>&6 -+echo "configure:107011: checking for __getservbyport" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___getservbyport'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 -+else -+ cat > conftest.$ac_ext < -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __getservbyport(); - -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___getservbyport) || defined (__stub_____getservbyport) -+choke me -+#else -+__getservbyport(); -+#endif - -+; return 0; } -+EOF -+if { (eval echo configure:107039: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func___getservbyport=yes" -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_func___getservbyport=no" -+fi -+rm -f conftest* -+fi - -+if eval "test \"`echo '$ac_cv_func_'__getservbyport`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ -+fi - - -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETSERVBYPORT 1 -+EOF - --echo $ac_n "checking size of char""... $ac_c" 1>&6 --echo "configure:100942: checking size of char" >&5 --if eval "test \"`echo '$''{'ac_cv_sizeof_char'+set}'`\" = set"; then -+ ac_cv_func_getservbyport=yes -+ ;; -+ -+ *) -+ -+ unset ac_cv_lib_nsl_getservbyport -+ unset ac_cv_lib_nsl___getservbyport -+ unset found -+ echo $ac_n "checking for getservbyport in -lnsl""... $ac_c" 1>&6 -+echo "configure:107077: checking for getservbyport in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'getservbyport | 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 -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_char=1 --else -- cat > conftest.$ac_ext < conftest.$ac_ext < --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(char)); -- exit(0); --} -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char getservbyport(); -+ -+int main() { -+getservbyport() -+; return 0; } - EOF --if { (eval echo configure:100961: \"$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` -+if { (eval echo configure:107096: \"$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 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_char=0 -+ rm -rf conftest* -+ eval "ac_cv_lib_$ac_lib_var=no" - fi --rm -fr conftest* -+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 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for __getservbyport in -lnsl""... $ac_c" 1>&6 -+echo "configure:107116: checking for __getservbyport in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'__getservbyport | 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="-lnsl $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 --echo "$ac_t""$ac_cv_sizeof_char" 1>&6 --cat >> confdefs.h <&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -+ -+fi - - --echo $ac_n "checking size of int""... $ac_c" 1>&6 --echo "configure:100982: 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 -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_int=4 -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lnsl" -+ if test "$cross_compiling" = yes; then -+ found=no - else - cat > conftest.$ac_ext < --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(int)); -- exit(0); --} -+main() { return (0); } - EOF --if { (eval echo configure:101001: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:107171: \"$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` -+ found=yes - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -fr conftest* -- ac_cv_sizeof_int=0 -+ found=no - fi - rm -fr conftest* - fi - --fi --echo "$ac_t""$ac_cv_sizeof_int" 1>&6 --cat >> confdefs.h <> confdefs.h <<\EOF -+#define HAVE_GETSERVBYPORT 1 -+EOF -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBNSL 1 - EOF - -+ ac_cv_func_getservbyport=yes -+ else -+ -+ : - --echo $ac_n "checking size of long""... $ac_c" 1>&6 --echo "configure:101021: checking size of long" >&5 --if eval "test \"`echo '$''{'ac_cv_sizeof_long'+set}'`\" = set"; then -+ fi -+ -+ ;; -+ -+ esac -+ -+ -+ unset ac_cv_func_getservbyname -+ unset ac_cv_func___getservbyname -+ unset found -+ -+ echo $ac_n "checking for getservbyname""... $ac_c" 1>&6 -+echo "configure:107222: checking for getservbyname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func_getservbyname'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_long=4 --else - cat > conftest.$ac_ext < --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(long)); -- exit(0); --} -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char getservbyname(); below. */ -+#include -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char getservbyname(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub_getservbyname) || defined (__stub___getservbyname) -+choke me -+#else -+getservbyname(); -+#endif -+ -+; return 0; } - EOF --if { (eval echo configure:101040: \"$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` -+if { (eval echo configure:107250: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func_getservbyname=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_long=0 --fi --rm -fr conftest* -+ rm -rf conftest* -+ eval "ac_cv_func_getservbyname=no" - fi -- -+rm -f conftest* - fi --echo "$ac_t""$ac_cv_sizeof_long" 1>&6 --cat >> confdefs.h <&6 --echo "configure:101060: 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 -+if eval "test \"`echo '$ac_cv_func_'getservbyname`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes - else -- if test "$cross_compiling" = yes; then -- ac_cv_sizeof_long_long=8 -+ echo "$ac_t""no" 1>&6 -+ echo $ac_n "checking for __getservbyname""... $ac_c" 1>&6 -+echo "configure:107268: checking for __getservbyname" >&5 -+if eval "test \"`echo '$''{'ac_cv_func___getservbyname'+set}'`\" = set"; then -+ echo $ac_n "(cached) $ac_c" 1>&6 - else - cat > conftest.$ac_ext < --main() --{ -- FILE *f=fopen("conftestval", "w"); -- if (!f) exit(1); -- fprintf(f, "%d\n", sizeof(long long)); -- exit(0); --} -+/* System header to define __stub macros and hopefully few prototypes, -+ which can conflict with char __getservbyname(); below. */ -+#include -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __getservbyname(); -+ -+int main() { -+ -+/* The GNU C library defines this for functions which it implements -+ to always fail with ENOSYS. Some functions are actually named -+ something starting with __ and the normal name is an alias. */ -+#if defined (__stub___getservbyname) || defined (__stub_____getservbyname) -+choke me -+#else -+__getservbyname(); -+#endif -+ -+; return 0; } - EOF --if { (eval echo configure:101079: \"$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` -+if { (eval echo configure:107296: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ rm -rf conftest* -+ eval "ac_cv_func___getservbyname=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 -- rm -fr conftest* -- ac_cv_sizeof_long_long=0 -+ rm -rf conftest* -+ eval "ac_cv_func___getservbyname=no" - fi --rm -fr conftest* -+rm -f conftest* - fi - -+if eval "test \"`echo '$ac_cv_func_'__getservbyname`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi -+ - fi --echo "$ac_t""$ac_cv_sizeof_long_long" 1>&6 --cat >> confdefs.h <&6 --echo "configure:101099: checking for size_t" >&5 --if eval "test \"`echo '$''{'ac_cv_type_size_t'+set}'`\" = set"; then -+ case $found in -+ yes) -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETSERVBYNAME 1 -+EOF -+ -+ ac_cv_func_getservbyname=yes -+ ;; -+ -+ *) -+ -+ unset ac_cv_lib_nsl_getservbyname -+ unset ac_cv_lib_nsl___getservbyname -+ unset found -+ echo $ac_n "checking for getservbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:107334: checking for getservbyname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'getservbyname | 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 -- cat > conftest.$ac_ext < conftest.$ac_ext < --#if STDC_HEADERS --#include --#include --#endif -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char getservbyname(); -+ -+int main() { -+getservbyname() -+; return 0; } - EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "(^|[^a-zA-Z_0-9])size_t[^a-zA-Z_0-9]" >/dev/null 2>&1; then -+if { (eval echo configure:107353: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- ac_cv_type_size_t=yes -+ eval "ac_cv_lib_$ac_lib_var=yes" - else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 - rm -rf conftest* -- ac_cv_type_size_t=no -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* -+LIBS="$ac_save_LIBS" - - fi --echo "$ac_t""$ac_cv_type_size_t" 1>&6 --if test $ac_cv_type_size_t = no; then -- cat >> confdefs.h <<\EOF --#define size_t unsigned --EOF -- --fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 - --echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 --echo "configure:101132: 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 "checking for __getservbyname in -lnsl""... $ac_c" 1>&6 -+echo "configure:107373: checking for __getservbyname in -lnsl" >&5 -+ac_lib_var=`echo nsl'_'__getservbyname | 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 -- cat > conftest.$ac_ext < conftest.$ac_ext < --#include --#include -+/* Override any gcc2 internal prototype to avoid an error. */ -+/* We use char because int might match the return type of a gcc2 -+ builtin and then its argument prototype would still apply. */ -+char __getservbyname(); -+ - int main() { --struct tm *tp; -+__getservbyname() - ; return 0; } - EOF --if { (eval echo configure:101146: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:107392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* -- ac_cv_header_time=yes -+ eval "ac_cv_lib_$ac_lib_var=yes" - else - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- ac_cv_header_time=no -+ eval "ac_cv_lib_$ac_lib_var=no" - fi - rm -f conftest* --fi -+LIBS="$ac_save_LIBS" - --echo "$ac_t""$ac_cv_header_time" 1>&6 --if test $ac_cv_header_time = yes; then -- cat >> confdefs.h <<\EOF --#define TIME_WITH_SYS_TIME 1 --EOF -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ found=yes -+else -+ echo "$ac_t""no" 1>&6 -+found=no -+fi - -+ - fi - --echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 --echo "configure:101167: 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 -+ -+ if test "$found" = "yes"; then -+ ac_libs=$LIBS -+ LIBS="$LIBS -lnsl" -+ if test "$cross_compiling" = yes; then -+ found=no - else - cat > conftest.$ac_ext < -+main() { return (0); } - EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "uid_t" >/dev/null 2>&1; then -- rm -rf conftest* -- ac_cv_type_uid_t=yes -+if { (eval echo configure:107428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ found=yes - else -- rm -rf conftest* -- ac_cv_type_uid_t=no -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ found=no - fi --rm -f conftest* -- -+rm -fr conftest* - fi - --echo "$ac_t""$ac_cv_type_uid_t" 1>&6 --if test $ac_cv_type_uid_t = no; then -- cat >> confdefs.h <<\EOF --#define uid_t int -+ LIBS=$ac_libs -+ fi -+ -+ if test "$found" = "yes"; then -+ -+ -+ case nsl in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lnsl $LIBS" -+ ;; -+ esac -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HAVE_GETSERVBYNAME 1 - EOF - -- cat >> confdefs.h <<\EOF --#define gid_t int -+ cat >> confdefs.h <<\EOF -+#define HAVE_LIBNSL 1 - EOF - --fi -+ ac_cv_func_getservbyname=yes -+ else -+ -+ : -+ -+ fi -+ -+ ;; -+ -+ esac -+ -+ -+ if test "$PHP_HTTP_ZLIB_COMPRESSION" != "no"; then -+ echo $ac_n "checking for zlib.h""... $ac_c" 1>&6 -+echo "configure:107476: checking for zlib.h" >&5 -+ ZLIB_DIR= -+ for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /usr/local /usr /opt; do -+ if test -f "$i/include/zlib.h"; then -+ ZLIB_DIR=$i -+ break; -+ fi -+ done -+ if test "x$ZLIB_DIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: could not find zlib.h" 1>&2; exit 1; } -+ else -+ echo "$ac_t""found in $ZLIB_DIR" 1>&6 -+ echo $ac_n "checking for zlib version >= 1.2.0.4""... $ac_c" 1>&6 -+echo "configure:107490: checking for zlib version >= 1.2.0.4" >&5 -+ ZLIB_VERSION=`$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e 's/[^0-9\.]//g'` -+ echo "$ac_t""$ZLIB_VERSION" 1>&6 -+ if test `echo $ZLIB_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*1000000 + $2*10000 + $3*100 + $4}'` -lt 1020004; then -+ { echo "configure: error: libz version greater or equal to 1.2.0.4 required" 1>&2; exit 1; } -+ else -+ -+ if test "$ZLIB_DIR/include" != "/usr/include"; then -+ -+ if test -z "$ZLIB_DIR/include" || echo "$ZLIB_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$ZLIB_DIR/include -+ else -+ -+ ep_dir="`echo $ZLIB_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ZLIB_DIR/include\"`" -+ fi -+ -+ -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - -+ fi - -+ - -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-lz $HTTP_SHARED_LIBADD" -+ if test -n "$ZLIB_DIR/$PHP_LIBDIR"; then -+ -+ if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$ZLIB_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`" -+ fi - -+ -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_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 - - --# Standard XMLRPC list --for ac_func in \ -- strtoul strtoull snprintf \ -- strstr strpbrk strerror\ -- memcpy memmove --do --echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:101212: checking for $ac_func" >&5 --if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then -+ fi -+ -+ fi -+ -+ fi -+ else -+ -+ -+ if test -n "$ZLIB_DIR/$PHP_LIBDIR"; then -+ -+ if test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ if test -z "$ZLIB_DIR/$PHP_LIBDIR" || echo "$ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$ZLIB_DIR/$PHP_LIBDIR -+ else -+ -+ ep_dir="`echo $ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ZLIB_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ -+ -+ -+ 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 -+ -+ -+ case z in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-lz $LIBS" -+ ;; -+ esac -+ -+ -+ -+ -+ fi -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_ZLIB 1 -+EOF -+ -+ fi -+ fi -+ fi -+ -+ if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then -+ echo $ac_n "checking for curl/curl.h""... $ac_c" 1>&6 -+echo "configure:107634: checking for curl/curl.h" >&5 -+ CURL_DIR= -+ for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do -+ if test -f "$i/include/curl/curl.h"; then -+ CURL_DIR=$i -+ break -+ fi -+ done -+ if test "x$CURL_DIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: could not find curl/curl.h" 1>&2; exit 1; } -+ else -+ echo "$ac_t""found in $CURL_DIR" 1>&6 -+ fi -+ -+ echo $ac_n "checking for curl-config""... $ac_c" 1>&6 -+echo "configure:107650: checking for curl-config" >&5 -+ CURL_CONFIG= -+ for i in "$CURL_DIR/bin/curl-config" "$CURL_DIR/curl-config" `which curl-config`; do -+ if test -x "$i"; then -+ CURL_CONFIG=$i -+ break -+ fi -+ done -+ if test "x$CURL_CONFIG" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: could not find curl-config" 1>&2; exit 1; } -+ else -+ echo "$ac_t""found: $CURL_CONFIG" 1>&6 -+ fi -+ -+ echo $ac_n "checking for curl version >= 7.12.3""... $ac_c" 1>&6 -+echo "configure:107666: checking for curl version >= 7.12.3" >&5 -+ CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[^0-9\.]//g'` -+ echo "$ac_t""$CURL_VERSION" 1>&6 -+ if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then -+ { echo "configure: error: libcurl version greater or equal to 7.12.3 required" 1>&2; exit 1; } -+ fi -+ -+ -+ save_INCLUDES="$INCLUDES" -+ INCLUDES= -+ save_LIBS="$LIBS" -+ LIBS= -+ save_CFLAGS="$CFLAGS" -+ CFLAGS=`$CURL_CONFIG --cflags` -+ save_LDFLAGS="$LDFLAGS" -+ LDFLAGS=`$CURL_CONFIG --libs` -+ LDFLAGS="$LDFLAGS $ld_runpath_switch$CURL_DIR/$PHP_LIBDIR" -+ -+ echo $ac_n "checking for SSL support in libcurl""... $ac_c" 1>&6 -+echo "configure:107685: checking for SSL support in libcurl" >&5 -+ CURL_SSL=`$CURL_CONFIG --feature | $EGREP SSL` -+ if test "$CURL_SSL" = "SSL"; then -+ echo "$ac_t""yes" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_SSL 1 -+EOF -+ -+ -+ echo $ac_n "checking for openssl support in libcurl""... $ac_c" 1>&6 -+echo "configure:107695: checking for openssl support in libcurl" >&5 -+ if test "$cross_compiling" = yes; then -+ -+ echo "$ac_t""no" 1>&6 -+ -+else -+ cat > conftest.$ac_ext < -+ int main(int argc, char *argv[]) { -+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); -+ if (data && data->ssl_version && *data->ssl_version) { -+ const char *ptr = data->ssl_version; -+ while(*ptr == ' ') ++ptr; -+ return strncasecmp(ptr, "OpenSSL", sizeof("OpenSSL")-1); -+ } -+ return 1; -+ } -+ -+EOF -+if { (eval echo configure:107717: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ echo "$ac_t""yes" 1>&6 -+ ac_safe=`echo "openssl/crypto.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for openssl/crypto.h""... $ac_c" 1>&6 -+echo "configure:107723: checking for openssl/crypto.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 < --/* Override any gcc2 internal prototype to avoid an error. */ --/* We use char because int might match the return type of a gcc2 -- builtin and then its argument prototype would still apply. */ --char $ac_func(); -+#include -+EOF -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:107733: \"$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* -+ eval "ac_cv_header_$ac_safe=yes" -+else -+ echo "$ac_err" >&5 -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -rf conftest* -+ eval "ac_cv_header_$ac_safe=no" -+fi -+rm -f conftest* -+fi -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_OPENSSL 1 -+EOF - --int main() { -+ -+else -+ echo "$ac_t""no" 1>&6 -+fi - --/* The GNU C library defines this for functions which it implements -- to always fail with ENOSYS. Some functions are actually named -- something starting with __ and the normal name is an alias. */ --#if defined (__stub_$ac_func) || defined (__stub___$ac_func) --choke me --#else --$ac_func(); --#endif -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* -+ -+ echo "$ac_t""no" 1>&6 -+ -+fi -+rm -fr conftest* -+fi - --; return 0; } -+ -+ echo $ac_n "checking for gnutls support in libcurl""... $ac_c" 1>&6 -+echo "configure:107773: checking for gnutls support in libcurl" >&5 -+ if test "$cross_compiling" = yes; then -+ -+ echo "$ac_t""no" 1>&6 -+ -+else -+ cat > conftest.$ac_ext < -+ int main(int argc, char *argv[]) { -+ curl_version_info_data *data = curl_version_info(CURLVERSION_NOW); -+ if (data && data->ssl_version && *data->ssl_version) { -+ const char *ptr = data->ssl_version; -+ while(*ptr == ' ') ++ptr; -+ return strncasecmp(ptr, "GnuTLS", sizeof("GnuTLS")-1); -+ } -+ return 1; -+ } -+ -+EOF -+if { (eval echo configure:107795: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+then -+ -+ echo "$ac_t""yes" 1>&6 -+ ac_safe=`echo "gcrypt.h" | sed 'y%./+-%__p_%'` -+echo $ac_n "checking for gcrypt.h""... $ac_c" 1>&6 -+echo "configure:107801: checking for gcrypt.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 --if { (eval echo configure:101240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -+{ (eval echo configure:107811: \"$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* -- eval "ac_cv_func_$ac_func=yes" -+ eval "ac_cv_header_$ac_safe=yes" - else -+ echo "$ac_err" >&5 - echo "configure: failed program was:" >&5 - cat conftest.$ac_ext >&5 - rm -rf conftest* -- eval "ac_cv_func_$ac_func=no" -+ eval "ac_cv_header_$ac_safe=no" - fi - rm -f conftest* - fi -- --if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then -+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then - echo "$ac_t""yes" 1>&6 -- ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'` -- cat >> confdefs.h <> confdefs.h <<\EOF -+#define HTTP_HAVE_GNUTLS 1 - EOF -- -+ -+ - else - echo "$ac_t""no" 1>&6 - fi --done -- -- -- - -+ -+else -+ echo "configure: failed program was:" >&5 -+ cat conftest.$ac_ext >&5 -+ rm -fr conftest* - -- ext_builddir=ext/xmlrpc -- ext_srcdir=$abs_srcdir/ext/xmlrpc -+ echo "$ac_t""no" 1>&6 -+ -+fi -+rm -fr conftest* -+fi - -- ac_extra=`echo "-I@ext_srcdir@/libxmlrpc -DVERSION="0.50""|$SED s#@ext_srcdir@#$ext_srcdir#g|$SED s#@ext_builddir@#$ext_builddir#g` -+ else -+ echo "$ac_t""no" 1>&6 -+ fi -+ -+ INCLUDES="$save_INCLUDES" -+ LIBS="$save_LIBS" -+ CFLAGS="$save_CFLAGS" -+ LDFLAGS="$save_LDFLAGS" -+ -+ -+ echo $ac_n "checking for bundled SSL CA info""... $ac_c" 1>&6 -+echo "configure:107860: checking for bundled SSL CA info" >&5 -+ CURL_CAINFO= -+ for i in `$CURL_CONFIG --ca` "/etc/ssl/certs/ca-certificates.crt"; do -+ if test -f "$i"; then -+ CURL_CAINFO="$i" -+ break -+ fi -+ done -+ if test "x$CURL_CAINFO" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ else -+ echo "$ac_t""$CURL_CAINFO" 1>&6 -+ cat >> confdefs.h </dev/null ; then -+ ai_p=$CURL_DIR/include -+ else -+ -+ ep_dir="`echo $CURL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$CURL_DIR/include\"`" -+ fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XMLRPC_SHARED=no - - -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+ fi - -+ - -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -- libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -- libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -- libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -- libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -- libxmlrpc/xml_to_soap.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-lcurl $HTTP_SHARED_LIBADD" -+ if test -n "$CURL_DIR/$PHP_LIBDIR"; then - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$CURL_DIR/$PHP_LIBDIR - else -- if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_XMLRPC_SHARED=yes -- -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ -+ ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" -+ fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" -+ else -+ - - -- -- b_c_pre=$shared_c_pre -- b_cxx_pre=$shared_cxx_pre -- b_c_meta=$shared_c_meta -- b_cxx_meta=$shared_cxx_meta -- b_c_post=$shared_c_post -- b_cxx_post=$shared_cxx_post -- b_lo=$shared_lo -- -- -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c libxmlrpc/base64.c \ -- libxmlrpc/simplestring.c libxmlrpc/xml_to_dandarpc.c \ -- libxmlrpc/xmlrpc_introspection.c libxmlrpc/encodings.c \ -- libxmlrpc/system_methods.c libxmlrpc/xml_to_xmlrpc.c \ -- libxmlrpc/queue.c libxmlrpc/xml_element.c libxmlrpc/xmlrpc.c \ -- libxmlrpc/xml_to_soap.c; do -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects<>Makefile.objects</dev/null ; then -+ ai_p=$CURL_DIR/$PHP_LIBDIR - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" -+ -+ ep_dir="`echo $CURL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$CURL_DIR/$PHP_LIBDIR\"`" - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" -- -- cat >>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects</dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - -+ -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" -+ else -+ - - -- BUILD_DIR="$BUILD_DIR $ext_builddir/libxmlrpc" -+ 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 - -- XMLRPC_MODULE_TYPE=builtin -- --elif test "$PHP_XMLRPC" != "no"; then - -- if test -r $PHP_XMLRPC/include/xmlrpc.h; then -- XMLRPC_DIR=$PHP_XMLRPC/include -- elif test -r $PHP_XMLRPC/include/xmlrpc-epi/xmlrpc.h; then -- XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi -- else -- echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6 --echo "configure:101594: checking for XMLRPC-EPI in default path" >&5 -- for i in /usr/local /usr; do -- if test -r $i/include/xmlrpc.h; then -- XMLRPC_DIR=$i/include -- echo "$ac_t""found in $i" 1>&6 -- break - fi -- done -+ - fi - -- if test -z "$XMLRPC_DIR"; then -- echo "$ac_t""not found" 1>&6 -- { echo "configure: error: Please reinstall the XMLRPC-EPI distribution" 1>&2; exit 1; } -- fi -+ ;; -+ esac -+ done - -- -- if test "$XMLRPC_DIR" != "/usr/include"; then -- -- if test -z "$XMLRPC_DIR" || echo "$XMLRPC_DIR" | grep '^/' >/dev/null ; then -- ai_p=$XMLRPC_DIR -- else -- -- ep_dir="`echo $XMLRPC_DIR|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$XMLRPC_DIR\"`" -- fi -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_CURL 1 -+EOF - -- -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ - -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` - -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" - if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi - -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ - -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - -- if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-lxmlrpc $XMLRPC_SHARED_LIBADD" -- if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then -+ -+ fi -+ ;; -+ esac -+ -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` - -- if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then - -- if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$XMLRPC_DIR/$PHP_LIBDIR -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -- ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - - - if test "$ext_shared" = "yes"; then -- XMLRPC_SHARED_LIBADD="-L$ai_p $XMLRPC_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLRPC_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLRPC_SHARED_LIBADD" -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - - -@@ -101679,26 +108188,136 @@ echo "configure:101594: checking for XML - - fi - -+ ;; -+ esac -+ done -+ -+ echo $ac_n "checking for curl_share_strerror in -lcurl""... $ac_c" 1>&6 -+echo "configure:108197: checking for curl_share_strerror in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_share_strerror | 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="-lcurl $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_SHARE_STRERROR 1 -+EOF -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_share_strerror -+ -+ -+fi -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi -+ -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac -+ -+ - fi -- else -- -+ ;; -+ esac - -- if test -n "$XMLRPC_DIR/$PHP_LIBDIR"; then -- -- if test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$XMLRPC_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then - -- if test -z "$XMLRPC_DIR/$PHP_LIBDIR" || echo "$XMLRPC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$XMLRPC_DIR/$PHP_LIBDIR -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii - else - -- ep_dir="`echo $XMLRPC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$XMLRPC_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - - -- -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - - - unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -@@ -101714,431 +108333,676 @@ echo "configure:101594: checking for XML - fi - - -+ fi - - fi - -- fi -- -- -- case xmlrpc in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lxmlrpc $LIBS" -- ;; -- esac -- -- -+ ;; -+ esac -+ done - -+ echo $ac_n "checking for curl_multi_strerror in -lcurl""... $ac_c" 1>&6 -+echo "configure:108346: checking for curl_multi_strerror in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_strerror | 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="-lcurl $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_MULTI_STRERROR 1 -+EOF - - -- ext_builddir=ext/xmlrpc -- ext_srcdir=$abs_srcdir/ext/xmlrpc -+else -+ echo "$ac_t""no" 1>&6 - -- ac_extra= -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_strerror -+ -+ -+fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XMLRPC_SHARED=no -- -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " - -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+ save_ext_shared=$ext_shared -+ ext_shared=yes - -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ - -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c; do -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else - -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c; do -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- shared_objects_xmlrpc="$shared_objects_xmlrpc $ac_bdir$ac_obj.lo" -+ -+ 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 - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects<&6 -+echo "configure:108495: checking for curl_easy_strerror in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_easy_strerror | 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="-lcurl $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" - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpxmlrpc.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpxmlrpc.$suffix" -- fi -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" -- -- cat >>Makefile.objects<> confdefs.h <<\EOF -+#define HAVE_CURL_EASY_STRERROR 1 - EOF - -- ;; -- *) -- -- install_modules="install-modules" -+ -+else -+ echo "$ac_t""no" 1>&6 - -- case $host_alias in -- *aix*) -- suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/xmlrpc.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/xmlrpc.so '$ext_builddir'/xmlrpc.so' -- ;; -- *netware*) -- suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(XMLRPC, 3)_SHARED_LIBADD)' -- ;; -- *) -- suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_xmlrpc) $(XMLRPC_SHARED_LIBADD)' -- ;; -- esac -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_easy_strerror -+ -+ -+fi - -- if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/xmlrpc.$suffix" -- else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlrpc.$suffix" -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" - fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlrpc" - -- cat >>Makefile.objects<> confdefs.h </dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" = "cli"; then -- PHP_XMLRPC_SHARED=no -- case "$PHP_SAPI" in -- cgi|embed) -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else - - -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac - -+ 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 - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo - -+ fi -+ -+ fi - -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -+ ;; -+ esac -+ done - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ echo $ac_n "checking for curl_easy_reset in -lcurl""... $ac_c" 1>&6 -+echo "configure:108644: checking for curl_easy_reset in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_easy_reset | 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="-lcurl $LIBS" -+cat > conftest.$ac_ext <>Makefile.objects<&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" - -- EXT_STATIC="$EXT_STATIC xmlrpc" -- ;; -- *) -- -- -- case ext/xmlrpc in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlrpc"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlrpc/"; ac_bdir="ext/xmlrpc/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_EASY_RESET 1 -+EOF -+ - -+else -+ echo "$ac_t""no" 1>&6 - -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_easy_reset -+ -+ -+fi - -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -- old_IFS=$IFS -- for ac_src in xmlrpc-epi-php.c; do -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else - -- PHP_CLI_OBJS="$PHP_CLI_OBJS $ac_bdir$ac_obj.lo" -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac - -- cat >>Makefile.objects</dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" - fi -+ -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - - -- BUILD_DIR="$BUILD_DIR $ext_builddir" -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- -- -- if test "$ext_builddir" = "."; then -- PHP_PECL_EXTENSION=xmlrpc -+ cmd="echo $ac_n \"\$LIBPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "LIBPATH$unique=set" - -- PHP_VAR_SUBST="$PHP_VAR_SUBST PHP_PECL_EXTENSION" -- -+ test -n "$ld_runpath_switch" && LDFLAGS="$LDFLAGS $ld_runpath_switch$ai_p" -+ LDFLAGS="$LDFLAGS -L$ai_p" -+ PHP_RPATHS="$PHP_RPATHS $ai_p" -+ - fi - -- XMLRPC_MODULE_TYPE=external --fi -- - -+ fi -+ -+ fi - --php_enable_xmlwriter=yes -+ ;; -+ esac -+ done - --echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 --echo "configure:102037: checking whether to enable XMLWriter support" >&5 --# Check whether --enable-xmlwriter or --disable-xmlwriter was given. --if test "${enable_xmlwriter+set}" = set; then -- enableval="$enable_xmlwriter" -- PHP_XMLWRITER=$enableval -+ echo $ac_n "checking for curl_formget in -lcurl""... $ac_c" 1>&6 -+echo "configure:108793: checking for curl_formget in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_formget | 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 -- -- PHP_XMLWRITER=yes -- test "$PHP_ENABLE_ALL" && PHP_XMLWRITER=$PHP_ENABLE_ALL -+ ac_save_LIBS="$LIBS" -+LIBS="-lcurl $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_FORMGET 1 -+EOF - -+ -+else -+ echo "$ac_t""no" 1>&6 - --ext_output="yes, shared" --ext_shared=yes --case $PHP_XMLWRITER in --shared,*) -- PHP_XMLWRITER=`echo "$PHP_XMLWRITER"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_XMLWRITER=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_formget -+ -+ -+fi - -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ -+ -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - --echo "$ac_t""$ext_output" 1>&6 - -+ fi -+ ;; -+ esac - - -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - --if test -z "$PHP_LIBXML_DIR"; then -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ else -+ - --php_with_libxml_dir=no -- --echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 --echo "configure:102082: checking libxml2 install dir" >&5 --# Check whether --with-libxml-dir or --without-libxml-dir was given. --if test "${with_libxml_dir+set}" = set; then -- withval="$with_libxml_dir" -- PHP_LIBXML_DIR=$withval --else - -- PHP_LIBXML_DIR=no -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- --fi -+ 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 - - --ext_output=$PHP_LIBXML_DIR --echo "$ac_t""$ext_output" 1>&6 -+ fi -+ -+ fi - -+ ;; -+ esac -+ done - -+ echo $ac_n "checking for curl_multi_setopt in -lcurl""... $ac_c" 1>&6 -+echo "configure:108942: checking for curl_multi_setopt in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_setopt | 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="-lcurl $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" - --if test "$PHP_XMLWRITER" != "no"; then -- -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: XMLWriter extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi -+fi -+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_MULTI_SETOPT 1 -+EOF - - --echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 --echo "configure:102110: checking for xml2-config path" >&5 --if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 - else -- -- for i in $PHP_LIBXML_DIR /usr/local /usr; do -- if test -x "$i/bin/xml2-config"; then -- ac_cv_php_xml2_config_path="$i/bin/xml2-config" -- break -- fi -- done -+ echo "$ac_t""no" 1>&6 - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_setopt -+ -+ - fi - --echo "$ac_t""$ac_cv_php_xml2_config_path" 1>&6 -- -- if test -x "$ac_cv_php_xml2_config_path"; then -- XML2_CONFIG="$ac_cv_php_xml2_config_path" -- libxml_full_version=`$XML2_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $libxml_full_version -- IFS=$ac_IFS -- LIBXML_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -- if test "$LIBXML_VERSION" -ge "2006011"; then -- LIBXML_LIBS=`$XML2_CONFIG --libs` -- LIBXML_INCS=`$XML2_CONFIG --cflags` -- -- for ac_i in $LIBXML_LIBS; do -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -pthread" -+ LDFLAGS="$LDFLAGS -pthread" - else - - -@@ -102160,7 +109024,7 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- XMLWRITER_SHARED_LIBADD="$XMLWRITER_SHARED_LIBADD -l$ac_ii" -+ LDFLAGS="$LDFLAGS -l$ac_ii" - else - - -@@ -102195,8 +109059,8 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - - if test "$ext_shared" = "yes"; then -- XMLWRITER_SHARED_LIBADD="-L$ai_p $XMLWRITER_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XMLWRITER_SHARED_LIBADD="$ld_runpath_switch$ai_p $XMLWRITER_SHARED_LIBADD" -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - - -@@ -102222,22 +109086,128 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - esac - done - -- -- for ac_i in $LIBXML_INCS; do -- case $ac_i in -- -I*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/include"; then -+ echo $ac_n "checking for curl_multi_timeout in -lcurl""... $ac_c" 1>&6 -+echo "configure:109091: checking for curl_multi_timeout in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_timeout | 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="-lcurl $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_MULTI_TIMEOUT 1 -+EOF -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_timeout -+ -+ -+fi -+ -+ -+ -+ if test "$PHP_HTTP_CURL_LIBEVENT" != "no"; then -+ -+ extname=event -+ haveext=$PHP_EVENT -+ -+ echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:109151: checking for ext/$extname support" >&5 -+ if test -x "$PHP_EXECUTABLE"; then -+ grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` -+ if test "$grepext" = "$extname"; then -+ HTTP_HAVE_EXT_EVENT=1 -+ echo "$ac_t""yes" 1>&6 -+ -+ echo "configure: warning: event support is incompatible with pecl/event; continuing without libevent support" 1>&2 -+ -+ else -+ HTTP_HAVE_EXT_EVENT= -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for event.h""... $ac_c" 1>&6 -+echo "configure:109165: checking for event.h" >&5 -+ EVENT_DIR= -+ for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do -+ if test -f "$i/include/event.h"; then -+ EVENT_DIR=$i -+ break -+ fi -+ done -+ if test "x$EVENT_DIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ echo "configure: warning: continuing without libevent support" 1>&2 -+ else -+ echo "$ac_t""found in $EVENT_DIR" 1>&6 -+ -+ echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6 -+echo "configure:109180: checking for libevent version, roughly" >&5 -+ EVENT_VER="1.1b or lower" -+ if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then -+ if test -f "$EVENT_DIR/include/evrpc.h"; then -+ EVENT_VER="1.4 or greater" -+ else -+ EVENT_VER="1.2 or greater" -+ fi -+ fi -+ cat >> confdefs.h <&6 -+ -+ echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6 -+echo "configure:109196: checking for libcurl version >= 7.16.0" >&5 -+ echo "$ac_t""$CURL_VERSION" 1>&6 -+ if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then -+ echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2 -+ else -+ -+ if test "$EVENT_DIR/include" != "/usr/include"; then - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ if test -z "$EVENT_DIR/include" || echo "$EVENT_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$EVENT_DIR/include - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $EVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$EVENT_DIR/include\"`" - fi - - -@@ -102258,464 +109228,120 @@ echo "$ac_t""$ac_cv_php_xml2_config_path - - fi - -- ;; -- esac -- done -- -- -- echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 --echo "configure:102268: checking whether libxml build works" >&5 --if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then -- echo $ac_n "(cached) $ac_c" 1>&6 --else -- -- -- old_LIBS=$LIBS -- LIBS=" -- $XMLWRITER_SHARED_LIBADD -- $LIBS" -- if test "$cross_compiling" = yes; then -- -- LIBS=$old_LIBS -- --else -- cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null --then -- -- LIBS=$old_LIBS -- -- php_cv_libxml_build_works=yes -- -- --else -- echo "configure: failed program was:" >&5 -- cat conftest.$ac_ext >&5 -- rm -fr conftest* -- -- LIBS=$old_LIBS -+ if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EVENT_DIR/$PHP_LIBDIR -+ else - -- echo "$ac_t""no" 1>&6 -- { echo "configure: error: build test failed. Please check the config.log for details." 1>&2; exit 1; } -- -- --fi --rm -fr conftest* --fi -- -- -- --fi -- --echo "$ac_t""$php_cv_libxml_build_works" 1>&6 -- if test "$php_cv_libxml_build_works" = "yes"; then -- cat >> confdefs.h <<\EOF --#define HAVE_LIBXML 1 --EOF -- -- fi -- -- cat >> confdefs.h <<\EOF --#define HAVE_XMLWRITER 1 --EOF -- -+ ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - -- ext_builddir=ext/xmlwriter -- ext_srcdir=$abs_srcdir/ext/xmlwriter -- -- ac_extra= -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`" -+ fi - -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XMLWRITER_SHARED=no - -+ if test "$ext_shared" = "yes"; then -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" -+ else -+ - -- case ext/xmlwriter in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xmlwriter"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xmlwriter/"; ac_bdir="ext/xmlwriter/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac - -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` - -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in php_xmlwriter.c; do -+ 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" - -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -+ fi - -- cat >>Makefile.objects<>Makefile.objects<>Makefile.objects</dev/null ; then -+ ai_p=$EVENT_DIR/$PHP_LIBDIR - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/xmlwriter.$suffix" -- fi -- -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_xmlwriter" -- -- cat >>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<&2; exit 1; } -- fi --else -- { echo "configure: error: xml2-config not found. Please check your libxml2 installation." 1>&2; exit 1; } -- - fi -- --fi -- -- -- --php_with_xsl=no -- --echo $ac_n "checking for XSL support""... $ac_c" 1>&6 --echo "configure:102645: checking for XSL support" >&5 --# Check whether --with-xsl or --without-xsl was given. --if test "${with_xsl+set}" = set; then -- withval="$with_xsl" -- PHP_XSL=$withval --else - -- PHP_XSL=no -- test "$PHP_ENABLE_ALL" && PHP_XSL=$PHP_ENABLE_ALL -- --fi -- -- -- --ext_output="yes, shared" --ext_shared=yes --case $PHP_XSL in --shared,*) -- PHP_XSL=`echo "$PHP_XSL"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_XSL=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -- -- -- --echo "$ac_t""$ext_output" 1>&6 -- -- -- -- --if test "$PHP_XSL" != "no"; then -- -- if test "$PHP_LIBXML" = "no"; then -- { echo "configure: error: XSL extension requires LIBXML extension, add --enable-libxml" 1>&2; exit 1; } -- fi - -- if test "$PHP_DOM" = "no"; then -- { echo "configure: error: XSL extension requires DOM extension, add --enable-dom" 1>&2; exit 1; } -- fi -- -- for i in $PHP_XSL /usr/local /usr; do -- if test -x "$i/bin/xslt-config"; then -- XSLT_CONFIG=$i/bin/xslt-config -- break -- fi -- done -+ case event in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-levent $LIBS" -+ ;; -+ esac - -- if test -z "$XSLT_CONFIG"; then -- { echo "configure: error: xslt-config not found. Please reinstall the libxslt >= 1.1.0 distribution" 1>&2; exit 1; } -- else -- libxslt_full_version=`$XSLT_CONFIG --version` -- ac_IFS=$IFS -- IFS="." -- set $libxslt_full_version -- IFS=$ac_IFS -- LIBXSLT_VERSION=`expr $1 \* 1000000 + $2 \* 1000 + $3` -- if test "$LIBXSLT_VERSION" -ge "1001000"; then -- XSL_LIBS=`$XSLT_CONFIG --libs` -- XSL_INCS=`$XSLT_CONFIG --cflags` -- -- for ac_i in $XSL_LIBS; do -+ -+ -+ -+ fi -+ -+ -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_EVENT 1 -+EOF -+ -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " -+ -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do - case $ac_i in - -pthread) - if test "$ext_shared" = "yes"; then -- XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -pthread" -+ LDFLAGS="$LDFLAGS -pthread" - else - - -@@ -102737,7 +109363,7 @@ if test "$PHP_XSL" != "no"; then - c|c_r|pthread*) ;; - *) - if test "$ext_shared" = "yes"; then -- XSL_SHARED_LIBADD="$XSL_SHARED_LIBADD -l$ac_ii" -+ LDFLAGS="$LDFLAGS -l$ac_ii" - else - - -@@ -102772,8 +109398,8 @@ if test "$PHP_XSL" != "no"; then - - - if test "$ext_shared" = "yes"; then -- XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" - else - - -@@ -102799,22 +109425,121 @@ if test "$PHP_XSL" != "no"; then - esac - done - -- -- for ac_i in $XSL_INCS; do -- case $ac_i in -- -I*) -- ac_ii=`echo $ac_i|cut -c 3-` -- -- if test "$ac_ii" != "/usr/include"; then -+ echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6 -+echo "configure:109430: checking for curl_multi_socket_action in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_socket_action | 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="-lcurl $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_MULTI_SOCKET_ACTION 1 -+EOF -+ -+ -+else -+ echo "$ac_t""no" 1>&6 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_socket_action -+ -+ -+fi -+ -+ fi -+ fi -+ -+ fi -+ elif test "$haveext" != "no" && test "x$haveext" != "x"; then -+ HTTP_HAVE_EXT_EVENT=1 -+ echo "$ac_t""yes" 1>&6 -+ -+ echo "configure: warning: event support is incompatible with pecl/event; continuing without libevent support" 1>&2 -+ -+ else -+ HTTP_HAVE_EXT_EVENT= -+ echo "$ac_t""no" 1>&6 -+ -+ echo $ac_n "checking for event.h""... $ac_c" 1>&6 -+echo "configure:109497: checking for event.h" >&5 -+ EVENT_DIR= -+ for i in "$PHP_HTTP_CURL_LIBEVENT" /usr/local /usr /opt; do -+ if test -f "$i/include/event.h"; then -+ EVENT_DIR=$i -+ break -+ fi -+ done -+ if test "x$EVENT_DIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ echo "configure: warning: continuing without libevent support" 1>&2 -+ else -+ echo "$ac_t""found in $EVENT_DIR" 1>&6 -+ -+ echo $ac_n "checking for libevent version, roughly""... $ac_c" 1>&6 -+echo "configure:109512: checking for libevent version, roughly" >&5 -+ EVENT_VER="1.1b or lower" -+ if test -f "$EVENT_DIR/include/evhttp.h" && test -f "$EVENT_DIR/include/evdns.h"; then -+ if test -f "$EVENT_DIR/include/evrpc.h"; then -+ EVENT_VER="1.4 or greater" -+ else -+ EVENT_VER="1.2 or greater" -+ fi -+ fi -+ cat >> confdefs.h <&6 -+ -+ echo $ac_n "checking for libcurl version >= 7.16.0""... $ac_c" 1>&6 -+echo "configure:109528: checking for libcurl version >= 7.16.0" >&5 -+ echo "$ac_t""$CURL_VERSION" 1>&6 -+ if test `echo $CURL_VERSION | $SED -e 's/[^0-9]/ /g' | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71600; then -+ echo "configure: warning: libcurl version greater or equal to 7.16.0 required; continuing without libevent support" 1>&2 -+ else -+ -+ if test "$EVENT_DIR/include" != "/usr/include"; then - -- if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -- ai_p=$ac_ii -+ if test -z "$EVENT_DIR/include" || echo "$EVENT_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$EVENT_DIR/include - else - -- ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $EVENT_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ ai_p="$ep_realdir/`basename \"$EVENT_DIR/include\"`" - fi - - -@@ -102835,45 +109560,28 @@ if test "$PHP_XSL" != "no"; then - - fi - -- ;; -- esac -- done -- -- -- echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 --echo "configure:102845: checking for EXSLT support" >&5 -- for i in $PHP_XSL /usr/local /usr; do -- if test -r "$i/include/libexslt/exslt.h"; then -- PHP_XSL_EXSL_DIR=$i -- break -- fi -- done -- if test -z "$PHP_XSL_EXSL_DIR"; then -- echo "$ac_t""not found" 1>&6 -- else -- echo "$ac_t""found" 1>&6 -- -+ - - if test "$ext_shared" = "yes"; then -- XSL_SHARED_LIBADD="-lexslt $XSL_SHARED_LIBADD" -- if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then -+ HTTP_SHARED_LIBADD="-levent $HTTP_SHARED_LIBADD" -+ if test -n "$EVENT_DIR/$PHP_LIBDIR"; then - -- if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR -+ if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EVENT_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then -- XSL_SHARED_LIBADD="-L$ai_p $XSL_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && XSL_SHARED_LIBADD="$ld_runpath_switch$ai_p $XSL_SHARED_LIBADD" -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" - else - - -@@ -102899,18 +109607,18 @@ echo "configure:102845: checking for EXS - else - - -- if test -n "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR"; then -+ if test -n "$EVENT_DIR/$PHP_LIBDIR"; then - -- if test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$EVENT_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" || echo "$PHP_XSL_EXSL_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PHP_XSL_EXSL_DIR/$PHP_LIBDIR -+ if test -z "$EVENT_DIR/$PHP_LIBDIR" || echo "$EVENT_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$EVENT_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $PHP_XSL_EXSL_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $EVENT_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$EVENT_DIR/$PHP_LIBDIR\"`" - fi - - -@@ -102921,542 +109629,265 @@ echo "configure:102845: checking for EXS - - 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 -- -- -- case exslt in -- c|c_r|pthread*) ;; -- *) -- LIBS="-lexslt $LIBS" -- ;; -- esac -- -- -- -- -- fi -- -- -- -- if test "$PHP_XSL_EXSL_DIR/include" != "/usr/include"; then -- -- if test -z "$PHP_XSL_EXSL_DIR/include" || echo "$PHP_XSL_EXSL_DIR/include" | grep '^/' >/dev/null ; then -- ai_p=$PHP_XSL_EXSL_DIR/include -- else -- -- ep_dir="`echo $PHP_XSL_EXSL_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -- -- ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PHP_XSL_EXSL_DIR/include\"`" -- fi -- -- -- -- unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -- -- cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -- if test -n "$unique" && test "`eval $cmd`" = "" ; then -- eval "INCLUDEPATH$unique=set" -- -- if test ""; then -- INCLUDES="-I$ai_p $INCLUDES" -- else -- INCLUDES="$INCLUDES -I$ai_p" -- fi -- -- fi -- -- fi -- -- cat >> confdefs.h <<\EOF --#define HAVE_XSL_EXSLT 1 --EOF -- -- fi -- else -- { echo "configure: error: libxslt version 1.1.0 or greater required." 1>&2; exit 1; } -- fi -- -- -- fi -- -- cat >> confdefs.h <<\EOF --#define HAVE_XSL 1 --EOF -- -- -- ext_builddir=ext/xsl -- ext_srcdir=$abs_srcdir/ext/xsl -- -- ac_extra= -- -- if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_XSL_SHARED=no -- -- -- case ext/xsl in -- "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/xsl"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/xsl/"; ac_bdir="ext/xsl/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -- esac -- -- -- -- b_c_pre=$php_c_pre -- b_cxx_pre=$php_cxx_pre -- b_c_meta=$php_c_meta -- b_cxx_meta=$php_cxx_meta -- b_c_post=$php_c_post -- b_cxx_post=$php_cxx_post -- b_lo=$php_lo -- -- -- old_IFS=$IFS -- for ac_src in php_xsl.c xsltprocessor.c; do -- -- IFS=. -- set $ac_src -- ac_obj=$1 -- IFS=$old_IFS -- -- PHP_GLOBAL_OBJS="$PHP_GLOBAL_OBJS $ac_bdir$ac_obj.lo" -- -- case $ac_src in -- *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.s) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.S) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -- *.cpp|*.cc|*.cxx) ac_comp="$b_cxx_pre $ac_extra $ac_inc $b_cxx_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_cxx_post" ;; -- esac -- -- cat >>Makefile.objects<>Makefile.objects<>Makefile.objects<>Makefile.objects<> confdefs.h <>Makefile.objects<>Makefile.objects<&2; exit 1; } -- fi -- if test "x$is_it_enabled" = "xno" && test "x" != "xtrue"; then -- { echo "configure: error: --You've configured extension xsl, which depends on extension libxml, --but you've either not enabled libxml, or have disabled it. --" 1>&2; exit 1; } -- fi -- --fi -- -- -- --php_enable_zip=no -- --echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 --echo "configure:103321: checking for zip archive read/writesupport" >&5 --# Check whether --enable-zip or --disable-zip was given. --if test "${enable_zip+set}" = set; then -- enableval="$enable_zip" -- PHP_ZIP=$enableval --else -+ 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" - -- PHP_ZIP=no -- test "$PHP_ENABLE_ALL" && PHP_ZIP=$PHP_ENABLE_ALL -- --fi -+ fi - - -+ -+ fi - --ext_output="yes, shared" --ext_shared=yes --case $PHP_ZIP in --shared,*) -- PHP_ZIP=`echo "$PHP_ZIP"|$SED 's/^shared,//'` -- ;; --shared) -- PHP_ZIP=yes -- ;; --no) -- ext_output=no -- ext_shared=no -- ;; --*) -- ext_output=yes -- ext_shared=no -- ;; --esac -+ fi -+ -+ -+ case event in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="-levent $LIBS" -+ ;; -+ esac - - - --echo "$ac_t""$ext_output" 1>&6 - -+ fi - - -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_EVENT 1 -+EOF - --if test -z "$PHP_ZLIB_DIR"; then -+ -+ save_old_LDFLAGS=$LDFLAGS -+ ac_stuff="$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR -+ " - --php_with_zlib_dir=no -+ save_ext_shared=$ext_shared -+ ext_shared=yes -+ -+ for ac_i in $ac_stuff; do -+ case $ac_i in -+ -pthread) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -pthread" -+ else -+ -+ -+ unique=`echo $ac_i|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$EXTRA_LDFLAGS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "EXTRA_LDFLAGS$unique=set" -+ EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ac_i" -+ fi - --echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:103366: checking for the location of libz" >&5 --# Check whether --with-zlib-dir or --without-zlib-dir was given. --if test "${with_zlib_dir+set}" = set; then -- withval="$with_zlib_dir" -- PHP_ZLIB_DIR=$withval --else -+ fi -+ ;; -+ -l*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ - -- PHP_ZLIB_DIR=no -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="$LDFLAGS -l$ac_ii" -+ else -+ - -+ case $ac_ii in -+ c|c_r|pthread*) ;; -+ *) -+ LIBS="$LIBS -l$ac_ii" -+ ;; -+ esac - --fi - -+ fi -+ ;; -+ esac - --ext_output=$PHP_ZLIB_DIR --echo "$ac_t""$ext_output" 1>&6 - -+ ;; -+ -L*) -+ ac_ii=`echo $ac_i|cut -c 3-` -+ -+ if test "$ac_ii" != "/usr/$PHP_LIBDIR" && test "$ac_ii" != "/usr/lib"; then -+ -+ if test -z "$ac_ii" || echo "$ac_ii" | grep '^/' >/dev/null ; then -+ ai_p=$ac_ii -+ else -+ -+ ep_dir="`echo $ac_ii|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$ac_ii\"`" -+ fi - -+ -+ if test "$ext_shared" = "yes"; then -+ LDFLAGS="-L$ai_p $LDFLAGS" -+ test -n "$ld_runpath_switch" && LDFLAGS="$ld_runpath_switch$ai_p $LDFLAGS" -+ 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 - --php_with_pcre_dir=no -+ ;; -+ esac -+ done - --echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 --echo "configure:103390: checking pcre install prefix" >&5 --# Check whether --with-pcre-dir or --without-pcre-dir was given. --if test "${with_pcre_dir+set}" = set; then -- withval="$with_pcre_dir" -- PHP_PCRE_DIR=$withval -+ echo $ac_n "checking for curl_multi_socket_action in -lcurl""... $ac_c" 1>&6 -+echo "configure:109762: checking for curl_multi_socket_action in -lcurl" >&5 -+ac_lib_var=`echo curl'_'curl_multi_socket_action | 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 -- -- PHP_PCRE_DIR=no -- -+ ac_save_LIBS="$LIBS" -+LIBS="-lcurl $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 -+ -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ cat >> confdefs.h <<\EOF -+#define HAVE_CURL_MULTI_SOCKET_ACTION 1 -+EOF - --ext_output=$PHP_PCRE_DIR --echo "$ac_t""$ext_output" 1>&6 -- -- -+ -+else -+ echo "$ac_t""no" 1>&6 - -+ LDFLAGS=$save_old_LDFLAGS -+ ext_shared=$save_ext_shared -+ unset ac_cv_lib_curl_curl_multi_socket_action -+ -+ -+fi - --if test "$PHP_ZIP" != "no"; then -+ fi -+ fi -+ -+ fi -+ -+ fi -+ fi - -- if test "$PHP_ZLIB_DIR" != "no" && test "$PHP_ZLIB_DIR" != "yes"; then -- if test -f "$PHP_ZLIB_DIR/include/zlib/zlib.h"; then -- PHP_ZLIB_DIR="$PHP_ZLIB_DIR" -- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include/zlib" -- elif test -f "$PHP_ZLIB_DIR/include/zlib.h"; then -- PHP_ZLIB_DIR="$PHP_ZLIB_DIR" -- PHP_ZLIB_INCDIR="$PHP_ZLIB_DIR/include" -- else -- { echo "configure: error: Can not find zlib headers under "$PHP_ZLIB_DIR"" 1>&2; exit 1; } -- fi -+ if test "$PHP_HTTP_MAGIC_MIME" != "no"; then -+ echo $ac_n "checking for magic.h""... $ac_c" 1>&6 -+echo "configure:109824: checking for magic.h" >&5 -+ MAGIC_DIR= -+ for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do -+ if test -f "$i/include/magic.h"; then -+ MAGIC_DIR=$i -+ break -+ fi -+ done -+ if test "x$MAGIC_DIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ { echo "configure: error: could not find magic.h" 1>&2; exit 1; } -+ else -+ echo "$ac_t""found in $MAGIC_DIR" 1>&6 -+ fi -+ -+ -+ if test "$MAGIC_DIR/include" != "/usr/include"; then -+ -+ if test -z "$MAGIC_DIR/include" || echo "$MAGIC_DIR/include" | grep '^/' >/dev/null ; then -+ ai_p=$MAGIC_DIR/include - else -- for i in /usr/local /usr; do -- if test -f "$i/include/zlib/zlib.h"; then -- PHP_ZLIB_DIR="$i" -- PHP_ZLIB_INCDIR="$i/include/zlib" -- elif test -f "$i/include/zlib.h"; then -- PHP_ZLIB_DIR="$i" -- PHP_ZLIB_INCDIR="$i/include" -- fi -- done -+ -+ ep_dir="`echo $MAGIC_DIR/include|$SED 's%/*[^/][^/]*/*$%%'`" -+ -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$MAGIC_DIR/include\"`" - fi - -- echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 --echo "configure:103434: checking for the location of zlib" >&5 -- if test "$PHP_ZLIB_DIR" = "no"; then -- { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir= to specify prefix where ZLIB include and library are located" 1>&2; exit 1; } -- else -- echo "$ac_t""$PHP_ZLIB_DIR" 1>&6 - -+ -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi -+ -+ fi -+ -+ - - if test "$ext_shared" = "yes"; then -- ZIP_SHARED_LIBADD="-lz $ZIP_SHARED_LIBADD" -- if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then -+ HTTP_SHARED_LIBADD="-lmagic $HTTP_SHARED_LIBADD" -+ if test -n "$MAGIC_DIR/$PHP_LIBDIR"; then - -- if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR -+ if test -z "$MAGIC_DIR/$PHP_LIBDIR" || echo "$MAGIC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$MAGIC_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $MAGIC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$MAGIC_DIR/$PHP_LIBDIR\"`" - fi - - - if test "$ext_shared" = "yes"; then -- ZIP_SHARED_LIBADD="-L$ai_p $ZIP_SHARED_LIBADD" -- test -n "$ld_runpath_switch" && ZIP_SHARED_LIBADD="$ld_runpath_switch$ai_p $ZIP_SHARED_LIBADD" -+ HTTP_SHARED_LIBADD="-L$ai_p $HTTP_SHARED_LIBADD" -+ test -n "$ld_runpath_switch" && HTTP_SHARED_LIBADD="$ld_runpath_switch$ai_p $HTTP_SHARED_LIBADD" - else - - -@@ -103482,18 +109913,18 @@ echo "configure:103434: checking for the - else - - -- if test -n "$PHP_ZLIB_DIR/$PHP_LIBDIR"; then -+ if test -n "$MAGIC_DIR/$PHP_LIBDIR"; then - -- if test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$PHP_ZLIB_DIR/$PHP_LIBDIR" != "/usr/lib"; then -+ if test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/$PHP_LIBDIR" && test "$MAGIC_DIR/$PHP_LIBDIR" != "/usr/lib"; then - -- if test -z "$PHP_ZLIB_DIR/$PHP_LIBDIR" || echo "$PHP_ZLIB_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -- ai_p=$PHP_ZLIB_DIR/$PHP_LIBDIR -+ if test -z "$MAGIC_DIR/$PHP_LIBDIR" || echo "$MAGIC_DIR/$PHP_LIBDIR" | grep '^/' >/dev/null ; then -+ ai_p=$MAGIC_DIR/$PHP_LIBDIR - else - -- ep_dir="`echo $PHP_ZLIB_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $MAGIC_DIR/$PHP_LIBDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PHP_ZLIB_DIR/$PHP_LIBDIR\"`" -+ ai_p="$ep_realdir/`basename \"$MAGIC_DIR/$PHP_LIBDIR\"`" - fi - - -@@ -103519,10 +109950,10 @@ echo "configure:103434: checking for the - fi - - -- case z in -+ case magic in - c|c_r|pthread*) ;; - *) -- LIBS="-lz $LIBS" -+ LIBS="-lmagic $LIBS" - ;; - esac - -@@ -103532,17 +109963,57 @@ echo "configure:103434: checking for the - fi - - -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_MAGIC 1 -+EOF -+ -+ fi -+ -+ -+ extname=hash -+ haveext=$PHP_HASH -+ -+ echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:109978: checking for ext/$extname support" >&5 -+ if test -x "$PHP_EXECUTABLE"; then -+ grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` -+ if test "$grepext" = "$extname"; then -+ HTTP_HAVE_EXT_HASH=1 -+ echo "$ac_t""yes" 1>&6 -+ -+ echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6 -+echo "configure:109986: checking for php_hash.h" >&5 -+ HTTP_EXT_HASH_INCDIR= -+ for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do -+ if test -d $i; then -+ if test -f $i/php_hash.h; then -+ HTTP_EXT_HASH_INCDIR=$i -+ break -+ elif test -f $i/ext/hash/php_hash.h; then -+ HTTP_EXT_HASH_INCDIR=$i/ext/hash -+ break -+ fi -+ fi -+ done -+ if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ else -+ echo "$ac_t""$HTTP_EXT_HASH_INCDIR" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_PHP_HASH_H 1 -+EOF -+ -+ -+ if test "$HTTP_EXT_HASH_INCDIR" != "/usr/include"; then - -- if test "$PHP_ZLIB_INCDIR" != "/usr/include"; then -- -- if test -z "$PHP_ZLIB_INCDIR" || echo "$PHP_ZLIB_INCDIR" | grep '^/' >/dev/null ; then -- ai_p=$PHP_ZLIB_INCDIR -+ if test -z "$HTTP_EXT_HASH_INCDIR" || echo "$HTTP_EXT_HASH_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$HTTP_EXT_HASH_INCDIR - else - -- ep_dir="`echo $PHP_ZLIB_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" -+ ep_dir="`echo $HTTP_EXT_HASH_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - - ep_realdir="`(cd \"$ep_dir\" && pwd)`" -- ai_p="$ep_realdir/`basename \"$PHP_ZLIB_INCDIR\"`" -+ ai_p="$ep_realdir/`basename \"$HTTP_EXT_HASH_INCDIR\"`" - fi - - -@@ -103563,97 +110034,160 @@ echo "configure:103434: checking for the - - fi - -- fi -- -- old_CPPFLAGS=$CPPFLAGS -- CPPFLAGS=$INCLUDES -- cat > conftest.$ac_ext < --#if defined(HAVE_BUNDLED_PCRE) && !defined(COMPILE_DL_PCRE) --yes --#endif -- -+ fi -+ -+ else -+ HTTP_HAVE_EXT_HASH= -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ elif test "$haveext" != "no" && test "x$haveext" != "x"; then -+ HTTP_HAVE_EXT_HASH=1 -+ echo "$ac_t""yes" 1>&6 -+ -+ echo $ac_n "checking for php_hash.h""... $ac_c" 1>&6 -+echo "configure:110050: checking for php_hash.h" >&5 -+ HTTP_EXT_HASH_INCDIR= -+ for i in `echo $INCLUDES | $SED -e's/-I//g'` $abs_srcdir ../hash; do -+ if test -d $i; then -+ if test -f $i/php_hash.h; then -+ HTTP_EXT_HASH_INCDIR=$i -+ break -+ elif test -f $i/ext/hash/php_hash.h; then -+ HTTP_EXT_HASH_INCDIR=$i/ext/hash -+ break -+ fi -+ fi -+ done -+ if test "x$HTTP_EXT_HASH_INCDIR" = "x"; then -+ echo "$ac_t""not found" 1>&6 -+ else -+ echo "$ac_t""$HTTP_EXT_HASH_INCDIR" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define HTTP_HAVE_PHP_HASH_H 1 - EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "yes" >/dev/null 2>&1; then -- rm -rf conftest* -- -- PHP_PCRE_REGEX=yes -- --else -- rm -rf conftest* -- -- cat > conftest.$ac_ext < --#if defined(HAVE_PCRE) && !defined(COMPILE_DL_PCRE) --yes --#endif -+ -+ if test "$HTTP_EXT_HASH_INCDIR" != "/usr/include"; then - --EOF --if (eval "$ac_cpp conftest.$ac_ext") 2>&5 | -- egrep "yes" >/dev/null 2>&1; then -- rm -rf conftest* -- -- PHP_PCRE_REGEX=pecl -+ if test -z "$HTTP_EXT_HASH_INCDIR" || echo "$HTTP_EXT_HASH_INCDIR" | grep '^/' >/dev/null ; then -+ ai_p=$HTTP_EXT_HASH_INCDIR -+ else - --else -- rm -rf conftest* -- -- PHP_PCRE_REGEX=no -+ ep_dir="`echo $HTTP_EXT_HASH_INCDIR|$SED 's%/*[^/][^/]*/*$%%'`" - --fi --rm -f conftest* -+ ep_realdir="`(cd \"$ep_dir\" && pwd)`" -+ ai_p="$ep_realdir/`basename \"$HTTP_EXT_HASH_INCDIR\"`" -+ fi - -+ - --fi --rm -f conftest* -+ unique=`echo $ai_p|$SED 's/[^a-zA-Z0-9]/_/g'` -+ -+ cmd="echo $ac_n \"\$INCLUDEPATH$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INCLUDEPATH$unique=set" -+ -+ if test ""; then -+ INCLUDES="-I$ai_p $INCLUDES" -+ else -+ INCLUDES="$INCLUDES -I$ai_p" -+ fi -+ -+ fi - -- CPPFLAGS=$old_CPPFLAGS -+ fi - -- PHP_ZIP_SOURCES="$PHP_ZIP_SOURCES lib/zip_add.c lib/zip_error.c lib/zip_fclose.c \ -- lib/zip_fread.c lib/zip_open.c lib/zip_source_filep.c \ -- lib/zip_strerror.c lib/zip_close.c lib/zip_error_get.c \ -- lib/zip_file_error_get.c lib/zip_free.c lib/zip_rename.c \ -- lib/zip_source_free.c lib/zip_unchange_all.c lib/zip_delete.c \ -- lib/zip_error_get_sys_type.c lib/zip_file_get_offset.c \ -- lib/zip_get_name.c lib/zip_replace.c lib/zip_source_function.c \ -- lib/zip_unchange.c lib/zip_dirent.c lib/zip_error_strerror.c \ -- lib/zip_filerange_crc.c lib/zip_file_strerror.c lib/zip_get_num_files.c \ -- lib/zip_get_archive_flag.c lib/zip_set_archive_flag.c \ -- lib/zip_set_name.c lib/zip_source_zip.c lib/zip_unchange_data.c \ -- lib/zip_entry_free.c lib/zip_error_to_str.c lib/zip_fopen.c \ -- lib/zip_name_locate.c lib/zip_source_buffer.c lib/zip_stat.c \ -- lib/zip_entry_new.c lib/zip_err_str.c lib/zip_fopen_index.c \ -- lib/zip_get_archive_comment.c lib/zip_get_file_comment.c \ -- lib/zip_new.c lib/zip_source_file.c lib/zip_stat_index.c \ -- lib/zip_set_archive_comment.c lib/zip_set_file_comment.c \ -- lib/zip_unchange_archive.c lib/zip_memdup.c lib/zip_stat_init.c lib/zip_add_dir.c \ -- lib/zip_error_clear.c lib/zip_file_error_clear.c" -+ fi -+ -+ else -+ HTTP_HAVE_EXT_HASH= -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ - -- cat >> confdefs.h <<\EOF --#define HAVE_ZIP 1 --EOF -+ -+ extname=iconv -+ haveext=$PHP_ICONV -+ -+ echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:110116: checking for ext/$extname support" >&5 -+ if test -x "$PHP_EXECUTABLE"; then -+ grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` -+ if test "$grepext" = "$extname"; then -+ HTTP_HAVE_EXT_ICONV=1 -+ echo "$ac_t""yes" 1>&6 -+ -+ else -+ HTTP_HAVE_EXT_ICONV= -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ elif test "$haveext" != "no" && test "x$haveext" != "x"; then -+ HTTP_HAVE_EXT_ICONV=1 -+ echo "$ac_t""yes" 1>&6 -+ -+ else -+ HTTP_HAVE_EXT_ICONV= -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ - -- -- ext_builddir=ext/zip -- ext_srcdir=$abs_srcdir/ext/zip -+ -+ extname=session -+ haveext=$PHP_SESSION -+ -+ echo $ac_n "checking for ext/$extname support""... $ac_c" 1>&6 -+echo "configure:110144: checking for ext/$extname support" >&5 -+ if test -x "$PHP_EXECUTABLE"; then -+ grepext=`$PHP_EXECUTABLE -m | $EGREP ^$extname\$` -+ if test "$grepext" = "$extname"; then -+ HTTP_HAVE_EXT_SESSION=1 -+ echo "$ac_t""yes" 1>&6 -+ -+ else -+ HTTP_HAVE_EXT_SESSION= -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ elif test "$haveext" != "no" && test "x$haveext" != "x"; then -+ HTTP_HAVE_EXT_SESSION=1 -+ echo "$ac_t""yes" 1>&6 -+ -+ else -+ HTTP_HAVE_EXT_SESSION= -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+ -+ PHP_HTTP_SOURCES="missing.c http.c http_functions.c phpstr/phpstr.c \ -+ http_util_object.c http_message_object.c http_request_object.c http_request_pool_api.c \ -+ http_response_object.c http_exception_object.c http_requestpool_object.c \ -+ http_api.c http_cache_api.c http_request_api.c http_request_info.c http_date_api.c \ -+ http_headers_api.c http_message_api.c http_send_api.c http_url_api.c \ -+ http_info_api.c http_request_method_api.c http_encoding_api.c \ -+ http_filter_api.c http_request_body_api.c http_querystring_object.c \ -+ http_deflatestream_object.c http_inflatestream_object.c http_cookie_api.c \ -+ http_querystring_api.c http_request_datashare_api.c http_requestdatashare_object.c \ -+ http_persistent_handle_api.c" -+ -+ -+ ext_builddir=ext/http -+ ext_srcdir=$abs_srcdir/ext/http - - ac_extra= - - if test "$ext_shared" != "shared" && test "$ext_shared" != "yes" && test "" != "cli"; then -- PHP_ZIP_SHARED=no -+ PHP_HTTP_SHARED=no - - -- case ext/zip in -+ case ext/http in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -103668,7 +110202,7 @@ EOF - - - old_IFS=$IFS -- for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do -+ for ac_src in $PHP_HTTP_SOURCES; do - - IFS=. - set $ac_src -@@ -103691,18 +110225,18 @@ EOF - done - - -- EXT_STATIC="$EXT_STATIC zip" -+ EXT_STATIC="$EXT_STATIC http" - if test "$ext_shared" != "nocli"; then -- EXT_CLI_STATIC="$EXT_CLI_STATIC zip" -+ EXT_CLI_STATIC="$EXT_CLI_STATIC http" - fi - else - if test "$ext_shared" = "shared" || test "$ext_shared" = "yes"; then -- PHP_ZIP_SHARED=yes -+ PHP_HTTP_SHARED=yes - -- case ext/zip in -+ case ext/http in - "") ac_srcdir="$abs_srcdir/"; unset ac_bdir; ac_inc="-I. -I$abs_srcdir" ;; -- /*) ac_srcdir=`echo "ext/zip"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -- *) ac_srcdir="$abs_srcdir/ext/zip/"; ac_bdir="ext/zip/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; -+ /*) ac_srcdir=`echo "ext/http"|cut -c 2-`"/"; ac_bdir=$ac_srcdir; ac_inc="-I$ac_bdir -I$abs_srcdir/$ac_bdir" ;; -+ *) ac_srcdir="$abs_srcdir/ext/http/"; ac_bdir="ext/http/"; ac_inc="-I$ac_bdir -I$ac_srcdir" ;; - esac - - -@@ -103717,14 +110251,14 @@ EOF - - - old_IFS=$IFS -- for ac_src in php_zip.c zip_stream.c $PHP_ZIP_SOURCES; do -+ for ac_src in $PHP_HTTP_SOURCES; do - - IFS=. - set $ac_src - ac_obj=$1 - IFS=$old_IFS - -- shared_objects_zip="$shared_objects_zip $ac_bdir$ac_obj.lo" -+ shared_objects_http="$shared_objects_http $ac_bdir$ac_obj.lo" - - case $ac_src in - *.c) ac_comp="$b_c_pre $ac_extra $ac_inc $b_c_meta -c $ac_srcdir$ac_src -o $ac_bdir$ac_obj.$b_lo $b_c_post" ;; -@@ -103747,31 +110281,31 @@ EOF - case $host_alias in - *aix*) - suffix=so -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phpzip.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) $(PHPZIP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phpzip.so '$ext_builddir'/phpzip.so' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -Wl,-G -o '$ext_builddir'/phphttp.la -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_http) $(PHPHTTP_SHARED_LIBADD) && mv -f '$ext_builddir'/.libs/phphttp.so '$ext_builddir'/phphttp.so' - ;; - *netware*) - suffix=nlm -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPZIP, 3)_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -shared -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_http) -L$(top_builddir)/netware -lphp5lib $(M4_SUBSTR(PHPHTTP, 3)_SHARED_LIBADD)' - ;; - *) - suffix=la -- link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_zip) $(PHPZIP_SHARED_LIBADD)' -+ link_cmd='$(LIBTOOL) --mode=link $(CC) $(COMMON_FLAGS) $(CFLAGS_CLEAN) $(EXTRA_CFLAGS) $(LDFLAGS) -o $@ -export-dynamic -avoid-version -prefer-pic -module -rpath $(phplibdir) $(EXTRA_LDFLAGS) $(shared_objects_http) $(PHPHTTP_SHARED_LIBADD)' - ;; - esac - - if test "x" = "xyes"; then -- PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phpzip.$suffix" -+ PHP_ZEND_EX="$PHP_ZEND_EX \$(phplibdir)/phphttp.$suffix" - else -- PHP_MODULES="$PHP_MODULES \$(phplibdir)/phpzip.$suffix" -+ PHP_MODULES="$PHP_MODULES \$(phplibdir)/phphttp.$suffix" - fi - -- PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_zip" -+ PHP_VAR_SUBST="$PHP_VAR_SUBST shared_objects_http" - - cat >>Makefile.objects<>Makefile.objects<> confdefs.h <&6 -+echo "configure:110476: checking whether to add a dependency on ext/$extname" >&5 -+ if test "$PHP_HTTP_SHARED_DEPS" = "no"; then -+ echo "$ac_t""no" 1>&6 -+ -+ elif test "$haveext"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ -+ am_i_shared=$PHP_HTTP_SHARED -+ is_it_shared=$PHP_HASH_SHARED -+ is_it_enabled=$PHP_HASH -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension http to build statically, but it -+depends on extension hash, which you've configured to build shared. -+You either need to build http shared or build hash statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension http, which depends on extension hash, -+but you've either not enabled hash, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ -+ else -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+ -+ extname=iconv -+ haveext=$HTTP_HAVE_EXT_ICONV -+ -+ echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6 -+echo "configure:110514: checking whether to add a dependency on ext/$extname" >&5 -+ if test "$PHP_HTTP_SHARED_DEPS" = "no"; then -+ echo "$ac_t""no" 1>&6 -+ -+ elif test "$haveext"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ -+ am_i_shared=$PHP_HTTP_SHARED -+ is_it_shared=$PHP_ICONV_SHARED -+ is_it_enabled=$PHP_ICONV -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension http to build statically, but it -+depends on extension iconv, which you've configured to build shared. -+You either need to build http shared or build iconv statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension http, which depends on extension iconv, -+but you've either not enabled iconv, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ -+ else -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+ -+ extname=session -+ haveext=$HTTP_HAVE_EXT_SESSION -+ -+ echo $ac_n "checking whether to add a dependency on ext/$extname""... $ac_c" 1>&6 -+echo "configure:110552: checking whether to add a dependency on ext/$extname" >&5 -+ if test "$PHP_HTTP_SHARED_DEPS" = "no"; then -+ echo "$ac_t""no" 1>&6 -+ -+ elif test "$haveext"; then -+ echo "$ac_t""yes" 1>&6 -+ -+ -+ am_i_shared=$PHP_HTTP_SHARED -+ is_it_shared=$PHP_SESSION_SHARED -+ is_it_enabled=$PHP_SESSION -+ if test "$am_i_shared" = "no" && test "$is_it_shared" = "yes" ; then -+ { echo "configure: error: -+You've configured extension http to build statically, but it -+depends on extension session, which you've configured to build shared. -+You either need to build http shared or build session statically for the -+build to be successful. -+" 1>&2; exit 1; } -+ fi -+ if test "x$is_it_enabled" = "xno" && test "xtrue" != "xtrue"; then -+ { echo "configure: error: -+You've configured extension http, which depends on extension session, -+but you've either not enabled session, or have disabled it. -+" 1>&2; exit 1; } -+ fi -+ -+ -+ -+ else -+ echo "$ac_t""no" 1>&6 -+ -+ fi -+ -+ -+ -+ -+ $php_shtool mkdir -p $ext_builddir/phpstr -+ -+ -+ -+ PHP_VAR_SUBST="$PHP_VAR_SUBST HTTP_SHARED_LIBADD" -+ -+ -+ PHP_HTTP_HEADERS="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \ -+ php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \ -+ php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h \ -+ php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.h \ -+ php_http_exception_object.h php_http_message_object.h php_http_request_object.h \ -+ php_http_requestpool_object.h php_http_response_object.h php_http_util_object.h \ -+ php_http_querystring_object.h php_http_deflatestream_object.h php_http_inflatestream_object.h \ -+ php_http_cookie_api.h php_http_querystring_api.h php_http_request_datashare_api.h php_http_requestdatashare_object.h \ -+ php_http_persistent_handle_api.h" -+ -+ - -+ header_path=ext/http -+ for header_file in $PHP_HTTP_HEADERS; do -+ hp_hf="$header_path/$header_file" -+ - -- $php_shtool mkdir -p $ext_builddir/lib -+ unique=`echo $hp_hf|$SED 's/[^a-zA-Z0-9]/_/g'` - -+ cmd="echo $ac_n \"\$INSTALLHEADERS$unique$ac_c\"" -+ if test -n "$unique" && test "`eval $cmd`" = "" ; then -+ eval "INSTALLHEADERS$unique=set" -+ -+ INSTALL_HEADERS="$INSTALL_HEADERS $hp_hf" -+ -+ fi - -+ done - -- PHP_VAR_SUBST="$PHP_VAR_SUBST ZIP_SHARED_LIBADD" - -+ - -- -- src=$ext_srcdir/Makefile.frag -- ac_srcdir=$ext_srcdir -- ac_builddir=$ext_builddir -- test -f "$src" && $SED -e "s#\$(srcdir)#$ac_srcdir#g" -e "s#\$(builddir)#$ac_builddir#g" $src >> Makefile.fragments -+ cat >> confdefs.h <<\EOF -+#define HAVE_HTTP 1 -+EOF - - fi - -@@ -103954,7 +110634,7 @@ fi - php_enable_mysqlnd=no - - echo $ac_n "checking whether to enable mysqlnd""... $ac_c" 1>&6 --echo "configure:103958: checking whether to enable mysqlnd" >&5 -+echo "configure:110638: checking whether to enable mysqlnd" >&5 - # Check whether --enable-mysqlnd or --disable-mysqlnd was given. - if test "${enable_mysqlnd+set}" = set; then - enableval="$enable_mysqlnd" -@@ -103998,7 +110678,7 @@ echo "$ac_t""$ext_output" 1>&6 - php_enable_mysqlnd_compression_support=yes - - echo $ac_n "checking whether to disable compressed protocol support in mysqlnd""... $ac_c" 1>&6 --echo "configure:104002: checking whether to disable compressed protocol support in mysqlnd" >&5 -+echo "configure:110682: checking whether to disable compressed protocol support in mysqlnd" >&5 - # Check whether --enable-mysqlnd_compression_support or --disable-mysqlnd_compression_support was given. - if test "${enable_mysqlnd_compression_support+set}" = set; then - enableval="$enable_mysqlnd_compression_support" -@@ -104022,7 +110702,7 @@ if test -z "$PHP_ZLIB_DIR"; then - php_with_zlib_dir=no - - echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 --echo "configure:104026: checking for the location of libz" >&5 -+echo "configure:110706: checking for the location of libz" >&5 - # Check whether --with-zlib-dir or --without-zlib-dir was given. - if test "${with_zlib_dir+set}" = set; then - withval="$with_zlib_dir" -@@ -104389,7 +111069,7 @@ if test "$PHP_MYSQLND" != "no" || test " - - for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do - echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6 --echo "configure:104393: checking whether $php_typename exists" >&5 -+echo "configure:111073: checking whether $php_typename exists" >&5 - - php_cache_value=php_cv_sizeof_$php_typename - if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then -@@ -104406,7 +111086,7 @@ else - - else - cat > conftest.$ac_ext < - #if STDC_HEADERS -@@ -104436,7 +111116,7 @@ int main() - } - - EOF --if { (eval echo configure:104440: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:111120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - eval $php_cache_value=`cat conftestval` -@@ -104576,7 +111256,7 @@ if test "$PHP_RECODE" != "no"; then - done - - echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 --echo "configure:104580: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 -+echo "configure:111260: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 - ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -104584,7 +111264,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-l$MYSQL_LIBNAME $LIBS" - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111279: \"$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 -@@ -104697,7 +111377,7 @@ fi - php_with_pear=DEFAULT - - echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6 --echo "configure:104701: checking whether to install PEAR" >&5 -+echo "configure:111381: checking whether to install PEAR" >&5 - # Check whether --with-pear or --without-pear was given. - if test "${with_pear+set}" = set; then - withval="$with_pear" -@@ -104799,7 +111479,7 @@ fi - bison_version=none - if test "$YACC"; then - echo $ac_n "checking for bison version""... $ac_c" 1>&6 --echo "configure:104803: checking for bison version" >&5 -+echo "configure:111483: checking for bison version" >&5 - if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -104855,17 +111535,17 @@ dlfcn.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:104859: checking for $ac_hdr" >&5 -+echo "configure:111539: 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:104869: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:111549: \"$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* -@@ -104893,12 +111573,12 @@ done - - - echo $ac_n "checking for size_t""... $ac_c" 1>&6 --echo "configure:104897: checking for size_t" >&5 -+echo "configure:111577: 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 -@@ -104926,12 +111606,12 @@ EOF - fi - - echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 --echo "configure:104930: checking return type of signal handlers" >&5 -+echo "configure:111610: 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 -@@ -104948,7 +111628,7 @@ int main() { - int i; - ; return 0; } - EOF --if { (eval echo configure:104952: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - ac_cv_type_signal=void - else -@@ -104972,12 +111652,12 @@ EOF - - - echo $ac_n "checking for uint""... $ac_c" 1>&6 --echo "configure:104976: checking for uint" >&5 -+echo "configure:111656: 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 -@@ -105005,12 +111685,12 @@ EOF - fi - - echo $ac_n "checking for ulong""... $ac_c" 1>&6 --echo "configure:105009: checking for ulong" >&5 -+echo "configure:111689: 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 -@@ -105040,9 +111720,9 @@ fi - - - echo $ac_n "checking for int32_t""... $ac_c" 1>&6 --echo "configure:105044: checking for int32_t" >&5 -+echo "configure:111724: checking for int32_t" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <&6 --echo "configure:105084: checking for uint32_t" >&5 -+echo "configure:111764: checking for uint32_t" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:111785: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - cat >> confdefs.h <&6 --echo "configure:105124: checking for vprintf" >&5 -+echo "configure:111804: 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:111832: \"$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 -@@ -105172,12 +111852,12 @@ fi - - if test "$ac_cv_func_vprintf" != yes; then - echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 --echo "configure:105176: checking for _doprnt" >&5 -+echo "configure:111856: 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:111884: \"$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 -@@ -105225,7 +111905,7 @@ fi - fi - - echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 --echo "configure:105229: checking for 8-bit clean memcmp" >&5 -+echo "configure:111909: 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 -@@ -105233,7 +111913,7 @@ else - 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:111927: \"$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 -@@ -105263,19 +111943,19 @@ test $ac_cv_func_memcmp_clean = no && LI - # 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:105267: checking for working alloca.h" >&5 -+echo "configure:111947: 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:105279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:111959: \"$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 -@@ -105296,12 +111976,12 @@ EOF - fi - - echo $ac_n "checking for alloca""... $ac_c" 1>&6 --echo "configure:105300: checking for alloca" >&5 -+echo "configure:111980: 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:112013: \"$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 -@@ -105361,12 +112041,12 @@ EOF - - - echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 --echo "configure:105365: checking whether alloca needs Cray hooks" >&5 -+echo "configure:112045: 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 - if test $ac_cv_os_cray = yes; then - for ac_func in _getb67 GETB67 getb67; do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:105395: checking for $ac_func" >&5 -+echo "configure:112075: 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:112103: \"$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 -@@ -105446,7 +112126,7 @@ done - fi - - echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 --echo "configure:105450: checking stack direction for C alloca" >&5 -+echo "configure:112130: 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 -@@ -105454,7 +112134,7 @@ else - 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:112157: \"$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 -@@ -105497,12 +112177,12 @@ fi - for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:105501: checking for $ac_func" >&5 -+echo "configure:112181: 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:112209: \"$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 -@@ -105551,7 +112231,7 @@ done - - - echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6 --echo "configure:105555: checking whether sprintf is broken" >&5 -+echo "configure:112235: 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 -@@ -105562,11 +112242,11 @@ else - - 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:112250: \"$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 -@@ -105600,12 +112280,12 @@ EOF - for ac_func in finite isfinite isinf isnan - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:105604: checking for $ac_func" >&5 -+echo "configure:112284: 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:112312: \"$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 -@@ -105655,13 +112335,13 @@ done - - - echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6 --echo "configure:105659: checking whether fp_except is defined" >&5 -+echo "configure:112339: 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 < -@@ -105672,7 +112352,7 @@ fp_except x = (fp_except) 0; - - ; return 0; } - EOF --if { (eval echo configure:105676: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:112356: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - rm -rf conftest* - - ac_cv_type_fp_except=yes -@@ -105699,9 +112379,9 @@ EOF - - - echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6 --echo "configure:105703: checking for usable _FPU_SETCW" >&5 -+echo "configure:112383: checking for usable _FPU_SETCW" >&5 - cat > conftest.$ac_ext < -@@ -105721,7 +112401,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:105725: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112405: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cfp_have__fpu_setcw=yes - else -@@ -105742,9 +112422,9 @@ EOF - fi - - echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6 --echo "configure:105746: checking for usable fpsetprec" >&5 -+echo "configure:112426: checking for usable fpsetprec" >&5 - cat > conftest.$ac_ext < -@@ -105763,7 +112443,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:105767: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112447: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cfp_have_fpsetprec=yes - else -@@ -105784,9 +112464,9 @@ EOF - fi - - echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6 --echo "configure:105788: checking for usable _controlfp" >&5 -+echo "configure:112468: checking for usable _controlfp" >&5 - cat > conftest.$ac_ext < -@@ -105805,7 +112485,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:105809: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112489: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cfp_have__controlfp=yes - else -@@ -105826,9 +112506,9 @@ EOF - fi - - echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6 --echo "configure:105830: checking for usable _controlfp_s" >&5 -+echo "configure:112510: checking for usable _controlfp_s" >&5 - cat > conftest.$ac_ext < -@@ -105848,7 +112528,7 @@ int main() { - - ; return 0; } - EOF --if { (eval echo configure:105852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112532: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cfp_have__controlfp_s=yes - else -@@ -105869,9 +112549,9 @@ EOF - fi - - echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6 --echo "configure:105873: checking whether FPU control word can be manipulated by inline assembler" >&5 -+echo "configure:112553: checking whether FPU control word can be manipulated by inline assembler" >&5 - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:112577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - rm -rf conftest* - ac_cfp_have_fpu_inline_asm_x86=yes - else -@@ -105915,7 +112595,7 @@ EOF - - - echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6 --echo "configure:105919: checking whether double cast to long preserves least significant bits" >&5 -+echo "configure:112599: checking whether double cast to long preserves least significant bits" >&5 - - if test "$cross_compiling" = yes; then - -@@ -105923,7 +112603,7 @@ if test "$cross_compiling" = yes; then - - else - cat > conftest.$ac_ext < -@@ -105947,7 +112627,7 @@ int main() - } - - EOF --if { (eval echo configure:105951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:112631: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - cat >> confdefs.h <<\EOF -@@ -105973,17 +112653,17 @@ for ac_hdr in dlfcn.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:105977: checking for $ac_hdr" >&5 -+echo "configure:112657: 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:105987: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:112667: \"$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* -@@ -106011,14 +112691,14 @@ done - - - echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6 --echo "configure:106015: checking whether dlsym() requires a leading underscore in symbol names" >&5 -+echo "configure:112695: checking whether dlsym() requires a leading underscore in symbol names" >&5 - if test "$cross_compiling" = yes; then : - - else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:112765: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -106164,23 +112844,23 @@ fi - - - echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6 --echo "configure:106168: checking virtual machine dispatch method" >&5 -+echo "configure:112848: checking virtual machine dispatch method" >&5 - echo "$ac_t""$PHP_ZEND_VM" 1>&6 - - echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6 --echo "configure:106172: checking whether to enable thread-safety" >&5 -+echo "configure:112852: checking whether to enable thread-safety" >&5 - echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6 - - echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6 --echo "configure:106176: checking whether to enable inline optimization for GCC" >&5 -+echo "configure:112856: checking whether to enable inline optimization for GCC" >&5 - echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6 - - echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6 --echo "configure:106180: checking whether to enable Zend debugging" >&5 -+echo "configure:112860: checking whether to enable Zend debugging" >&5 - echo "$ac_t""$ZEND_DEBUG" 1>&6 - - echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6 --echo "configure:106184: checking whether to enable Zend multibyte" >&5 -+echo "configure:112864: checking whether to enable Zend multibyte" >&5 - echo "$ac_t""$ZEND_MULTIBYTE" 1>&6 - - case $PHP_ZEND_VM in -@@ -106253,21 +112933,21 @@ fi + echo $ac_n "checking size of long long""... $ac_c" 1>&6 +-echo "configure:46346: checking size of long long" >&5 ++echo "configure:47369: 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 +@@ -46350,18 +47373,19 @@ + ac_cv_sizeof_long_long=8 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long long)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:46365: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:47389: \"$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 +@@ -46710,7 +47734,7 @@ + php_with_iconv=yes + echo $ac_n "checking for iconv support""... $ac_c" 1>&6 +-echo "configure:46714: checking for iconv support" >&5 ++echo "configure:47738: checking for iconv support" >&5 + # Check whether --with-iconv or --without-iconv was given. + if test "${with_iconv+set}" = set; then + withval="$with_iconv" +@@ -46771,12 +47795,12 @@ - echo $ac_n "checking for inline""... $ac_c" 1>&6 --echo "configure:106257: checking for inline" >&5 -+echo "configure:112937: checking for inline" >&5 - if eval "test \"`echo '$''{'ac_cv_c_inline'+set}'`\" = set"; then + if test "$PHP_ICONV" = "yes"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:46775: checking for iconv" >&5 ++echo "configure:47799: checking for iconv" >&5 + if eval "test \"`echo '$''{'ac_cv_func_iconv'+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:112951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +-if { (eval echo configure:46803: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47827: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - ac_cv_c_inline=$ac_kw; break - else -@@ -106296,7 +112976,7 @@ esac - - - echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6 --echo "configure:106300: checking target system is Darwin" >&5 -+echo "configure:112980: checking target system is Darwin" >&5 - if echo "$target" | grep "darwin" > /dev/null; then - cat >> confdefs.h <<\EOF - #define DARWIN 1 -@@ -106308,7 +112988,7 @@ else - fi - - echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6 --echo "configure:106312: checking for MM alignment and log values" >&5 -+echo "configure:112992: checking for MM alignment and log values" >&5 - - if test "$cross_compiling" = yes; then - -@@ -106316,7 +112996,7 @@ if test "$cross_compiling" = yes; then - - else - cat > conftest.$ac_ext < -@@ -106352,7 +113032,7 @@ int main() - } - - EOF --if { (eval echo configure:106356: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113036: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1` -@@ -106377,7 +113057,7 @@ fi - echo "$ac_t""done" 1>&6 - - echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6 --echo "configure:106381: checking for memory allocation using mmap(MAP_ANON)" >&5 -+echo "configure:113061: checking for memory allocation using mmap(MAP_ANON)" >&5 - - if test "$cross_compiling" = yes; then - -@@ -106385,7 +113065,7 @@ if test "$cross_compiling" = yes; then - - else - cat > conftest.$ac_ext < -@@ -106421,7 +113101,7 @@ int main() - } - - EOF --if { (eval echo configure:106425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113105: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - cat >> confdefs.h <<\EOF -@@ -106443,7 +113123,7 @@ fi - - - echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6 --echo "configure:106447: checking for memory allocation using mmap("/dev/zero")" >&5 -+echo "configure:113127: checking for memory allocation using mmap("/dev/zero")" >&5 - - if test "$cross_compiling" = yes; then - -@@ -106451,7 +113131,7 @@ if test "$cross_compiling" = yes; then - + eval "ac_cv_func_iconv=yes" else - cat > conftest.$ac_ext < -@@ -106497,7 +113177,7 @@ int main() - } +@@ -46820,12 +47844,12 @@ + echo "$ac_t""no" 1>&6 - EOF --if { (eval echo configure:106501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113181: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - cat >> confdefs.h <<\EOF -@@ -106521,12 +113201,12 @@ fi - for ac_func in mremap - do - echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 --echo "configure:106525: checking for $ac_func" >&5 -+echo "configure:113205: checking for $ac_func" >&5 - if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then + echo $ac_n "checking for libiconv""... $ac_c" 1>&6 +-echo "configure:46824: checking for libiconv" >&5 ++echo "configure:47848: checking for libiconv" >&5 + if eval "test \"`echo '$''{'ac_cv_func_libiconv'+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:113233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:46852: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:47876: \"$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 -@@ -106616,17 +113296,17 @@ for ac_hdr in stdarg.h - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:106620: checking for $ac_hdr" >&5 -+echo "configure:113300: 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 + eval "ac_cv_func_libiconv=yes" else - cat > conftest.$ac_ext < - EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:106630: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:113310: \"$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* -@@ -106703,7 +113383,7 @@ if test "$TSRM_PTH" != "no"; then - +@@ -47004,7 +48028,7 @@ + done - echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6 --echo "configure:106707: checking for GNU Pth" >&5 -+echo "configure:113387: 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 -@@ -106733,17 +113413,17 @@ elif test "$TSRM_ST" != "no"; then - do - ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` - echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 --echo "configure:106737: checking for $ac_hdr" >&5 -+echo "configure:113417: checking for $ac_hdr" >&5 - if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then + echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 +-echo "configure:47008: checking for libiconv in -l$iconv_lib_name" >&5 ++echo "configure:48032: checking for libiconv in -l$iconv_lib_name" >&5 + ac_lib_var=`echo $iconv_lib_name'_'libiconv | 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 - cat > conftest.$ac_ext < conftest.$ac_ext < + /* Override any gcc2 internal prototype to avoid an error. */ + /* We use char because int might match the return type of a gcc2 +@@ -47023,7 +48047,7 @@ + libiconv() + ; return 0; } EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:106747: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:113427: \"$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 +-if { (eval echo configure:47027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* -@@ -106773,7 +113453,7 @@ done - - LIBS="$LIBS -lst" - echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6 --echo "configure:106777: checking for SGI's State Threads" >&5 -+echo "configure:113457: checking for SGI's State Threads" >&5 - echo "$ac_t""yes" 1>&6 - cat >> confdefs.h <<\EOF - #define TSRM_ST 1 -@@ -106812,7 +113492,7 @@ if test "$cross_compiling" = yes; then - - else - cat > conftest.$ac_ext < -@@ -106830,7 +113510,7 @@ int main() { - return pthread_create(&thd, NULL, thread_routine, &data); - } - EOF --if { (eval echo configure:106834: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - pthreads_working=yes -@@ -106850,7 +113530,7 @@ fi - CFLAGS=$save_CFLAGS - - echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 --echo "configure:106854: checking for pthreads_cflags" >&5 -+echo "configure:113534: 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 -@@ -106872,7 +113552,7 @@ if test "$cross_compiling" = yes; then - - else - cat > conftest.$ac_ext < -@@ -106890,7 +113570,7 @@ int main() { - return pthread_create(&thd, NULL, thread_routine, &data); - } - EOF --if { (eval echo configure:106894: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - pthreads_working=yes -@@ -106920,7 +113600,7 @@ fi - echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 - - echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 --echo "configure:106924: checking for pthreads_lib" >&5 -+echo "configure:113604: 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 -@@ -106942,7 +113622,7 @@ if test "$cross_compiling" = yes; then - - else - cat > conftest.$ac_ext < -@@ -106960,7 +113640,7 @@ int main() { - return pthread_create(&thd, NULL, thread_routine, &data); - } - EOF --if { (eval echo configure:106964: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null -+if { (eval echo configure:113644: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null - then - - pthreads_working=yes -@@ -107011,7 +113691,7 @@ EOF - - - echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6 --echo "configure:107015: checking for POSIX threads" >&5 -+echo "configure:113695: checking for POSIX threads" >&5 - echo "$ac_t""yes" 1>&6 - fi - -@@ -107647,7 +114327,7 @@ fi - - - echo $ac_n "checking build system type""... $ac_c" 1>&6 --echo "configure:107651: checking build system type" >&5 -+echo "configure:114331: checking build system type" >&5 - - build_alias=$build - case "$build_alias" in -@@ -107676,7 +114356,7 @@ ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 --echo "configure:107680: checking for ld used by $CC" >&5 -+echo "configure:114360: checking for ld used by $CC" >&5 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -107706,10 +114386,10 @@ echo "configure:107680: checking for ld - esac - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 --echo "configure:107710: checking for GNU ld" >&5 -+echo "configure:114390: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 --echo "configure:107713: checking for non-GNU ld" >&5 -+echo "configure:114393: checking for non-GNU ld" >&5 - fi - if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -107748,7 +114428,7 @@ else - 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:107752: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:114432: checking if the linker ($LD) is GNU ld" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -107768,7 +114448,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld - - - echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 --echo "configure:107772: checking for $LD option to reload object files" >&5 -+echo "configure:114452: checking for $LD option to reload object files" >&5 - if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -107793,7 +114473,7 @@ case $host_os in - esac - - echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 --echo "configure:107797: checking for BSD-compatible nm" >&5 -+echo "configure:114477: checking for BSD-compatible nm" >&5 - if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -107846,7 +114526,7 @@ echo "$ac_t""$lt_cv_path_NM" 1>&6 - NM="$lt_cv_path_NM" - - echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6 --echo "configure:107850: checking how to recognize dependent libraries" >&5 -+echo "configure:114530: checking how to recognize dependent libraries" >&5 - if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 + eval "ac_cv_lib_$ac_lib_var=yes" else -@@ -108038,13 +114718,13 @@ deplibs_check_method=$lt_cv_deplibs_chec - test -z "$deplibs_check_method" && deplibs_check_method=unknown +@@ -47164,7 +48188,7 @@ + done - echo $ac_n "checking for object suffix""... $ac_c" 1>&6 --echo "configure:108042: checking for object suffix" >&5 -+echo "configure:114722: checking for object suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then + echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 +-echo "configure:47168: checking for iconv in -l$iconv_lib_name" >&5 ++echo "configure:48192: checking for iconv in -l$iconv_lib_name" >&5 + ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 +@@ -47172,7 +48196,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$iconv_lib_name $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48211: \"$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 - rm -f conftest* - echo 'int i = 1;' > conftest.$ac_ext --if { (eval echo configure:108048: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:114728: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - for ac_file in conftest.*; do - case $ac_file in - *.c) ;; -@@ -108064,7 +114744,7 @@ ac_objext=$ac_cv_objext +@@ -47394,16 +48418,16 @@ + fi + echo $ac_n "checking if iconv is glibc's""... $ac_c" 1>&6 +-echo "configure:47398: checking if iconv is glibc's" >&5 ++echo "configure:48422: checking if iconv is glibc's" >&5 + cat > conftest.$ac_ext < + int main() { + gnu_get_libc_version(); + ; return 0; } + EOF +-if { (eval echo configure:47407: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48431: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + echo "$ac_t""yes" 1>&6 +@@ -47421,7 +48445,7 @@ - echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 --echo "configure:108068: checking for executable suffix" >&5 -+echo "configure:114748: checking for executable suffix" >&5 - if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -108074,10 +114754,10 @@ else - rm -f conftest* - echo 'int main () { return 0; }' > conftest.$ac_ext - ac_cv_exeext= -- if { (eval echo configure:108078: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then -+ if { (eval echo configure:114758: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then - for file in conftest.*; do - case $file in -- *.c | *.o | *.obj) ;; -+ *.$ac_ext | *.c | *.o | *.obj) ;; - *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; - esac - done -@@ -108120,7 +114800,7 @@ case $host in - ia64-*-hpux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -- if { (eval echo configure:108124: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114804: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.$ac_objext` in - *ELF-32*) - HPUX_IA64_MODE="32" -@@ -108134,8 +114814,8 @@ ia64-*-hpux*) - ;; - *-*-irix6*) - # Find out which ABI we are using. -- echo '#line 108138 "configure"' > conftest.$ac_ext -- if { (eval echo configure:108139: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ echo '#line 114818 "configure"' > conftest.$ac_ext -+ if { (eval echo configure:114819: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - if test "$lt_cv_prog_gnu_ld" = yes; then - case `/usr/bin/file conftest.$ac_objext` in - *32-bit*) -@@ -108169,7 +114849,7 @@ x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc - s390*-*linux*|sparc*-*linux*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -- if { (eval echo configure:108173: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114853: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.o` in - *32-bit*) - case $host in -@@ -108219,7 +114899,7 @@ s390*-*linux*|sparc*-*linux*) - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 --echo "configure:108223: checking whether the C compiler needs -belf" >&5 -+echo "configure:114903: 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 + if test -z "$iconv_impl_name"; then + echo $ac_n "checking if using GNU libiconv""... $ac_c" 1>&6 +-echo "configure:47425: checking if using GNU libiconv" >&5 ++echo "configure:48449: checking if using GNU libiconv" >&5 + php_iconv_old_ld="$LDFLAGS" + LDFLAGS="-liconv $LDFLAGS" + if test "$cross_compiling" = yes; then +@@ -47431,7 +48455,7 @@ + else -@@ -108232,14 +114912,14 @@ ac_link='${CC-cc} -o conftest${ac_exeext - cross_compiling=$ac_cv_prog_cc_cross - - cat > conftest.$ac_ext < conftest.$ac_ext < +@@ -47441,7 +48465,7 @@ + } + + EOF +-if { (eval echo configure:47445: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:48469: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + echo "$ac_t""yes" 1>&6 +@@ -47463,16 +48487,16 @@ + + if test -z "$iconv_impl_name"; then + echo $ac_n "checking if iconv is Konstantin Chuguev's""... $ac_c" 1>&6 +-echo "configure:47467: checking if iconv is Konstantin Chuguev's" >&5 ++echo "configure:48491: checking if iconv is Konstantin Chuguev's" >&5 + cat > conftest.$ac_ext < int main() { + iconv_ccs_init(NULL, NULL); + ; return 0; } + EOF +-if { (eval echo configure:47476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48500: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + echo "$ac_t""yes" 1>&6 +@@ -47491,18 +48515,18 @@ + if test -z "$iconv_impl_name"; then + echo $ac_n "checking if using IBM iconv""... $ac_c" 1>&6 +-echo "configure:47495: checking if using IBM iconv" >&5 ++echo "configure:48519: checking if using IBM iconv" >&5 + php_iconv_old_ld="$LDFLAGS" + LDFLAGS="-liconv $LDFLAGS" + cat > conftest.$ac_ext < + int main() { + cstoccsid(""); ; return 0; } EOF --if { (eval echo configure:108243: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:114923: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:47506: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:48530: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - lt_cv_cc_needs_belf=yes + + echo "$ac_t""yes" 1>&6 +@@ -47688,7 +48712,7 @@ + esac + + echo $ac_n "checking if iconv supports errno""... $ac_c" 1>&6 +-echo "configure:47692: checking if iconv supports errno" >&5 ++echo "configure:48716: checking if iconv supports errno" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no" 1>&6 +@@ -47702,7 +48726,7 @@ + else -@@ -108267,7 +114947,7 @@ echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6 - sparc*-*solaris*) - # Find out which ABI we are using. - echo 'int i;' > conftest.$ac_ext -- if { (eval echo configure:108271: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:114951: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - case `/usr/bin/file conftest.o` in - *64-bit*) - case $lt_cv_prog_gnu_ld in -@@ -108296,7 +114976,7 @@ if test -n "$CXX" && ( test "X$CXX" != " - ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || - (test "X$CXX" != "Xg++"))) ; then - echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 --echo "configure:108300: checking how to run the C++ preprocessor" >&5 -+echo "configure:114980: 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 -@@ -108309,12 +114989,12 @@ ac_link='${CXX-g++} -o conftest${ac_exee - cross_compiling=$ac_cv_prog_cxx_cross - CXXCPP="${CXX-g++} -E" cat > conftest.$ac_ext < + + #include <$PHP_ICONV_H_PATH> +@@ -47723,7 +48747,7 @@ + } + EOF - ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" --{ (eval echo configure:108318: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -+{ (eval echo configure:114998: \"$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 - : -@@ -108344,7 +115024,7 @@ fi - # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! - # find the maximum length of command line arguments - echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6 --echo "configure:108348: checking the maximum length of command line arguments" >&5 -+echo "configure:115028: checking the maximum length of command line arguments" >&5 - if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -108466,7 +115146,7 @@ fi +-if { (eval echo configure:47727: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:48751: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + echo "$ac_t""yes" 1>&6 +@@ -47755,9 +48779,9 @@ - # Check for command to grab the raw symbol name followed by C symbol from nm. - echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6 --echo "configure:108470: checking command to parse $NM output from $compiler object" >&5 -+echo "configure:115150: checking command to parse $NM output from $compiler object" >&5 - if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -108570,10 +115250,10 @@ void nm_test_func(){} - int main(){nm_test_var='a';nm_test_func();return(0);} + + echo $ac_n "checking if your cpp allows macro usage in include lines""... $ac_c" 1>&6 +-echo "configure:47759: checking if your cpp allows macro usage in include lines" >&5 ++echo "configure:48783: checking if your cpp allows macro usage in include lines" >&5 + cat > conftest.$ac_ext < +@@ -47767,7 +48791,7 @@ + + ; return 0; } EOF +-if { (eval echo configure:47771: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:48795: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + echo "$ac_t""yes" 1>&6 +@@ -48123,7 +49147,7 @@ + php_with_imap=no -- if { (eval echo configure:108574: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+ if { (eval echo configure:115254: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - # Now try to grab the symbols. - nlist=conftest.nm -- if { (eval echo configure:108577: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then -+ if { (eval echo configure:115257: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then - # Try sorting and uniquifying the output. - if sort "$nlist" | uniq > "$nlist"T; then - mv -f "$nlist"T "$nlist" -@@ -108624,7 +115304,7 @@ EOF - lt_save_CFLAGS="$CFLAGS" - LIBS="conftstm.$ac_objext" - CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" -- if { (eval echo configure:108628: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+ if { (eval echo configure:115308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - pipe_works=yes - fi - LIBS="$lt_save_LIBS" -@@ -108664,7 +115344,7 @@ else - fi + echo $ac_n "checking for IMAP support""... $ac_c" 1>&6 +-echo "configure:48127: checking for IMAP support" >&5 ++echo "configure:49151: checking for IMAP support" >&5 + # Check whether --with-imap or --without-imap was given. + if test "${with_imap+set}" = set; then + withval="$with_imap" +@@ -48167,7 +49191,7 @@ + php_with_kerberos=no - echo $ac_n "checking for objdir""... $ac_c" 1>&6 --echo "configure:108668: checking for objdir" >&5 -+echo "configure:115348: checking for objdir" >&5 - if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -108730,7 +115410,7 @@ with_gnu_ld="$lt_cv_prog_gnu_ld" - # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. - set dummy ${ac_tool_prefix}ar; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:108734: checking for $ac_word" >&5 -+echo "configure:115414: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -108762,7 +115442,7 @@ if test -n "$ac_tool_prefix"; then - # Extract the first word of "ar", so it can be a program name with args. - set dummy ar; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:108766: checking for $ac_word" >&5 -+echo "configure:115446: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -108797,7 +115477,7 @@ fi - # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. - set dummy ${ac_tool_prefix}ranlib; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:108801: checking for $ac_word" >&5 -+echo "configure:115481: 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 -@@ -108829,7 +115509,7 @@ if test -n "$ac_tool_prefix"; then - # 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:108833: checking for $ac_word" >&5 -+echo "configure:115513: 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 -@@ -108864,7 +115544,7 @@ fi - # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. - set dummy ${ac_tool_prefix}strip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:108868: checking for $ac_word" >&5 -+echo "configure:115548: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -108896,7 +115576,7 @@ if test -n "$ac_tool_prefix"; then - # Extract the first word of "strip", so it can be a program name with args. - set dummy strip; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:108900: checking for $ac_word" >&5 -+echo "configure:115580: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -108983,7 +115663,7 @@ case $deplibs_check_method in - file_magic*) - if test "$file_magic_cmd" = '$MAGIC_CMD'; then - echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 --echo "configure:108987: checking for ${ac_tool_prefix}file" >&5 -+echo "configure:115667: checking for ${ac_tool_prefix}file" >&5 - if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then + echo $ac_n "checking for IMAP Kerberos support""... $ac_c" 1>&6 +-echo "configure:48171: checking for IMAP Kerberos support" >&5 ++echo "configure:49195: checking for IMAP Kerberos support" >&5 + # Check whether --with-kerberos or --without-kerberos was given. + if test "${with_kerberos+set}" = set; then + withval="$with_kerberos" +@@ -48190,7 +49214,7 @@ + php_with_imap_ssl=no + + echo $ac_n "checking for IMAP SSL support""... $ac_c" 1>&6 +-echo "configure:48194: checking for IMAP SSL support" >&5 ++echo "configure:49218: checking for IMAP SSL support" >&5 + # Check whether --with-imap-ssl or --without-imap-ssl was given. + if test "${with_imap_ssl+set}" = set; then + withval="$with_imap_ssl" +@@ -48594,7 +49618,7 @@ + done + + cat > conftest.$ac_ext < + EOF +@@ -48614,12 +49638,12 @@ + old_CFLAGS=$CFLAGS + CFLAGS="-I$IMAP_INC_DIR" + echo $ac_n "checking for utf8_mime2text signature""... $ac_c" 1>&6 +-echo "configure:48618: checking for utf8_mime2text signature" >&5 ++echo "configure:49642: checking for utf8_mime2text signature" >&5 + if eval "test \"`echo '$''{'ac_cv_utf8_mime2text'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109043,7 +115723,7 @@ fi - if test -z "$lt_cv_path_MAGIC_CMD"; then - if test -n "$ac_tool_prefix"; then - echo $ac_n "checking for file""... $ac_c" 1>&6 --echo "configure:109047: checking for file" >&5 -+echo "configure:115727: checking for file" >&5 - if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then + cat > conftest.$ac_ext < +@@ -48632,7 +49656,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:48636: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:49660: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + ac_cv_utf8_mime2text=old +@@ -48661,12 +49685,12 @@ + old_CFLAGS=$CFLAGS + CFLAGS="-I$IMAP_INC_DIR" + echo $ac_n "checking for U8T_DECOMPOSE""... $ac_c" 1>&6 +-echo "configure:48665: checking for U8T_DECOMPOSE" >&5 ++echo "configure:49689: checking for U8T_DECOMPOSE" >&5 + if eval "test \"`echo '$''{'ac_cv_u8t_canonical'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109115,7 +115795,7 @@ esac - # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. - set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:109119: checking for $ac_word" >&5 -+echo "configure:115799: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then + cat > conftest.$ac_ext < +@@ -48677,7 +49701,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:48681: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:49705: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + ac_cv_u8t_decompose=yes +@@ -48707,7 +49731,7 @@ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=-I$IMAP_INC_DIR + cat > conftest.$ac_ext <&6 +-echo "configure:48830: checking for pam_start in -lpam" >&5 ++echo "configure:49854: 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 +@@ -48834,7 +49858,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:49873: \"$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 -@@ -109147,7 +115827,7 @@ if test -n "$ac_tool_prefix"; then - # Extract the first word of "dsymutil", so it can be a program name with args. - set dummy dsymutil; ac_word=$2 - echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:109151: checking for $ac_word" >&5 -+echo "configure:115831: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then +@@ -49000,7 +50024,7 @@ + done + + echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 +-echo "configure:49004: checking for crypt in -lcrypt" >&5 ++echo "configure:50028: 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 +@@ -49008,7 +50032,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:50047: \"$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 -@@ -109182,7 +115862,7 @@ fi - # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. - set dummy ${ac_tool_prefix}nmedit; ac_word=$2 +@@ -49223,7 +50247,7 @@ + # Extract the first word of "krb5-config", so it can be a program name with args. + set dummy krb5-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:109186: checking for $ac_word" >&5 -+echo "configure:115866: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then +-echo "configure:49227: checking for $ac_word" >&5 ++echo "configure:50251: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_KRB5_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109214,7 +115894,7 @@ if test -n "$ac_tool_prefix"; then - # Extract the first word of "nmedit", so it can be a program name with args. - set dummy nmedit; ac_word=$2 +@@ -49592,7 +50616,7 @@ + + else + cat > conftest.$ac_ext < + EOF +@@ -49633,7 +50657,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 --echo "configure:109218: checking for $ac_word" >&5 -+echo "configure:115898: checking for $ac_word" >&5 - if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then +-echo "configure:49637: checking for $ac_word" >&5 ++echo "configure:50661: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109248,7 +115928,7 @@ fi +@@ -49838,9 +50862,9 @@ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=-I$OPENSSL_INCDIR + echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 +-echo "configure:49842: checking for OpenSSL version" >&5 ++echo "configure:50866: checking for OpenSSL version" >&5 + cat > conftest.$ac_ext < +@@ -49995,7 +51019,7 @@ + done - echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6 --echo "configure:109252: checking for -single_module linker flag" >&5 -+echo "configure:115932: checking for -single_module linker flag" >&5 - if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then + echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 +-echo "configure:49999: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:51023: 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 +@@ -50003,7 +51027,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:51042: \"$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 -@@ -109271,7 +115951,7 @@ fi +@@ -50171,7 +51195,7 @@ + done - echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6 - echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6 --echo "configure:109275: checking for -exported_symbols_list linker flag" >&5 -+echo "configure:115955: checking for -exported_symbols_list linker flag" >&5 - if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then + echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 +-echo "configure:50175: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:51199: 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 - else -@@ -109281,12 +115961,12 @@ else - LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" - +@@ -50179,7 +51203,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:115970: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - lt_cv_ld_exported_symbols_list=yes +-if { (eval echo configure:50194: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:51218: \"$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 -@@ -109420,7 +116100,7 @@ if test "$GCC" = yes; then +@@ -50309,7 +51333,7 @@ + elif test -f "$IMAP_INC_DIR/linkage.c"; then + cat > conftest.$ac_ext < + EOF +@@ -50340,7 +51364,7 @@ - echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 --echo "configure:109424: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 -+echo "configure:116104: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109437,11 +116117,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"configure:109441: $lt_compile\"" >&5) -+ (eval echo "\"configure:116121: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "configure:109445: \$? = $ac_status" >&5 -+ echo "configure:116125: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -109470,7 +116150,7 @@ lt_prog_compiler_pic= - lt_prog_compiler_static= + cat > conftest.$ac_ext <&6 --echo "configure:109474: checking for $compiler option to produce PIC" >&5 -+echo "configure:116154: checking for $compiler option to produce PIC" >&5 - - if test "$GCC" = yes; then - lt_prog_compiler_wl='-Wl,' -@@ -109717,7 +116397,7 @@ echo "$ac_t""$lt_prog_compiler_pic" 1>&6 - if test -n "$lt_prog_compiler_pic"; then + +@@ -50373,7 +51397,7 @@ + } + + EOF +-if { (eval echo configure:50377: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:51401: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -50409,7 +51433,7 @@ - echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6 --echo "configure:109721: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 -+echo "configure:116401: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -109734,11 +116414,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"configure:109738: $lt_compile\"" >&5) -+ (eval echo "\"configure:116418: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "configure:109742: \$? = $ac_status" >&5 -+ echo "configure:116422: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -109780,7 +116460,7 @@ esac - # - wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" - echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 --echo "configure:109784: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo "configure:116464: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -109818,7 +116498,7 @@ fi - + cat > conftest.$ac_ext <&6 --echo "configure:109822: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo "configure:116502: checking if $compiler supports -c -o file.$ac_objext" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -109838,11 +116518,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"configure:109842: $lt_compile\"" >&5) -+ (eval echo "\"configure:116522: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "configure:109846: \$? = $ac_status" >&5 -+ echo "configure:116526: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -109872,7 +116552,7 @@ hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 --echo "configure:109876: checking if we can lock with hard links" >&5 -+echo "configure:116556: checking if we can lock with hard links" >&5 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no -@@ -109889,7 +116569,7 @@ else - fi + +@@ -50442,7 +51466,7 @@ + } + + EOF +-if { (eval echo configure:50446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:51470: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -50469,7 +51493,7 @@ - echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 --echo "configure:109893: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo "configure:116573: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - runpath_var= - allow_undefined_flag= -@@ -110300,12 +116980,12 @@ _LT_EOF - # Determine the default libpath from the value encoded in an empty executable. - - cat > conftest.$ac_ext <&6 +-echo "configure:50473: checking whether rfc822_output_address_list function present" >&5 ++echo "configure:51497: checking whether rfc822_output_address_list function present" >&5 + + old_LIBS=$LIBS + LIBS=" +@@ -50481,7 +51505,7 @@ + + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:116989: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -110338,12 +117018,12 @@ if test -z "$aix_libpath"; then aix_libp - # Determine the default libpath from the value encoded in an empty executable. - - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:51545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -50546,7 +51570,7 @@ + + + echo $ac_n "checking whether build with IMAP works""... $ac_c" 1>&6 +-echo "configure:50550: checking whether build with IMAP works" >&5 ++echo "configure:51574: checking whether build with IMAP works" >&5 + + + old_LIBS=$LIBS +@@ -50557,7 +51581,7 @@ + + else + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:117027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -110833,11 +117513,11 @@ x|xyes) - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 --echo "configure:110837: checking whether -lc should be explicitly linked in" >&5 -+echo "configure:117517: checking whether -lc should be explicitly linked in" >&5 - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext -- if { (eval echo configure:110841: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then -+ if { (eval echo configure:117521: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext -@@ -110851,7 +117531,7 @@ echo "configure:110837: checking whether - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag - allow_undefined_flag= -- if { (eval echo configure:110855: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } -+ if { (eval echo configure:117535: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } - then - archive_cmds_need_lc=no - else -@@ -110870,7 +117550,7 @@ echo "configure:110837: checking whether - esac + +@@ -50590,7 +51614,7 @@ + } + + EOF +-if { (eval echo configure:50594: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:51618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -50622,7 +51646,7 @@ + php_with_interbase=no - echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 --echo "configure:110874: checking dynamic linker characteristics" >&5 -+echo "configure:117554: checking dynamic linker characteristics" >&5 - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -111495,7 +118175,7 @@ if test "$GCC" = yes; then - fi + echo $ac_n "checking for InterBase support""... $ac_c" 1>&6 +-echo "configure:50626: checking for InterBase support" >&5 ++echo "configure:51650: checking for InterBase support" >&5 + # Check whether --with-interbase or --without-interbase was given. + if test "${with_interbase+set}" = set; then + withval="$with_interbase" +@@ -50769,7 +51793,7 @@ + done - echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 --echo "configure:111499: checking how to hardcode library paths into programs" >&5 -+echo "configure:118179: checking how to hardcode library paths into programs" >&5 - hardcode_action= - if test -n "$hardcode_libdir_flag_spec" || \ - test -n "$runpath_var" || \ -@@ -111533,7 +118213,7 @@ fi - striplib= - old_striplib= - echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 --echo "configure:111537: checking whether stripping libraries is possible" >&5 -+echo "configure:118217: checking whether stripping libraries is possible" >&5 - if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then - test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" - test -z "$striplib" && striplib="$STRIP --strip-unneeded" -@@ -111584,7 +118264,7 @@ else - darwin*) - # if libdl is installed we need to link against it - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:111588: checking for dlopen in -ldl" >&5 -+echo "configure:118268: checking for dlopen in -ldl" >&5 - ac_lib_var=`echo dl'_'dlopen | sed 'y%./+-%__p_%'` + echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 +-echo "configure:50773: checking for isc_detach_database in -lfbclient" >&5 ++echo "configure:51797: checking for isc_detach_database in -lfbclient" >&5 + ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -111592,7 +118272,7 @@ else +@@ -50777,7 +51801,7 @@ ac_save_LIBS="$LIBS" - LIBS="-ldl $LIBS" + LIBS="-lfbclient $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:50792: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:51816: \"$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 -@@ -111632,12 +118312,12 @@ fi +@@ -50915,7 +51939,7 @@ + done - *) - echo $ac_n "checking for shl_load""... $ac_c" 1>&6 --echo "configure:111636: checking for shl_load" >&5 -+echo "configure:118316: checking for shl_load" >&5 - if eval "test \"`echo '$''{'ac_cv_func_shl_load'+set}'`\" = set"; then + echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 +-echo "configure:50919: checking for isc_detach_database in -lgds" >&5 ++echo "configure:51943: checking for isc_detach_database in -lgds" >&5 + ac_lib_var=`echo gds'_'isc_detach_database | 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 - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118344: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:50938: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:51962: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* - eval "ac_cv_func_shl_load=yes" - else -@@ -111678,7 +118358,7 @@ if eval "test \"`echo '$ac_cv_func_'shl_ + eval "ac_cv_lib_$ac_lib_var=yes" else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 --echo "configure:111682: checking for shl_load in -ldld" >&5 -+echo "configure:118362: checking for shl_load in -ldld" >&5 - ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` +@@ -51061,7 +52085,7 @@ + done + + echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 +-echo "configure:51065: checking for isc_detach_database in -lib_util" >&5 ++echo "configure:52089: checking for isc_detach_database in -lib_util" >&5 + ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 -@@ -111686,7 +118366,7 @@ else +@@ -51069,7 +52093,7 @@ ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" + LIBS="-lib_util $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118381: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:51084: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:52108: \"$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 -@@ -111716,12 +118396,12 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l +@@ -51557,7 +52581,7 @@ + php_enable_intl=no + + echo $ac_n "checking whether to enable internationalization support""... $ac_c" 1>&6 +-echo "configure:51561: checking whether to enable internationalization support" >&5 ++echo "configure:52585: checking whether to enable internationalization support" >&5 + # Check whether --enable-intl or --disable-intl was given. + if test "${enable_intl+set}" = set; then + enableval="$enable_intl" +@@ -51629,7 +52653,7 @@ + # Extract the first word of "icu-config", so it can be a program name with args. + set dummy icu-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:51633: checking for $ac_word" >&5 ++echo "configure:52657: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_ICU_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen""... $ac_c" 1>&6 --echo "configure:111720: checking for dlopen" >&5 -+echo "configure:118400: checking for dlopen" >&5 - if eval "test \"`echo '$''{'ac_cv_func_dlopen'+set}'`\" = set"; then +@@ -51667,7 +52691,7 @@ + fi + + echo $ac_n "checking for location of ICU headers and libraries""... $ac_c" 1>&6 +-echo "configure:51671: checking for location of ICU headers and libraries" >&5 ++echo "configure:52695: checking for location of ICU headers and libraries" >&5 + + icu_install_prefix=`$ICU_CONFIG --prefix 2> /dev/null` + if test "$?" != "0" || test -z "$icu_install_prefix"; then +@@ -51677,7 +52701,7 @@ + echo "$ac_t""$icu_install_prefix" 1>&6 + + echo $ac_n "checking for ICU 3.4 or greater""... $ac_c" 1>&6 +-echo "configure:51681: checking for ICU 3.4 or greater" >&5 ++echo "configure:52705: checking for ICU 3.4 or greater" >&5 + icu_version_full=`$ICU_CONFIG --version` + ac_IFS=$IFS + IFS="." +@@ -51834,7 +52858,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:51838: checking for $ac_word" >&5 ++echo "configure:52862: 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 +@@ -51866,7 +52890,7 @@ + + + echo $ac_n "checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works""... $ac_c" 1>&6 +-echo "configure:51870: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) works" >&5 ++echo "configure:52894: 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. +@@ -51877,12 +52901,12 @@ + + cat > conftest.$ac_ext << EOF + +-#line 51881 "configure" ++#line 52905 "configure" + #include "confdefs.h" + + int main(){return(0);} + EOF +-if { (eval echo configure:51886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:52910: \"$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 +@@ -51908,12 +52932,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:51912: checking whether the C++ compiler ($CXX $CXXFLAGS $LDFLAGS) is a cross-compiler" >&5 ++echo "configure:52936: 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:51917: checking whether we are using GNU C++" >&5 ++echo "configure:52941: 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 +@@ -51922,7 +52946,7 @@ + yes; + #endif + EOF +-if { ac_try='${CXX-g++} -E conftest.C'; { (eval echo configure:51926: \"$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:52950: \"$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 +@@ -51941,7 +52965,7 @@ + ac_save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS= + echo $ac_n "checking whether ${CXX-g++} accepts -g""... $ac_c" 1>&6 +-echo "configure:51945: checking whether ${CXX-g++} accepts -g" >&5 ++echo "configure:52969: 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 +@@ -51972,59 +52996,8 @@ + fi + fi + +-for ac_declaration in \ +- ''\ +- '#include ' \ +- 'extern "C" void std::exit (int) throw (); using std::exit;' \ +- 'extern "C" void std::exit (int); using std::exit;' \ +- 'extern "C" void exit (int) throw ();' \ +- 'extern "C" void exit (int);' \ +- 'void exit (int);' +-do +- cat > conftest.$ac_ext < +-$ac_declaration +-int main() { +-exit (42); +-; return 0; } +-EOF +-if { (eval echo configure:51994: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then +- : +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- continue +-fi +-rm -f conftest* +- cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then +- rm -rf conftest* +- break +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +-fi +-rm -f conftest* +-done +-if test -n "$ac_declaration"; then +- echo '#ifdef __cplusplus' >>confdefs.h +- echo $ac_declaration >>confdefs.h +- echo '#endif' >>confdefs.h +-fi +- +- + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:52028: checking how to run the C++ preprocessor" >&5 ++echo "configure:53001: 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 +@@ -52037,12 +53010,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:52046: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:53019: \"$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 + : +@@ -52600,7 +53573,7 @@ + php_enable_json=yes + + echo $ac_n "checking whether to enable JavaScript Object Serialization support""... $ac_c" 1>&6 +-echo "configure:52604: checking whether to enable JavaScript Object Serialization support" >&5 ++echo "configure:53577: checking whether to enable JavaScript Object Serialization support" >&5 + # Check whether --enable-json or --disable-json was given. + if test "${enable_json+set}" = set; then + enableval="$enable_json" +@@ -52646,12 +53619,12 @@ + EOF + + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:52650: checking for ANSI C header files" >&5 ++echo "configure:53623: 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 +@@ -52659,7 +53632,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:52663: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:53636: \"$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* +@@ -52676,7 +53649,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 +@@ -52694,7 +53667,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 +@@ -52715,7 +53688,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -52726,7 +53699,7 @@ + exit (0); } + + EOF +-if { (eval echo configure:52730: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:53703: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -53076,7 +54049,7 @@ + php_with_ldap=no + + echo $ac_n "checking for LDAP support""... $ac_c" 1>&6 +-echo "configure:53080: checking for LDAP support" >&5 ++echo "configure:54053: checking for LDAP support" >&5 + # Check whether --with-ldap or --without-ldap was given. + if test "${with_ldap+set}" = set; then + withval="$with_ldap" +@@ -53120,7 +54093,7 @@ + php_with_ldap_sasl=no + + echo $ac_n "checking for LDAP Cyrus SASL support""... $ac_c" 1>&6 +-echo "configure:53124: checking for LDAP Cyrus SASL support" >&5 ++echo "configure:54097: checking for LDAP Cyrus SASL support" >&5 + # Check whether --with-ldap-sasl or --without-ldap-sasl was given. + if test "${with_ldap_sasl+set}" = set; then + withval="$with_ldap_sasl" +@@ -55462,19 +56435,19 @@ + LIBS="$LIBS $LDAP_SHARED_LIBADD" + + echo $ac_n "checking for 3 arg ldap_set_rebind_proc""... $ac_c" 1>&6 +-echo "configure:55466: checking for 3 arg ldap_set_rebind_proc" >&5 ++echo "configure:56439: checking for 3 arg ldap_set_rebind_proc" >&5 + if eval "test \"`echo '$''{'ac_cv_3arg_setrebindproc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < + int main() { + ldap_set_rebind_proc(0,0,0) ; return 0; } EOF --if { (eval echo configure:111748: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118428: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:55478: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:56451: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then rm -rf conftest* - eval "ac_cv_func_dlopen=yes" - else -@@ -111762,7 +118442,7 @@ if eval "test \"`echo '$ac_cv_func_'dlop + ac_cv_3arg_setrebindproc=yes else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 --echo "configure:111766: checking for dlopen in -ldl" >&5 -+echo "configure:118446: 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 +@@ -55497,12 +56470,12 @@ + for ac_func in ldap_parse_result ldap_parse_reference ldap_start_tls_s + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:55501: checking for $ac_func" >&5 ++echo "configure:56474: 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 -@@ -111770,7 +118450,7 @@ else - 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:118465: \"$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 -@@ -111800,7 +118480,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 --echo "configure:111804: checking for dlopen in -lsvld" >&5 -+echo "configure:118484: checking for dlopen in -lsvld" >&5 - ac_lib_var=`echo svld'_'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 -@@ -111808,7 +118488,7 @@ else - ac_save_LIBS="$LIBS" - LIBS="-lsvld $LIBS" - cat > conftest.$ac_ext < conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118503: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:55529: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:56502: \"$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 -@@ -111838,7 +118518,7 @@ if eval "test \"`echo '$ac_cv_lib_'$ac_l + eval "ac_cv_func_$ac_func=yes" else - echo "$ac_t""no" 1>&6 - echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 --echo "configure:111842: checking for dld_link in -ldld" >&5 -+echo "configure:118522: checking for dld_link in -ldld" >&5 - ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` +@@ -55687,7 +56660,7 @@ + done + + echo $ac_n "checking for sasl_version in -lldap""... $ac_c" 1>&6 +-echo "configure:55691: checking for sasl_version in -lldap" >&5 ++echo "configure:56664: checking for sasl_version in -lldap" >&5 + ac_lib_var=`echo ldap'_'sasl_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 -@@ -111846,7 +118526,7 @@ else +@@ -55695,7 +56668,7 @@ ac_save_LIBS="$LIBS" - LIBS="-ldld $LIBS" + LIBS="-lldap $LIBS" cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:118541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +-if { (eval echo configure:55710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:56683: \"$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 -@@ -111913,7 +118593,7 @@ fi - LIBS="$lt_cv_dlopen_libs $LIBS" - - echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 --echo "configure:111917: checking whether a program can dlopen itself" >&5 -+echo "configure:118597: checking whether a program can dlopen itself" >&5 - if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -111923,7 +118603,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:118670: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -112009,7 +118689,7 @@ echo "$ac_t""$lt_cv_dlopen_self" 1>&6 - if test "x$lt_cv_dlopen_self" = xyes; then - wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" - echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 --echo "configure:112013: checking whether a statically linked program can dlopen itself" >&5 -+echo "configure:118693: checking whether a statically linked program can dlopen itself" >&5 - if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then + echo $ac_n "checking for ldap_bind_s""... $ac_c" 1>&6 +-echo "configure:55879: checking for ldap_bind_s" >&5 ++echo "configure:56852: checking for ldap_bind_s" >&5 + if eval "test \"`echo '$''{'ac_cv_func_ldap_bind_s'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else -@@ -112019,7 +118699,7 @@ else - lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 - lt_status=$lt_dlunknown cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then -+ if { (eval echo configure:118766: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then - (./conftest; exit; ) >&5 2>/dev/null - lt_status=$? - case x$lt_status in -@@ -112123,11 +118803,11 @@ fi - - # Report which library types will actually be built - echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 --echo "configure:112127: checking if libtool supports shared libraries" >&5 -+echo "configure:118807: checking if libtool supports shared libraries" >&5 - echo "$ac_t""$can_build_shared" 1>&6 - - echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 --echo "configure:112131: checking whether to build shared libraries" >&5 -+echo "configure:118811: checking whether to build shared libraries" >&5 - test "$can_build_shared" = "no" && enable_shared=no - - # On AIX, shared libraries and static libraries use the same namespace, and -@@ -112150,7 +118830,7 @@ esac - echo "$ac_t""$enable_shared" 1>&6 - - echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 --echo "configure:112154: checking whether to build static libraries" >&5 -+echo "configure:118834: checking whether to build static libraries" >&5 - # Make sure either enable_shared or enable_static is yes. - test "$enable_shared" = yes || enable_static=yes - echo "$ac_t""$enable_static" 1>&6 -@@ -112836,7 +119516,7 @@ ac_prog=ld - if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 --echo "configure:112840: checking for ld used by $CC" >&5 -+echo "configure:119520: checking for ld used by $CC" >&5 - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw -@@ -112866,10 +119546,10 @@ echo "configure:112840: checking for ld - esac - elif test "$with_gnu_ld" = yes; then - echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 --echo "configure:112870: checking for GNU ld" >&5 -+echo "configure:119550: checking for GNU ld" >&5 - else - echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 --echo "configure:112873: checking for non-GNU ld" >&5 -+echo "configure:119553: checking for non-GNU ld" >&5 - fi - if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -112908,7 +119588,7 @@ else - 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:112912: checking if the linker ($LD) is GNU ld" >&5 -+echo "configure:119592: checking if the linker ($LD) is GNU ld" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -112974,7 +119654,7 @@ fi - - # PORTME: fill in a description of your system's C++ link characteristics - echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 --echo "configure:112978: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo "configure:119658: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - ld_shlibs_CXX=yes - case $host_os in - aix3*) -@@ -113072,12 +119752,12 @@ case $host_os in - # Determine the default libpath from the value encoded in an empty executable. - - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:119761: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -113111,12 +119791,12 @@ if test -z "$aix_libpath"; then aix_libp - # Determine the default libpath from the value encoded in an empty executable. - - cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then -+if { (eval echo configure:119800: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then - - lt_aix_libpath_sed=' - /Import File Strings/,/^$/ { -@@ -113883,7 +120563,7 @@ private: - }; - EOF - --if { (eval echo configure:113887: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then -+if { (eval echo configure:120567: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then - # Parse the compiler output and extract the necessary - # objects, libraries and library flags. - -@@ -114039,7 +120719,7 @@ lt_prog_compiler_pic_CXX= - lt_prog_compiler_static_CXX= - - echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 --echo "configure:114043: checking for $compiler option to produce PIC" >&5 -+echo "configure:120723: checking for $compiler option to produce PIC" >&5 - - # C++ specific cases for pic, static, wl, etc. - if test "$GXX" = yes; then -@@ -114336,7 +121016,7 @@ echo "$ac_t""$lt_prog_compiler_pic_CXX" - if test -n "$lt_prog_compiler_pic_CXX"; then - - echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6 --echo "configure:114340: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 -+echo "configure:121020: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -114353,11 +121033,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"configure:114357: $lt_compile\"" >&5) -+ (eval echo "\"configure:121037: $lt_compile\"" >&5) - (eval "$lt_compile" 2>conftest.err) - ac_status=$? - cat conftest.err >&5 -- echo "configure:114361: \$? = $ac_status" >&5 -+ echo "configure:121041: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s "$ac_outfile"; then - # The compiler can only warn and ignore the option if not recognized - # So say no if there are warnings other than the usual output. -@@ -114399,7 +121079,7 @@ esac - # - wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" - echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 --echo "configure:114403: checking if $compiler static flag $lt_tmp_static_flag works" >&5 -+echo "configure:121083: checking if $compiler static flag $lt_tmp_static_flag works" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -114437,7 +121117,7 @@ fi - - - echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 --echo "configure:114441: checking if $compiler supports -c -o file.$ac_objext" >&5 -+echo "configure:121121: checking if $compiler supports -c -o file.$ac_objext" >&5 - if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 - else -@@ -114457,11 +121137,11 @@ else - -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ - -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ - -e 's:$: $lt_compiler_flag:'` -- (eval echo "\"configure:114461: $lt_compile\"" >&5) -+ (eval echo "\"configure:121141: $lt_compile\"" >&5) - (eval "$lt_compile" 2>out/conftest.err) - ac_status=$? - cat out/conftest.err >&5 -- echo "configure:114465: \$? = $ac_status" >&5 -+ echo "configure:121145: \$? = $ac_status" >&5 - if (exit $ac_status) && test -s out/conftest2.$ac_objext - then - # The compiler can only warn and ignore the option if not recognized -@@ -114491,7 +121171,7 @@ hard_links="nottested" - if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then - # do not overwrite the value of need_locks provided by the user - echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 --echo "configure:114495: checking if we can lock with hard links" >&5 -+echo "configure:121175: checking if we can lock with hard links" >&5 - hard_links=yes - $rm conftest* - ln conftest.a conftest.b 2>/dev/null && hard_links=no -@@ -114508,7 +121188,7 @@ else - fi - - echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 --echo "configure:114512: checking whether the $compiler linker ($LD) supports shared libraries" >&5 -+echo "configure:121192: checking whether the $compiler linker ($LD) supports shared libraries" >&5 - - export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' - case $host_os in -@@ -114554,11 +121234,11 @@ x|xyes) - # systems, -lgcc has to come before -lc. If gcc already passes -lc - # to ld, don't add -lc before -lgcc. - echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 --echo "configure:114558: checking whether -lc should be explicitly linked in" >&5 -+echo "configure:121238: checking whether -lc should be explicitly linked in" >&5 - $rm conftest* - echo "$lt_simple_compile_test_code" > conftest.$ac_ext - -- if { (eval echo configure:114562: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then -+ if { (eval echo configure:121242: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then - soname=conftest - lib=conftest - libobjs=conftest.$ac_objext -@@ -114572,7 +121252,7 @@ echo "configure:114558: checking whether - libname=conftest - lt_save_allow_undefined_flag=$allow_undefined_flag_CXX - allow_undefined_flag_CXX= -- if { (eval echo configure:114576: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } -+ if { (eval echo configure:121256: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } - then - archive_cmds_need_lc_CXX=no - else -@@ -114591,7 +121271,7 @@ echo "configure:114558: checking whether - esac - - echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 --echo "configure:114595: checking dynamic linker characteristics" >&5 -+echo "configure:121275: checking dynamic linker characteristics" >&5 - library_names_spec= - libname_spec='lib$name' - soname_spec= -@@ -115164,7 +121844,7 @@ if test "$GCC" = yes; then - fi - - echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 --echo "configure:115168: checking how to hardcode library paths into programs" >&5 -+echo "configure:121848: checking how to hardcode library paths into programs" >&5 - hardcode_action_CXX= - if test -n "$hardcode_libdir_flag_spec_CXX" || \ - test -n "$runpath_var_CXX" || \ ---- a/generated_lists -+++ b/generated_lists -@@ -1,3 +1,3 @@ - makefile_am_files = Zend/Makefile.am TSRM/Makefile.am - config_h_files = Zend/acconfig.h TSRM/acconfig.h --config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config9.m4 ext/recode/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite3/config0.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 -+config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/apc/config.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dio/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/http/config9.m4 ext/http/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libevent/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config9.m4 ext/recode/config.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite3/config0.m4 ext/sqlite/config.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 ---- a/main/php_config.h.in -+++ b/main/php_config.h.in -@@ -1,4 +1,4 @@ --/* main/php_config.h.in. Generated from configure.in by autoheader. */ -+/* main/php_config.h.in. Generated automatically from configure.in by autoheader 2.13. */ - /* Leave this file alone */ - /* - +----------------------------------------------------------------------+ -@@ -32,442 +32,1112 @@ - #define ZEND_DLIMPORT - - --#undef uint --#undef ulong -+/* Define if on AIX 3. -+ System headers sometimes define this. -+ We just want to avoid a redefinition error message. */ -+#ifndef _ALL_SOURCE -+#undef _ALL_SOURCE -+#endif + /* System header to define __stub macros and hopefully few prototypes, + which can conflict with char ldap_bind_s(); below. */ +@@ -55903,7 +56876,7 @@ --/* Define if you want to enable memory limit support */ --#define MEMORY_LIMIT 0 -+/* Define if using alloca.c. */ -+#undef C_ALLOCA - -+/* Define to empty if the keyword does not work. */ -+#undef const - --/* */ --#undef AIX -+/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. -+ This function is required for alloca.c support on those systems. */ -+#undef CRAY_STACKSEG_END - --/* Whether to use native BeOS threads */ --#undef BETHREADS -+/* Define to `int' if doesn't define. */ -+#undef gid_t - --/* */ --#undef CDB_INCLUDE_FILE -+/* Define if you have alloca, as a function or macro. */ -+#undef HAVE_ALLOCA - --/* Define if system uses EBCDIC */ --#undef CHARSET_EBCDIC -+/* Define if you have and it should be used (not on Ultrix). */ -+#undef HAVE_ALLOCA_H - --/* Whether to build bcmath as dynamic module */ --#undef COMPILE_DL_BCMATH -+/* Define if you don't have vprintf but do have _doprnt. */ -+#undef HAVE_DOPRNT - --/* Whether to build bz2 as dynamic module */ --#undef COMPILE_DL_BZ2 -+/* Define if your system has a working fnmatch function. */ -+#undef HAVE_FNMATCH - --/* Whether to build calendar as dynamic module */ --#undef COMPILE_DL_CALENDAR -+/* Define if your struct stat has st_blksize. */ -+#undef HAVE_ST_BLKSIZE - --/* Whether to build ctype as dynamic module */ --#undef COMPILE_DL_CTYPE -+/* Define if your struct stat has st_blocks. */ -+#undef HAVE_ST_BLOCKS - --/* Whether to build curl as dynamic module */ --#undef COMPILE_DL_CURL -+/* Define if your struct stat has st_rdev. */ -+#undef HAVE_ST_RDEV - --/* Whether to build date as dynamic module */ --#undef COMPILE_DL_DATE -+/* Define if your struct tm has tm_zone. */ -+#undef HAVE_TM_ZONE - --/* Whether to build dba as dynamic module */ --#undef COMPILE_DL_DBA -+/* Define if you don't have tm_zone but do have the external array -+ tzname. */ -+#undef HAVE_TZNAME - --/* Whether to build dom as dynamic module */ --#undef COMPILE_DL_DOM -+/* Define if utime(file, NULL) sets file's timestamp to the present. */ -+#undef HAVE_UTIME_NULL - --/* Whether to build enchant as dynamic module */ --#undef COMPILE_DL_ENCHANT -+/* Define if you have the vprintf function. */ -+#undef HAVE_VPRINTF - --/* Whether to build ereg as dynamic module */ --#undef COMPILE_DL_EREG -+/* Define as __inline if that's what the C compiler calls it. */ -+#undef inline - --/* Whether to build exif as dynamic module */ --#undef COMPILE_DL_EXIF -+/* Define if your C compiler doesn't accept -c and -o together. */ -+#undef NO_MINUS_C_MINUS_O - --/* Whether to build fileinfo as dynamic module */ --#undef COMPILE_DL_FILEINFO -+/* Define as the return type of signal handlers (int or void). */ -+#undef RETSIGTYPE - --/* Whether to build filter as dynamic module */ --#undef COMPILE_DL_FILTER -+/* Define to `unsigned' if doesn't define. */ -+#undef size_t - --/* Whether to build ftp as dynamic module */ --#undef COMPILE_DL_FTP -+/* If using the C implementation of alloca, define if you know the -+ direction of stack growth for your system; otherwise it will be -+ automatically deduced at run-time. -+ STACK_DIRECTION > 0 => grows toward higher addresses -+ STACK_DIRECTION < 0 => grows toward lower addresses -+ STACK_DIRECTION = 0 => direction of growth unknown -+ */ -+#undef STACK_DIRECTION - --/* Whether to build gd as dynamic module */ --#undef COMPILE_DL_GD -+/* Define if you have the ANSI C header files. */ -+#undef STDC_HEADERS - --/* Whether to build gettext as dynamic module */ --#undef COMPILE_DL_GETTEXT -+/* Define if you can safely include both and . */ -+#undef TIME_WITH_SYS_TIME - --/* Whether to build gmp as dynamic module */ --#undef COMPILE_DL_GMP -+/* Define if your declares struct tm. */ -+#undef TM_IN_SYS_TIME - --/* Whether to build hash as dynamic module */ --#undef COMPILE_DL_HASH -+/* Define to `int' if doesn't define. */ -+#undef uid_t - --/* Whether to build iconv as dynamic module */ --#undef COMPILE_DL_ICONV -+#undef uint -+#undef ulong - --/* Whether to build imap as dynamic module */ --#undef COMPILE_DL_IMAP -+/* The number of bytes in a char. */ -+#undef SIZEOF_CHAR - --/* Whether to build interbase as dynamic module */ --#undef COMPILE_DL_INTERBASE -+/* The number of bytes in a char *. */ -+#undef SIZEOF_CHAR_P - --/* Whether to build intl as dynamic module */ --#undef COMPILE_DL_INTL -+/* The number of bytes in a int. */ -+#undef SIZEOF_INT - --/* Whether to build json as dynamic module */ --#undef COMPILE_DL_JSON -+/* The number of bytes in a long. */ -+#undef SIZEOF_LONG - --/* Whether to build ldap as dynamic module */ --#undef COMPILE_DL_LDAP -+/* The number of bytes in a long int. */ -+#undef SIZEOF_LONG_INT - --/* Whether to build libxml as dynamic module */ --#undef COMPILE_DL_LIBXML -+/* The number of bytes in a long long. */ -+#undef SIZEOF_LONG_LONG - --/* Whether to build mbstring as dynamic module */ --#undef COMPILE_DL_MBSTRING -+/* The number of bytes in a long long int. */ -+#undef SIZEOF_LONG_LONG_INT - --/* Whether to build mcrypt as dynamic module */ --#undef COMPILE_DL_MCRYPT -+/* The number of bytes in a short. */ -+#undef SIZEOF_SHORT - --/* Whether to build mssql as dynamic module */ --#undef COMPILE_DL_MSSQL -+/* The number of bytes in a size_t. */ -+#undef SIZEOF_SIZE_T - --/* Whether to build mysql as dynamic module */ --#undef COMPILE_DL_MYSQL -+/* Define if you have the CreateProcess function. */ -+#undef HAVE_CREATEPROCESS - --/* Whether to build mysqli as dynamic module */ --#undef COMPILE_DL_MYSQLI -+/* Define if you have the acosh function. */ -+#undef HAVE_ACOSH - --/* Whether to build mysqlnd as dynamic module */ --#undef COMPILE_DL_MYSQLND -+/* Define if you have the alphasort function. */ -+#undef HAVE_ALPHASORT - --/* Whether to build oci8 as dynamic module */ --#undef COMPILE_DL_OCI8 -+/* Define if you have the asctime_r function. */ -+#undef HAVE_ASCTIME_R - --/* Whether to build odbc as dynamic module */ --#undef COMPILE_DL_ODBC -+/* Define if you have the asinh function. */ -+#undef HAVE_ASINH - --/* Whether to build openssl as dynamic module */ --#undef COMPILE_DL_OPENSSL -+/* Define if you have the asprintf function. */ -+#undef HAVE_ASPRINTF - --/* Whether to build pcntl as dynamic module */ --#undef COMPILE_DL_PCNTL -+/* Define if you have the atanh function. */ -+#undef HAVE_ATANH - --/* Whether to build pcre as dynamic module */ --#undef COMPILE_DL_PCRE -+/* Define if you have the atoll function. */ -+#undef HAVE_ATOLL - --/* Whether to build pdo as dynamic module */ --#undef COMPILE_DL_PDO -+/* Define if you have the chroot function. */ -+#undef HAVE_CHROOT - --/* Whether to build pdo_dblib as dynamic module */ --#undef COMPILE_DL_PDO_DBLIB -+/* Define if you have the clearenv function. */ -+#undef HAVE_CLEARENV - --/* Whether to build pdo_firebird as dynamic module */ --#undef COMPILE_DL_PDO_FIREBIRD -+/* Define if you have the crypt function. */ -+#undef HAVE_CRYPT - --/* Whether to build pdo_mysql as dynamic module */ --#undef COMPILE_DL_PDO_MYSQL -+/* Define if you have the crypt_r function. */ -+#undef HAVE_CRYPT_R - --/* Whether to build pdo_oci as dynamic module */ --#undef COMPILE_DL_PDO_OCI -+/* Define if you have the ctermid function. */ -+#undef HAVE_CTERMID - --/* Whether to build pdo_odbc as dynamic module */ --#undef COMPILE_DL_PDO_ODBC -+/* Define if you have the ctime_r function. */ -+#undef HAVE_CTIME_R - --/* Whether to build pdo_pgsql as dynamic module */ --#undef COMPILE_DL_PDO_PGSQL -+/* Define if you have the cuserid function. */ -+#undef HAVE_CUSERID - --/* Whether to build pdo_sqlite as dynamic module */ --#undef COMPILE_DL_PDO_SQLITE -+/* Define if you have the fabsf function. */ -+#undef HAVE_FABSF - --/* Whether to build pgsql as dynamic module */ --#undef COMPILE_DL_PGSQL -+/* Define if you have the finite function. */ -+#undef HAVE_FINITE - --/* Whether to build phar as dynamic module */ --#undef COMPILE_DL_PHAR -+/* Define if you have the flock function. */ -+#undef HAVE_FLOCK - --/* Whether to build posix as dynamic module */ --#undef COMPILE_DL_POSIX -+/* Define if you have the floorf function. */ -+#undef HAVE_FLOORF - --/* Whether to build pspell as dynamic module */ --#undef COMPILE_DL_PSPELL -+/* Define if you have the fork function. */ -+#undef HAVE_FORK - --/* Whether to build readline as dynamic module */ --#undef COMPILE_DL_READLINE -+/* Define if you have the fpclass function. */ -+#undef HAVE_FPCLASS - --/* Whether to build recode as dynamic module */ --#undef COMPILE_DL_RECODE -+/* Define if you have the ftok function. */ -+#undef HAVE_FTOK - --/* Whether to build reflection as dynamic module */ --#undef COMPILE_DL_REFLECTION -+/* Define if you have the funopen function. */ -+#undef HAVE_FUNOPEN - --/* Whether to build session as dynamic module */ --#undef COMPILE_DL_SESSION -+/* Define if you have the gai_strerror function. */ -+#undef HAVE_GAI_STRERROR - --/* Whether to build shmop as dynamic module */ --#undef COMPILE_DL_SHMOP -+/* Define if you have the gcvt function. */ -+#undef HAVE_GCVT - --/* Whether to build simplexml as dynamic module */ --#undef COMPILE_DL_SIMPLEXML -+/* Define if you have the getcwd function. */ -+#undef HAVE_GETCWD - --/* Whether to build snmp as dynamic module */ --#undef COMPILE_DL_SNMP -+/* Define if you have the getgrgid_r function. */ -+#undef HAVE_GETGRGID_R - --/* Whether to build soap as dynamic module */ --#undef COMPILE_DL_SOAP -+/* Define if you have the getgrnam_r function. */ -+#undef HAVE_GETGRNAM_R - --/* Whether to build sockets as dynamic module */ --#undef COMPILE_DL_SOCKETS -+/* Define if you have the getgroups function. */ -+#undef HAVE_GETGROUPS - --/* Whether to build spl as dynamic module */ --#undef COMPILE_DL_SPL -+/* Define if you have the gethostname function. */ -+#undef HAVE_GETHOSTNAME - --/* Whether to build sqlite as dynamic module */ --#undef COMPILE_DL_SQLITE -+/* Define if you have the getloadavg function. */ -+#undef HAVE_GETLOADAVG - --/* Whether to build sqlite3 as dynamic module */ --#undef COMPILE_DL_SQLITE3 -+/* Define if you have the getlogin function. */ -+#undef HAVE_GETLOGIN - --/* Whether to build standard as dynamic module */ --#undef COMPILE_DL_STANDARD -+/* Define if you have the getopt function. */ -+#undef HAVE_GETOPT - --/* Whether to build sybase_ct as dynamic module */ --#undef COMPILE_DL_SYBASE_CT -+/* Define if you have the getpgid function. */ -+#undef HAVE_GETPGID - --/* Whether to build sysvmsg as dynamic module */ --#undef COMPILE_DL_SYSVMSG -+/* Define if you have the getpid function. */ -+#undef HAVE_GETPID - --/* Whether to build sysvsem as dynamic module */ --#undef COMPILE_DL_SYSVSEM -+/* Define if you have the getpriority function. */ -+#undef HAVE_GETPRIORITY - --/* Whether to build sysvshm as dynamic module */ --#undef COMPILE_DL_SYSVSHM -+/* Define if you have the getprotobyname function. */ -+#undef HAVE_GETPROTOBYNAME - --/* Whether to build tidy as dynamic module */ --#undef COMPILE_DL_TIDY -+/* Define if you have the getprotobynumber function. */ -+#undef HAVE_GETPROTOBYNUMBER - --/* Whether to build tokenizer as dynamic module */ --#undef COMPILE_DL_TOKENIZER -+/* Define if you have the getpwnam_r function. */ -+#undef HAVE_GETPWNAM_R - --/* Whether to build wddx as dynamic module */ --#undef COMPILE_DL_WDDX -+/* Define if you have the getpwuid_r function. */ -+#undef HAVE_GETPWUID_R - --/* Whether to build xml as dynamic module */ --#undef COMPILE_DL_XML -+/* Define if you have the getrlimit function. */ -+#undef HAVE_GETRLIMIT - --/* Whether to build xmlreader as dynamic module */ --#undef COMPILE_DL_XMLREADER -+/* Define if you have the getrusage function. */ -+#undef HAVE_GETRUSAGE - --/* Whether to build xmlrpc as dynamic module */ --#undef COMPILE_DL_XMLRPC -+/* Define if you have the getservbyname function. */ -+#undef HAVE_GETSERVBYNAME - --/* Whether to build xmlwriter as dynamic module */ --#undef COMPILE_DL_XMLWRITER -+/* Define if you have the getservbyport function. */ -+#undef HAVE_GETSERVBYPORT - --/* Whether to build xsl as dynamic module */ --#undef COMPILE_DL_XSL -+/* Define if you have the getsid function. */ -+#undef HAVE_GETSID - --/* Whether to build zip as dynamic module */ --#undef COMPILE_DL_ZIP -+/* Define if you have the gettimeofday function. */ -+#undef HAVE_GETTIMEOFDAY - --/* Whether to build zlib as dynamic module */ --#undef COMPILE_DL_ZLIB -+/* Define if you have the getwd function. */ -+#undef HAVE_GETWD - --/* */ --#undef COOKIE_IO_FUNCTIONS_T -+/* Define if you have the glob function. */ -+#undef HAVE_GLOB - --/* */ --#undef COOKIE_SEEKER_USES_OFF64_T -+/* Define if you have the gmtime_r function. */ -+#undef HAVE_GMTIME_R - --/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP -- systems. This function is required for `alloca.c' support on those systems. -- */ --#undef CRAY_STACKSEG_END -+/* Define if you have the grantpt function. */ -+#undef HAVE_GRANTPT - --/* Define if crypt_r has uses CRYPTD */ --#undef CRYPT_R_CRYPTD -+/* Define if you have the hstrerror function. */ -+#undef HAVE_HSTRERROR - --/* Define if struct crypt_data requires _GNU_SOURCE */ --#undef CRYPT_R_GNU_SOURCE -+/* Define if you have the hypot function. */ -+#undef HAVE_HYPOT - --/* Define if crypt_r uses struct crypt_data */ --#undef CRYPT_R_STRUCT_CRYPT_DATA -+/* Define if you have the inet_ntoa function. */ -+#undef HAVE_INET_NTOA - --/* Define to 1 if using `alloca.c'. */ --#undef C_ALLOCA -+/* Define if you have the inet_ntop function. */ -+#undef HAVE_INET_NTOP - --/* Define if the target system is darwin */ --#undef DARWIN -+/* Define if you have the inet_pton function. */ -+#undef HAVE_INET_PTON - --/* */ --#undef DB1_INCLUDE_FILE -+/* Define if you have the initgroups function. */ -+#undef HAVE_INITGROUPS -+ -+/* Define if you have the isascii function. */ -+#undef HAVE_ISASCII -+ -+/* Define if you have the isfinite function. */ -+#undef HAVE_ISFINITE -+ -+/* Define if you have the isinf function. */ -+#undef HAVE_ISINF -+ -+/* Define if you have the isnan function. */ -+#undef HAVE_ISNAN -+ -+/* Define if you have the kill function. */ -+#undef HAVE_KILL -+ -+/* Define if you have the lchown function. */ -+#undef HAVE_LCHOWN -+ -+/* Define if you have the ldap_parse_reference function. */ -+#undef HAVE_LDAP_PARSE_REFERENCE -+ -+/* Define if you have the ldap_parse_result function. */ -+#undef HAVE_LDAP_PARSE_RESULT -+ -+/* Define if you have the ldap_start_tls_s function. */ -+#undef HAVE_LDAP_START_TLS_S -+ -+/* Define if you have the link function. */ -+#undef HAVE_LINK -+ -+/* Define if you have the localeconv function. */ -+#undef HAVE_LOCALECONV -+ -+/* Define if you have the localtime_r function. */ -+#undef HAVE_LOCALTIME_R -+ -+/* Define if you have the lockf function. */ -+#undef HAVE_LOCKF -+ -+/* Define if you have the log1p function. */ -+#undef HAVE_LOG1P -+ -+/* Define if you have the lrand48 function. */ -+#undef HAVE_LRAND48 -+ -+/* Define if you have the makedev function. */ -+#undef HAVE_MAKEDEV -+ -+/* Define if you have the mblen function. */ -+#undef HAVE_MBLEN -+ -+/* Define if you have the mbrlen function. */ -+#undef HAVE_MBRLEN -+ -+/* Define if you have the mbsinit function. */ -+#undef HAVE_MBSINIT -+ -+/* Define if you have the memcpy function. */ -+#undef HAVE_MEMCPY -+ -+/* Define if you have the memmove function. */ -+#undef HAVE_MEMMOVE -+ -+/* Define if you have the mempcpy function. */ -+#undef HAVE_MEMPCPY -+ -+/* Define if you have the mkfifo function. */ -+#undef HAVE_MKFIFO -+ -+/* Define if you have the mknod function. */ -+#undef HAVE_MKNOD -+ -+/* Define if you have the mkstemp function. */ -+#undef HAVE_MKSTEMP -+ -+/* Define if you have the mmap function. */ -+#undef HAVE_MMAP -+ -+/* Define if you have the mremap function. */ -+#undef HAVE_MREMAP -+ -+/* Define if you have the mysql_commit function. */ -+#undef HAVE_MYSQL_COMMIT -+ -+/* Define if you have the mysql_next_result function. */ -+#undef HAVE_MYSQL_NEXT_RESULT -+ -+/* Define if you have the mysql_sqlstate function. */ -+#undef HAVE_MYSQL_SQLSTATE -+ -+/* Define if you have the mysql_stmt_prepare function. */ -+#undef HAVE_MYSQL_STMT_PREPARE -+ -+/* Define if you have the nanosleep function. */ -+#undef HAVE_NANOSLEEP -+ -+/* Define if you have the nice function. */ -+#undef HAVE_NICE -+ -+/* Define if you have the nl_langinfo function. */ -+#undef HAVE_NL_LANGINFO -+ -+/* Define if you have the perror function. */ -+#undef HAVE_PERROR -+ -+/* Define if you have the poll function. */ -+#undef HAVE_POLL -+ -+/* Define if you have the ptsname function. */ -+#undef HAVE_PTSNAME -+ -+/* Define if you have the putenv function. */ -+#undef HAVE_PUTENV -+ -+/* Define if you have the rand_r function. */ -+#undef HAVE_RAND_R -+ -+/* Define if you have the random function. */ -+#undef HAVE_RANDOM -+ -+/* Define if you have the realpath function. */ -+#undef HAVE_REALPATH -+ -+/* Define if you have the rl_completion_matches function. */ -+#undef HAVE_RL_COMPLETION_MATCHES -+ -+/* Define if you have the scandir function. */ -+#undef HAVE_SCANDIR -+ -+/* Define if you have the setegid function. */ -+#undef HAVE_SETEGID -+ -+/* Define if you have the setenv function. */ -+#undef HAVE_SETENV -+ -+/* Define if you have the seteuid function. */ -+#undef HAVE_SETEUID -+ -+/* Define if you have the setitimer function. */ -+#undef HAVE_SETITIMER -+ -+/* Define if you have the setlocale function. */ -+#undef HAVE_SETLOCALE -+ -+/* Define if you have the setpgid function. */ -+#undef HAVE_SETPGID -+ -+/* Define if you have the setpriority function. */ -+#undef HAVE_SETPRIORITY -+ -+/* Define if you have the setproctitle function. */ -+#undef HAVE_SETPROCTITLE -+ -+/* Define if you have the setsid function. */ -+#undef HAVE_SETSID -+ -+/* Define if you have the setsockopt function. */ -+#undef HAVE_SETSOCKOPT -+ -+/* Define if you have the setvbuf function. */ -+#undef HAVE_SETVBUF -+ -+/* Define if you have the shutdown function. */ -+#undef HAVE_SHUTDOWN -+ -+/* Define if you have the sigaction function. */ -+#undef HAVE_SIGACTION -+ -+/* Define if you have the sigprocmask function. */ -+#undef HAVE_SIGPROCMASK -+ -+/* Define if you have the sigsetjmp function. */ -+#undef HAVE_SIGSETJMP -+ -+/* Define if you have the sigtimedwait function. */ -+#undef HAVE_SIGTIMEDWAIT -+ -+/* Define if you have the sigwaitinfo function. */ -+#undef HAVE_SIGWAITINFO -+ -+/* Define if you have the sin function. */ -+#undef HAVE_SIN -+ -+/* Define if you have the snprintf function. */ -+#undef HAVE_SNPRINTF -+ -+/* Define if you have the socketpair function. */ -+#undef HAVE_SOCKETPAIR -+ -+/* Define if you have the srand48 function. */ -+#undef HAVE_SRAND48 -+ -+/* Define if you have the srandom function. */ -+#undef HAVE_SRANDOM -+ -+/* Define if you have the statfs function. */ -+#undef HAVE_STATFS -+ -+/* Define if you have the statvfs function. */ -+#undef HAVE_STATVFS -+ -+/* Define if you have the std_syslog function. */ -+#undef HAVE_STD_SYSLOG -+ -+/* Define if you have the strcasecmp function. */ -+#undef HAVE_STRCASECMP -+ -+/* Define if you have the strcoll function. */ -+#undef HAVE_STRCOLL -+ -+/* Define if you have the strdup function. */ -+#undef HAVE_STRDUP -+ -+/* Define if you have the strerror function. */ -+#undef HAVE_STRERROR -+ -+/* Define if you have the strfmon function. */ -+#undef HAVE_STRFMON -+ -+/* Define if you have the strftime function. */ -+#undef HAVE_STRFTIME -+ -+/* Define if you have the strlcat function. */ -+#undef HAVE_STRLCAT -+ -+/* Define if you have the strlcpy function. */ -+#undef HAVE_STRLCPY -+ -+/* Define if you have the strndup function. */ -+#undef HAVE_STRNDUP -+ -+/* Define if you have the strnlen function. */ -+#undef HAVE_STRNLEN -+ -+/* Define if you have the strpbrk function. */ -+#undef HAVE_STRPBRK -+ -+/* Define if you have the strpncpy function. */ -+#undef HAVE_STRPNCPY -+ -+/* Define if you have the strptime function. */ -+#undef HAVE_STRPTIME -+ -+/* Define if you have the strstr function. */ -+#undef HAVE_STRSTR -+ -+/* Define if you have the strtod function. */ -+#undef HAVE_STRTOD -+ -+/* Define if you have the strtok_r function. */ -+#undef HAVE_STRTOK_R -+ -+/* Define if you have the strtol function. */ -+#undef HAVE_STRTOL -+ -+/* Define if you have the strtoll function. */ -+#undef HAVE_STRTOLL -+ -+/* Define if you have the strtoul function. */ -+#undef HAVE_STRTOUL -+ -+/* Define if you have the strtoull function. */ -+#undef HAVE_STRTOULL -+ -+/* Define if you have the symlink function. */ -+#undef HAVE_SYMLINK -+ -+/* Define if you have the tempnam function. */ -+#undef HAVE_TEMPNAM -+ -+/* Define if you have the tzset function. */ -+#undef HAVE_TZSET -+ -+/* Define if you have the unlockpt function. */ -+#undef HAVE_UNLOCKPT -+ -+/* Define if you have the unsetenv function. */ -+#undef HAVE_UNSETENV -+ -+/* Define if you have the usleep function. */ -+#undef HAVE_USLEEP -+ -+/* Define if you have the utime function. */ -+#undef HAVE_UTIME -+ -+/* Define if you have the utimes function. */ -+#undef HAVE_UTIMES -+ -+/* Define if you have the vasprintf function. */ -+#undef HAVE_VASPRINTF -+ -+/* Define if you have the vsnprintf function. */ -+#undef HAVE_VSNPRINTF -+ -+/* Define if you have the wait3 function. */ -+#undef HAVE_WAIT3 -+ -+/* Define if you have the waitpid function. */ -+#undef HAVE_WAITPID -+ -+/* Define if you have the header file. */ -+#undef HAVE__NSAPI_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_ALLOCA_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_ARPA_INET_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_ARPA_NAMESER_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_ASSERT_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_ATOMIC_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_CRYPT_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_DEFAULT_STORE_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_DIRENT_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_DLFCN_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_DNS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_ERRNO_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_FCNTL_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_GRP_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_IEEEFP_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_INTTYPES_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_LANGINFO_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_LIMITS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_LOCALE_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_MALLOC_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_MONETARY_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_NDIR_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_NETDB_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_NETINET_IN_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_NETINET_TCP_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_OPENSSL_CRYPTO_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_PWD_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_RESOLV_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SIGNAL_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_ST_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_STDARG_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_STDBOOL_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_STDINT_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_STDIO_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_STDLIB_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_STRING_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_STRINGS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_DIR_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_FILE_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_IOCTL_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_IPC_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_LOADAVG_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_MKDEV_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_MMAN_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_MOUNT_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_NDIR_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_PARAM_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_POLL_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_RESOURCE_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_SELECT_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_SOCKET_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_STAT_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_STATFS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_STATVFS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_SYSEXITS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_TIME_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_TIMES_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_TYPES_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_UIO_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_UN_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_UTSNAME_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_VARARGS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_VFS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYS_WAIT_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYSEXITS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_SYSLOG_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_TERMIOS_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_TIME_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_TUXMODULE_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_UNISTD_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_UNIX_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_UTIME_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_WCHAR_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_XMLPARSE_H -+ -+/* Define if you have the header file. */ -+#undef HAVE_XMLTOK_H -+ -+/* Define if you have the m library (-lm). */ -+#undef HAVE_LIBM -+ -+/* Define if the target system has /dev/urandom device */ -+#undef HAVE_DEV_URANDOM -+ -+/* Whether you have AOLserver */ -+#undef HAVE_AOLSERVER -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_COMPAT_H -+ -+/* */ -+#undef HAVE_APACHE -+ -+/* */ -+#undef HAVE_APACHE -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_COMPAT_H -+ -+/* */ -+#undef HAVE_OLD_COMPAT_H -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_COMPAT_H -+ -+/* */ -+#undef HAVE_OLD_COMPAT_H -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_COMPAT_H -+ -+/* */ -+#undef HAVE_OLD_COMPAT_H -+ -+/* */ -+#undef USE_TRANSFER_TABLES -+ -+/* */ -+#undef PHP_APACHE_HAVE_CLIENT_FD -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_COMPAT_H -+ -+/* */ -+#undef HAVE_APACHE_HOOKS -+ -+/* */ -+#undef HAVE_APACHE -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_COMPAT_H -+ -+/* */ -+#undef HAVE_OLD_COMPAT_H -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_COMPAT_H -+ -+/* */ -+#undef HAVE_OLD_COMPAT_H -+ -+/* */ -+#undef HAVE_AP_CONFIG_H -+ -+/* */ -+#undef HAVE_AP_COMPAT_H -+ -+/* */ -+#undef HAVE_OLD_COMPAT_H -+ -+/* */ -+#undef USE_TRANSFER_TABLES -+ -+/* */ -+#undef PHP_APACHE_HAVE_CLIENT_FD -+ -+/* Whether to compile with Caudium support */ -+#undef HAVE_CAUDIUM -+ -+/* Whether you have a Continuity Server */ -+#undef HAVE_CONTINUITY -+ -+/* do we have prctl? */ -+#undef HAVE_PRCTL -+ -+/* do we have clock_gettime? */ -+#undef HAVE_CLOCK_GETTIME -+ -+/* do we have clock_get_time? */ -+#undef HAVE_CLOCK_GET_TIME -+ -+/* do we have ptrace? */ -+#undef HAVE_PTRACE -+ -+/* do we have mach_vm_read? */ -+#undef HAVE_MACH_VM_READ -+ -+/* /proc/pid/mem interface */ -+#undef PROC_MEM_FILE -+ -+/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */ -+#undef HAVE_BUILTIN_ATOMIC - --/* */ --#undef DB1_VERSION -+/* do we have TCP_INFO? */ -+#undef HAVE_LQ_TCP_INFO - --/* */ --#undef DB2_INCLUDE_FILE -+/* do we have SO_LISTENQxxx? */ -+#undef HAVE_LQ_SO_LISTENQ - --/* */ --#undef DB3_INCLUDE_FILE -+/* do we have sysconf? */ -+#undef HAVE_SYSCONF - --/* */ --#undef DB4_INCLUDE_FILE -+/* do we have times? */ -+#undef HAVE_TIMES - --/* */ --#undef DBA_CDB -+/* do we have kqueue? */ -+#undef HAVE_KQUEUE - --/* */ --#undef DBA_CDB_BUILTIN -+/* do we have port framework? */ -+#undef HAVE_PORT - --/* */ --#undef DBA_CDB_MAKE -+/* do we have /dev/poll? */ -+#undef HAVE_DEVPOLL - --/* */ --#undef DBA_DB1 -+/* do we have epoll? */ -+#undef HAVE_EPOLL - --/* */ --#undef DBA_DB2 -+/* do we have poll? */ -+#undef HAVE_POLL - --/* */ --#undef DBA_DB3 -+/* do we have select? */ -+#undef HAVE_SELECT - --/* */ --#undef DBA_DB4 -+/* fpm user name */ -+#undef PHP_FPM_USER - --/* */ --#undef DBA_DBM -+/* fpm group name */ -+#undef PHP_FPM_GROUP - --/* */ --#undef DBA_FLATFILE -+/* */ -+#undef WITH_ZEUS - --/* */ --#undef DBA_GDBM -+/* Whether you have a Netscape/iPlanet/Sun Webserver */ -+#undef HAVE_NSAPI - --/* */ --#undef DBA_INIFILE -+/* Whether you have phttpd */ -+#undef HAVE_PHTTPD - --/* */ --#undef DBA_NDBM -+/* whether you want Pi3Web support */ -+#undef WITH_PI3WEB - --/* */ --#undef DBA_QDBM -+/* Whether you use Roxen */ -+#undef HAVE_ROXEN - --/* */ --#undef DBM_INCLUDE_FILE -+/* Whether to use Roxen in ZTS mode */ -+#undef ROXEN_USE_ZTS - --/* */ --#undef DBM_VERSION -+/* Define if the socklen_t typedef is in sys/socket.h */ -+#undef HAVE_SOCKLEN_T - --/* */ --#undef DEFAULT_SHORT_OPEN_TAG -+/* Define if sockaddr_un in sys/un.h contains a sun_len component */ -+#undef HAVE_SOCKADDR_UN_SUN_LEN - --/* Define if dlsym() requires a leading underscore in symbol names. */ --#undef DLSYM_NEEDS_UNDERSCORE -+/* Define if cross-process locking is required by accept() */ -+#undef USE_LOCKING - --/* Whether to enable chroot() function */ --#undef ENABLE_CHROOT_FUNC -+/* Define if system uses EBCDIC */ -+#undef CHARSET_EBCDIC - --/* */ --#undef ENABLE_GD_TTF -+/* Define if processor uses big-endian word */ -+#undef WORDS_BIGENDIAN - --/* */ --#undef ENCHANT_VERSION_STRING -+/* whether write(2) works */ -+#undef PHP_WRITE_STDOUT - --/* */ --#undef GDBM_INCLUDE_FILE -+/* */ -+#undef HAVE_SOCKET + ; return 0; } + EOF +-if { (eval echo configure:55907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:56880: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_ldap_bind_s=yes" + else +@@ -55956,7 +56929,7 @@ + php_enable_mbstring=no + + echo $ac_n "checking whether to enable multibyte string support""... $ac_c" 1>&6 +-echo "configure:55960: checking whether to enable multibyte string support" >&5 ++echo "configure:56933: checking whether to enable multibyte string support" >&5 + # Check whether --enable-mbstring or --disable-mbstring was given. + if test "${enable_mbstring+set}" = set; then + enableval="$enable_mbstring" +@@ -56000,7 +56973,7 @@ + php_enable_mbregex=yes + + echo $ac_n "checking whether to enable multibyte regex support""... $ac_c" 1>&6 +-echo "configure:56004: checking whether to enable multibyte regex support" >&5 ++echo "configure:56977: checking whether to enable multibyte regex support" >&5 + # Check whether --enable-mbregex or --disable-mbregex was given. + if test "${enable_mbregex+set}" = set; then + enableval="$enable_mbregex" +@@ -56023,7 +56996,7 @@ + php_enable_mbregex_backtrack=yes + + echo $ac_n "checking whether to check multibyte regex backtrack""... $ac_c" 1>&6 +-echo "configure:56027: checking whether to check multibyte regex backtrack" >&5 ++echo "configure:57000: checking whether to check multibyte regex backtrack" >&5 + # Check whether --enable-mbregex_backtrack or --disable-mbregex_backtrack was given. + if test "${enable_mbregex_backtrack+set}" = set; then + enableval="$enable_mbregex_backtrack" +@@ -56046,7 +57019,7 @@ + php_with_libmbfl=no + + echo $ac_n "checking for external libmbfl""... $ac_c" 1>&6 +-echo "configure:56050: checking for external libmbfl" >&5 ++echo "configure:57023: checking for external libmbfl" >&5 + # Check whether --with-libmbfl or --without-libmbfl was given. + if test "${with_libmbfl+set}" = set; then + withval="$with_libmbfl" +@@ -56069,7 +57042,7 @@ + php_with_onig=no + + echo $ac_n "checking for external oniguruma""... $ac_c" 1>&6 +-echo "configure:56073: checking for external oniguruma" >&5 ++echo "configure:57046: checking for external oniguruma" >&5 + # Check whether --with-onig or --without-onig was given. + if test "${with_onig+set}" = set; then + withval="$with_onig" +@@ -56110,7 +57083,7 @@ + fi + + echo $ac_n "checking for variable length prototypes and stdarg.h""... $ac_c" 1>&6 +-echo "configure:56114: checking for variable length prototypes and stdarg.h" >&5 ++echo "configure:57087: checking for variable length prototypes and stdarg.h" >&5 + if eval "test \"`echo '$''{'php_cv_mbstring_stdarg'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -56128,7 +57101,7 @@ + + else + cat > conftest.$ac_ext < +@@ -56143,7 +57116,7 @@ + int main() { return foo(10, "", 3.14); } + + EOF +-if { (eval echo configure:56147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:57120: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + php_cv_mbstring_stdarg=yes + else +@@ -56164,17 +57137,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:56168: checking for $ac_hdr" >&5 ++echo "configure:57141: 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:56178: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:57151: \"$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* +@@ -56201,7 +57174,7 @@ + done + + echo $ac_n "checking size of int""... $ac_c" 1>&6 +-echo "configure:56205: checking size of int" >&5 ++echo "configure:57178: 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 +@@ -56209,18 +57182,19 @@ + ac_cv_sizeof_int=4 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:56224: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:57198: \"$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 +@@ -56240,7 +57214,7 @@ + + + echo $ac_n "checking size of short""... $ac_c" 1>&6 +-echo "configure:56244: checking size of short" >&5 ++echo "configure:57218: checking size of short" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_short'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -56248,18 +57222,19 @@ + ac_cv_sizeof_short=2 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(short)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:56263: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:57238: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_short=`cat conftestval` + else +@@ -56279,7 +57254,7 @@ + + + echo $ac_n "checking size of long""... $ac_c" 1>&6 +-echo "configure:56283: checking size of long" >&5 ++echo "configure:57258: 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 +@@ -56287,18 +57262,19 @@ + ac_cv_sizeof_long=4 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:56302: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:57278: \"$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 +@@ -56318,12 +57294,12 @@ + + + echo $ac_n "checking for working const""... $ac_c" 1>&6 +-echo "configure:56322: checking for working const" >&5 ++echo "configure:57298: 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:57352: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_const=yes + else +@@ -56393,12 +57369,12 @@ + fi + + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:56397: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:57373: 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 +@@ -56407,7 +57383,7 @@ + struct tm *tp; + ; return 0; } + EOF +-if { (eval echo configure:56411: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:57387: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes + else +@@ -56430,19 +57406,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:56434: checking for working alloca.h" >&5 ++echo "configure:57410: 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:56446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:57422: \"$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 +@@ -56463,12 +57439,12 @@ + fi + + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:56467: checking for alloca" >&5 ++echo "configure:57443: 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:57476: \"$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 +@@ -56528,12 +57504,12 @@ + + + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:56532: checking whether alloca needs Cray hooks" >&5 ++echo "configure:57508: 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:56562: checking for $ac_func" >&5 ++echo "configure:57538: 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:57566: \"$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 +@@ -56613,7 +57589,7 @@ + fi + + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:56617: checking stack direction for C alloca" >&5 ++echo "configure:57593: 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 +@@ -56621,7 +57597,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:57620: \"$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 +@@ -56662,7 +57638,7 @@ + fi + + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:56666: checking for 8-bit clean memcmp" >&5 ++echo "configure:57642: 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 +@@ -56670,7 +57646,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:57660: \"$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 +@@ -56699,17 +57675,17 @@ + + ac_safe=`echo "stdarg.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for stdarg.h""... $ac_c" 1>&6 +-echo "configure:56703: checking for stdarg.h" >&5 ++echo "configure:57679: checking for stdarg.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:56713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:57689: \"$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* +@@ -56939,7 +57915,7 @@ + done + + echo $ac_n "checking for onig_init in -lonig""... $ac_c" 1>&6 +-echo "configure:56943: checking for onig_init in -lonig" >&5 ++echo "configure:57919: checking for onig_init in -lonig" >&5 + ac_lib_var=`echo onig'_'onig_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 +@@ -56947,7 +57923,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lonig $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:57938: \"$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 +@@ -57184,9 +58160,9 @@ + done + + echo $ac_n "checking if oniguruma has an invalid entry for KOI8 encoding""... $ac_c" 1>&6 +-echo "configure:57188: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 ++echo "configure:58164: checking if oniguruma has an invalid entry for KOI8 encoding" >&5 + cat > conftest.$ac_ext < +@@ -57197,7 +58173,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:57201: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:58177: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + echo "$ac_t""no" 1>&6 +@@ -57495,7 +58471,7 @@ + done + + echo $ac_n "checking for mbfl_buffer_converter_new in -lmbfl""... $ac_c" 1>&6 +-echo "configure:57499: checking for mbfl_buffer_converter_new in -lmbfl" >&5 ++echo "configure:58475: checking for mbfl_buffer_converter_new in -lmbfl" >&5 + ac_lib_var=`echo mbfl'_'mbfl_buffer_converter_new | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -57503,7 +58479,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lmbfl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:58494: \"$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 +@@ -58151,7 +59127,7 @@ + php_with_mcrypt=no + + echo $ac_n "checking for mcrypt support""... $ac_c" 1>&6 +-echo "configure:58155: checking for mcrypt support" >&5 ++echo "configure:59131: checking for mcrypt support" >&5 + # Check whether --with-mcrypt or --without-mcrypt was given. + if test "${with_mcrypt+set}" = set; then + withval="$with_mcrypt" +@@ -58204,9 +59180,9 @@ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=-I$MCRYPT_DIR/include + echo $ac_n "checking for libmcrypt version""... $ac_c" 1>&6 +-echo "configure:58208: checking for libmcrypt version" >&5 ++echo "configure:59184: checking for libmcrypt version" >&5 + cat > conftest.$ac_ext < +@@ -58330,7 +59306,7 @@ + done + + echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 +-echo "configure:58334: checking for mcrypt_module_open in -lmcrypt" >&5 ++echo "configure:59310: 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 +@@ -58338,7 +59314,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:59329: \"$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 +@@ -58502,7 +59478,7 @@ + done + + echo $ac_n "checking for mcrypt_module_open in -lmcrypt""... $ac_c" 1>&6 +-echo "configure:58506: checking for mcrypt_module_open in -lmcrypt" >&5 ++echo "configure:59482: 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 +@@ -58510,7 +59486,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:59501: \"$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 +@@ -58994,7 +59970,7 @@ + php_with_mssql=no + + echo $ac_n "checking for MSSQL support via FreeTDS""... $ac_c" 1>&6 +-echo "configure:58998: checking for MSSQL support via FreeTDS" >&5 ++echo "configure:59974: checking for MSSQL support via FreeTDS" >&5 + # Check whether --with-mssql or --without-mssql was given. + if test "${with_mssql+set}" = set; then + withval="$with_mssql" +@@ -59492,7 +60468,7 @@ + fi + + echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 +-echo "configure:59496: checking for dnet_addr in -ldnet_stub" >&5 ++echo "configure:60472: 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 +@@ -59500,7 +60476,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:60491: \"$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 +@@ -59655,7 +60631,7 @@ + php_with_mysql=no + + echo $ac_n "checking for MySQL support""... $ac_c" 1>&6 +-echo "configure:59659: checking for MySQL support" >&5 ++echo "configure:60635: checking for MySQL support" >&5 + # Check whether --with-mysql or --without-mysql was given. + if test "${with_mysql+set}" = set; then + withval="$with_mysql" +@@ -59699,7 +60675,7 @@ + php_with_mysql_sock=no + + echo $ac_n "checking for specified location of the MySQL UNIX socket""... $ac_c" 1>&6 +-echo "configure:59703: checking for specified location of the MySQL UNIX socket" >&5 ++echo "configure:60679: checking for specified location of the MySQL UNIX socket" >&5 + # Check whether --with-mysql-sock or --without-mysql-sock was given. + if test "${with_mysql_sock+set}" = set; then + withval="$with_mysql_sock" +@@ -59723,7 +60699,7 @@ + php_with_zlib_dir=no + + echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 +-echo "configure:59727: checking for the location of libz" >&5 ++echo "configure:60703: checking for the location of libz" >&5 + # Check whether --with-zlib-dir or --without-zlib-dir was given. + if test "${with_zlib_dir+set}" = set; then + withval="$with_zlib_dir" +@@ -59897,7 +60873,7 @@ + done + + echo $ac_n "checking for mysql_close in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 +-echo "configure:59901: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 ++echo "configure:60877: checking for mysql_close in -l$MYSQL_LIBNAME" >&5 + ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_close | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -59905,7 +60881,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$MYSQL_LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:60896: \"$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 +@@ -60139,7 +61115,7 @@ + done + + echo $ac_n "checking for mysql_error in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 +-echo "configure:60143: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 ++echo "configure:61119: checking for mysql_error in -l$MYSQL_LIBNAME" >&5 + ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_error | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -60147,7 +61123,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$MYSQL_LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:61138: \"$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 +@@ -60313,7 +61289,7 @@ + done + + echo $ac_n "checking for mysql_errno in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 +-echo "configure:60317: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 ++echo "configure:61293: checking for mysql_errno in -l$MYSQL_LIBNAME" >&5 + ac_lib_var=`echo $MYSQL_LIBNAME'_'mysql_errno | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -60321,7 +61297,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$MYSQL_LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:61312: \"$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 +@@ -60526,7 +61502,7 @@ + + if test "$PHP_MYSQL" != "no"; then + echo $ac_n "checking for MySQL UNIX socket location""... $ac_c" 1>&6 +-echo "configure:60530: checking for MySQL UNIX socket location" >&5 ++echo "configure:61506: checking for MySQL UNIX socket location" >&5 + if test "$PHP_MYSQL_SOCK" != "no" && test "$PHP_MYSQL_SOCK" != "yes"; then + MYSQL_SOCK=$PHP_MYSQL_SOCK + cat >> confdefs.h <&6 +-echo "configure:60903: checking for MySQLi support" >&5 ++echo "configure:61879: checking for MySQLi support" >&5 + # Check whether --with-mysqli or --without-mysqli was given. + if test "${with_mysqli+set}" = set; then + withval="$with_mysqli" +@@ -60943,7 +61919,7 @@ + php_enable_embedded_mysqli=no + + echo $ac_n "checking whether to enable embedded MySQLi support""... $ac_c" 1>&6 +-echo "configure:60947: checking whether to enable embedded MySQLi support" >&5 ++echo "configure:61923: checking whether to enable embedded MySQLi support" >&5 + # Check whether --enable-embedded_mysqli or --disable-embedded_mysqli was given. + if test "${enable_embedded_mysqli+set}" = set; then + enableval="$enable_embedded_mysqli" +@@ -61094,7 +62070,7 @@ + done + + echo $ac_n "checking for mysql_set_server_option in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 +-echo "configure:61098: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 ++echo "configure:62074: checking for mysql_set_server_option in -l$MYSQL_LIB_NAME" >&5 + ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_server_option | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -61102,7 +62078,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$MYSQL_LIB_NAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62093: \"$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 +@@ -61361,7 +62337,7 @@ + done + + echo $ac_n "checking for mysql_set_character_set in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 +-echo "configure:61365: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 ++echo "configure:62341: checking for mysql_set_character_set in -l$MYSQL_LIB_NAME" >&5 + ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_set_character_set | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -61369,7 +62345,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$MYSQL_LIB_NAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62360: \"$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 +@@ -61524,7 +62500,7 @@ + done + + echo $ac_n "checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME""... $ac_c" 1>&6 +-echo "configure:61528: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 ++echo "configure:62504: checking for mysql_stmt_next_result in -l$MYSQL_LIB_NAME" >&5 + ac_lib_var=`echo $MYSQL_LIB_NAME'_'mysql_stmt_next_result | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -61532,7 +62508,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$MYSQL_LIB_NAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:62523: \"$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 +@@ -61947,7 +62923,7 @@ + php_with_oci8=no + + echo $ac_n "checking for Oracle (OCI8) support""... $ac_c" 1>&6 +-echo "configure:61951: checking for Oracle (OCI8) support" >&5 ++echo "configure:62927: 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" +@@ -61995,7 +62971,7 @@ + + + echo $ac_n "checking PHP version""... $ac_c" 1>&6 +-echo "configure:61999: checking PHP version" >&5 ++echo "configure:62975: checking PHP version" >&5 + + tmp_version=$PHP_VERSION + if test -z "$tmp_version"; then +@@ -62027,7 +63003,7 @@ + + + echo $ac_n "checking size of long int""... $ac_c" 1>&6 +-echo "configure:62031: checking size of long int" >&5 ++echo "configure:63007: checking size of long int" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -62035,18 +63011,19 @@ + ac_cv_sizeof_long_int=4 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long int)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:62050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:63027: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_long_int=`cat conftestval` + else +@@ -62066,7 +63043,7 @@ + + + echo $ac_n "checking checking if we're on a 64-bit platform""... $ac_c" 1>&6 +-echo "configure:62070: checking checking if we're on a 64-bit platform" >&5 ++echo "configure:63047: checking checking if we're on a 64-bit platform" >&5 + if test "$ac_cv_sizeof_long_int" = "4"; then + echo "$ac_t""no" 1>&6 + PHP_OCI8_OH_LIBDIR=lib32 +@@ -62110,7 +63087,7 @@ + if test "$PHP_OCI8_INSTANT_CLIENT" = "no"; then + + echo $ac_n "checking Oracle ORACLE_HOME install directory""... $ac_c" 1>&6 +-echo "configure:62114: checking Oracle ORACLE_HOME install directory" >&5 ++echo "configure:63091: checking Oracle ORACLE_HOME install directory" >&5 + + if test "$PHP_OCI8" = "yes"; then + OCI8_DIR=$ORACLE_HOME +@@ -62121,7 +63098,7 @@ + + + echo $ac_n "checking ORACLE_HOME library validity""... $ac_c" 1>&6 +-echo "configure:62125: checking ORACLE_HOME library validity" >&5 ++echo "configure:63102: checking ORACLE_HOME library validity" >&5 + if test ! -d "$OCI8_DIR"; then + { echo "configure: error: ${OCI8_DIR} is not a directory" 1>&2; exit 1; } + fi +@@ -62462,7 +63439,7 @@ + + + echo $ac_n "checking Oracle version""... $ac_c" 1>&6 +-echo "configure:62466: checking Oracle version" >&5 ++echo "configure:63443: checking Oracle version" >&5 + if test -s "$OCI8_DIR/orainst/unix.rgs"; then + OCI8_ORACLE_VERSION=`grep '"ocommon"' $OCI8_DIR/orainst/unix.rgs | $PHP_OCI8_SED 's/ */:/g' | cut -d: -f 6 | cut -c 2-4` + test -z "$OCI8_ORACLE_VERSION" && OCI8_ORACLE_VERSION=7.3 +@@ -62592,7 +63569,7 @@ + done + + echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 +-echo "configure:62596: checking for OCIEnvNlsCreate in -lclntsh" >&5 ++echo "configure:63573: checking for OCIEnvNlsCreate in -lclntsh" >&5 + ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -62600,7 +63577,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lclntsh $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:63592: \"$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 +@@ -63048,7 +64025,7 @@ + else + + echo $ac_n "checking Oracle Instant Client directory""... $ac_c" 1>&6 +-echo "configure:63052: checking Oracle Instant Client directory" >&5 ++echo "configure:64029: checking Oracle Instant Client directory" >&5 + + if test "$PHP_OCI8_INSTANT_CLIENT" = "yes"; then + PHP_OCI8_INSTANT_CLIENT=`ls -d /usr/lib/oracle/*/client${PHP_OCI8_IC_LIBDIR_SUFFIX}/lib/libclntsh.* 2> /dev/null | tail -1 | $PHP_OCI8_SED -e 's#/libclntsh[^/]*##'` +@@ -63061,7 +64038,7 @@ + OCI8_DIR=$PHP_OCI8_INSTANT_CLIENT + + echo $ac_n "checking Oracle Instant Client SDK header directory""... $ac_c" 1>&6 +-echo "configure:63065: checking Oracle Instant Client SDK header directory" >&5 ++echo "configure:64042: checking Oracle Instant Client SDK header directory" >&5 + + OCISDKRPMINC=`echo "$PHP_OCI8_INSTANT_CLIENT" | $PHP_OCI8_SED -e 's!^/usr/lib/oracle/\(.*\)/client\('${PHP_OCI8_IC_LIBDIR_SUFFIX}'\)*/lib/*$!/usr/include/oracle/\1/client\2!'` + +@@ -63270,7 +64247,7 @@ + + + echo $ac_n "checking Oracle Instant Client version""... $ac_c" 1>&6 +-echo "configure:63274: checking Oracle Instant Client version" >&5 ++echo "configure:64251: checking Oracle Instant Client version" >&5 + if test -f $PHP_OCI8_INSTANT_CLIENT/libnnz11.$SHLIB_SUFFIX_NAME; then + if test -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME.11.1; then + if test ! -f $PHP_OCI8_INSTANT_CLIENT/libclntsh.$SHLIB_SUFFIX_NAME; then +@@ -63749,7 +64726,7 @@ + + if test "$PHP_ADABAS" != "no"; then + echo $ac_n "checking for Adabas support""... $ac_c" 1>&6 +-echo "configure:63753: checking for Adabas support" >&5 ++echo "configure:64730: checking for Adabas support" >&5 + if test "$PHP_ADABAS" = "yes"; then + PHP_ADABAS=/usr/local + fi +@@ -63952,7 +64929,7 @@ + + if test "$PHP_SAPDB" != "no"; then + echo $ac_n "checking for SAP DB support""... $ac_c" 1>&6 +-echo "configure:63956: checking for SAP DB support" >&5 ++echo "configure:64933: checking for SAP DB support" >&5 + if test "$PHP_SAPDB" = "yes"; then + PHP_SAPDB=/usr/local + fi +@@ -64085,7 +65062,7 @@ + + if test "$PHP_SOLID" != "no"; then + echo $ac_n "checking for Solid support""... $ac_c" 1>&6 +-echo "configure:64089: checking for Solid support" >&5 ++echo "configure:65066: checking for Solid support" >&5 + if test "$PHP_SOLID" = "yes"; then + PHP_SOLID=/usr/local/solid + fi +@@ -64112,7 +65089,7 @@ + echo "$ac_t""$ext_output" 1>&6 + + echo $ac_n "checking Solid library file""... $ac_c" 1>&6 +-echo "configure:64116: checking Solid library file" >&5 ++echo "configure:65093: 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 +@@ -64233,7 +65210,7 @@ + + if test "$PHP_IBM_DB2" != "no"; then + echo $ac_n "checking for IBM DB2 support""... $ac_c" 1>&6 +-echo "configure:64237: checking for IBM DB2 support" >&5 ++echo "configure:65214: checking for IBM DB2 support" >&5 + if test "$PHP_IBM_DB2" = "yes"; then + ODBC_INCDIR=/home/db2inst1/sqllib/include + ODBC_LIBDIR=/home/db2inst1/sqllib/lib +@@ -64264,7 +65241,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:65256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -64356,7 +65333,7 @@ + + if test "$PHP_ODBCROUTER" != "no"; then + echo $ac_n "checking for ODBCRouter.com support""... $ac_c" 1>&6 +-echo "configure:64360: checking for ODBCRouter.com support" >&5 ++echo "configure:65337: checking for ODBCRouter.com support" >&5 + if test "$PHP_ODBCROUTER" = "yes"; then + PHP_ODBCROUTER=/usr + fi +@@ -64420,7 +65397,7 @@ + + if test "$PHP_EMPRESS" != "no"; then + echo $ac_n "checking for Empress support""... $ac_c" 1>&6 +-echo "configure:64424: checking for Empress support" >&5 ++echo "configure:65401: checking for Empress support" >&5 + if test "$PHP_EMPRESS" = "yes"; then + ODBC_INCDIR=$EMPRESSPATH/include/odbc + ODBC_LIBDIR=$EMPRESSPATH/shlib +@@ -64438,7 +65415,7 @@ + echo "$ac_t""$ext_output" 1>&6 + + echo $ac_n "checking Empress library file""... $ac_c" 1>&6 +-echo "configure:64442: checking Empress library file" >&5 ++echo "configure:65419: checking Empress library file" >&5 + ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` + if test ! -f $ODBC_LIBS; then + ODBC_LIBS=`echo $ODBC_LIBDIR/libempodbccl.so | cut -d' ' -f1` +@@ -64494,7 +65471,7 @@ + + if test "$PHP_EMPRESS_BCS" != "no"; then + echo $ac_n "checking for Empress local access support""... $ac_c" 1>&6 +-echo "configure:64498: checking for Empress local access support" >&5 ++echo "configure:65475: checking for Empress local access support" >&5 + if test "$PHP_EMPRESS_BCS" = "yes"; then + ODBC_INCDIR=$EMPRESSPATH/include/odbc + ODBC_LIBDIR=$EMPRESSPATH/shlib +@@ -64528,7 +65505,7 @@ + echo "$ac_t""$ext_output" 1>&6 + + echo $ac_n "checking Empress local access library file""... $ac_c" 1>&6 +-echo "configure:64532: checking Empress local access library file" >&5 ++echo "configure:65509: checking Empress local access library file" >&5 + ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` + if test ! -f $ODBCBCS_LIBS; then + ODBCBCS_LIBS=`echo $ODBC_LIBDIR/libempodbcbcs.a | cut -d' ' -f1` +@@ -64584,7 +65561,7 @@ + + if test "$PHP_BIRDSTEP" != "no"; then + echo $ac_n "checking for Birdstep support""... $ac_c" 1>&6 +-echo "configure:64588: checking for Birdstep support" >&5 ++echo "configure:65565: checking for Birdstep support" >&5 + if test "$PHP_BIRDSTEP" = "yes"; then + ODBC_INCDIR=/usr/local/birdstep/include + ODBC_LIBDIR=/usr/local/birdstep/lib +@@ -64696,7 +65673,7 @@ + + if test "$PHP_CUSTOM_ODBC" != "no"; then + echo $ac_n "checking for a custom ODBC support""... $ac_c" 1>&6 +-echo "configure:64700: checking for a custom ODBC support" >&5 ++echo "configure:65677: checking for a custom ODBC support" >&5 + if test "$PHP_CUSTOM_ODBC" = "yes"; then + PHP_CUSTOM_ODBC=/usr/local + fi +@@ -64760,7 +65737,7 @@ + + if test "$PHP_IODBC" != "no"; then + echo $ac_n "checking for iODBC support""... $ac_c" 1>&6 +-echo "configure:64764: checking for iODBC support" >&5 ++echo "configure:65741: checking for iODBC support" >&5 + if test "$PHP_IODBC" = "yes"; then + PHP_IODBC=/usr/local + fi +@@ -64906,7 +65883,7 @@ + + if test "$PHP_ESOOB" != "no"; then + echo $ac_n "checking for Easysoft ODBC-ODBC Bridge support""... $ac_c" 1>&6 +-echo "configure:64910: checking for Easysoft ODBC-ODBC Bridge support" >&5 ++echo "configure:65887: checking for Easysoft ODBC-ODBC Bridge support" >&5 + if test "$PHP_ESOOB" = "yes"; then + PHP_ESOOB=/usr/local/easysoft/oob/client + fi +@@ -64970,7 +65947,7 @@ + + if test "$PHP_UNIXODBC" != "no"; then + echo $ac_n "checking for unixODBC support""... $ac_c" 1>&6 +-echo "configure:64974: checking for unixODBC support" >&5 ++echo "configure:65951: checking for unixODBC support" >&5 + if test "$PHP_UNIXODBC" = "yes"; then + PHP_UNIXODBC=/usr/local + fi +@@ -65039,7 +66016,7 @@ + + if test "$PHP_DBMAKER" != "no"; then + echo $ac_n "checking for DBMaker support""... $ac_c" 1>&6 +-echo "configure:65043: checking for DBMaker support" >&5 ++echo "configure:66020: checking for DBMaker support" >&5 + if test "$PHP_DBMAKER" = "yes"; then + # find dbmaker's home directory + DBMAKER_HOME=`grep "^dbmaker:" /etc/passwd | $AWK -F: '{print $6}'` +@@ -65601,7 +66578,7 @@ + php_enable_pcntl=no + + echo $ac_n "checking whether to enable pcntl support""... $ac_c" 1>&6 +-echo "configure:65605: checking whether to enable pcntl support" >&5 ++echo "configure:66582: checking whether to enable pcntl support" >&5 + # Check whether --enable-pcntl or --disable-pcntl was given. + if test "${enable_pcntl+set}" = set; then + enableval="$enable_pcntl" +@@ -65645,12 +66622,12 @@ + for ac_func in fork + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:65649: checking for $ac_func" >&5 ++echo "configure:66626: 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:66654: \"$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 +@@ -65704,12 +66681,12 @@ + for ac_func in waitpid + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:65708: checking for $ac_func" >&5 ++echo "configure:66685: 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:66713: \"$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 +@@ -65763,12 +66740,12 @@ + for ac_func in sigaction + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:65767: checking for $ac_func" >&5 ++echo "configure:66744: 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:66772: \"$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 +@@ -65822,12 +66799,12 @@ + for ac_func in getpriority setpriority wait3 sigprocmask sigwaitinfo sigtimedwait + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:65826: checking for $ac_func" >&5 ++echo "configure:66803: 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:66831: \"$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 +@@ -66175,7 +67152,7 @@ + php_enable_pdo=yes + + echo $ac_n "checking whether to enable PDO support""... $ac_c" 1>&6 +-echo "configure:66179: checking whether to enable PDO support" >&5 ++echo "configure:67156: checking whether to enable PDO support" >&5 + # Check whether --enable-pdo or --disable-pdo was given. + if test "${enable_pdo+set}" = set; then + enableval="$enable_pdo" +@@ -66609,7 +67586,7 @@ + php_with_pdo_dblib=no + + echo $ac_n "checking for PDO_DBLIB support via FreeTDS""... $ac_c" 1>&6 +-echo "configure:66613: checking for PDO_DBLIB support via FreeTDS" >&5 ++echo "configure:67590: checking for PDO_DBLIB support via FreeTDS" >&5 + # Check whether --with-pdo-dblib or --without-pdo-dblib was given. + if test "${with_pdo_dblib+set}" = set; then + withval="$with_pdo_dblib" +@@ -66826,13 +67803,13 @@ + + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:66830: checking for PDO includes" >&5 ++echo "configure:67807: checking for PDO includes" >&5 + if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:66836: checking for PDO includes" >&5 ++echo "configure:67813: checking for PDO includes" >&5 + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then +@@ -67146,7 +68123,7 @@ + fi --/* Whether you use GNU Pth */ --#undef GNUPTH -+/* */ -+#undef HAVE_SOCKET + echo $ac_n "checking for dnet_addr in -ldnet_stub""... $ac_c" 1>&6 +-echo "configure:67150: checking for dnet_addr in -ldnet_stub" >&5 ++echo "configure:68127: 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 +@@ -67154,7 +68131,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:68146: \"$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 +@@ -67326,7 +68303,7 @@ + php_with_pdo_firebird=no --/* Whether 3 arg set_rebind_proc() */ --#undef HAVE_3ARG_SETREBINDPROC -+/* */ -+#undef HAVE_LIBSOCKET + echo $ac_n "checking for Firebird support for PDO""... $ac_c" 1>&6 +-echo "configure:67330: checking for Firebird support for PDO" >&5 ++echo "configure:68307: checking for Firebird support for PDO" >&5 + # Check whether --with-pdo-firebird or --without-pdo-firebird was given. + if test "${with_pdo_firebird+set}" = set; then + withval="$with_pdo_firebird" +@@ -67480,7 +68457,7 @@ + done --/* Define to 1 if you have the `acosh' function. */ --#undef HAVE_ACOSH -+/* */ -+#undef HAVE_SOCKETPAIR + echo $ac_n "checking for isc_detach_database in -lfbclient""... $ac_c" 1>&6 +-echo "configure:67484: checking for isc_detach_database in -lfbclient" >&5 ++echo "configure:68461: checking for isc_detach_database in -lfbclient" >&5 + ac_lib_var=`echo fbclient'_'isc_detach_database | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -67488,7 +68465,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lfbclient $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:68480: \"$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 +@@ -67626,7 +68603,7 @@ + done + + echo $ac_n "checking for isc_detach_database in -lgds""... $ac_c" 1>&6 +-echo "configure:67630: checking for isc_detach_database in -lgds" >&5 ++echo "configure:68607: checking for isc_detach_database in -lgds" >&5 + ac_lib_var=`echo gds'_'isc_detach_database | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -67634,7 +68611,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lgds $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:68626: \"$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 +@@ -67772,7 +68749,7 @@ + done + + echo $ac_n "checking for isc_detach_database in -lib_util""... $ac_c" 1>&6 +-echo "configure:67776: checking for isc_detach_database in -lib_util" >&5 ++echo "configure:68753: checking for isc_detach_database in -lib_util" >&5 + ac_lib_var=`echo ib_util'_'isc_detach_database | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -67780,7 +68757,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lib_util $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:68772: \"$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 +@@ -67836,13 +68813,13 @@ + + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:67840: checking for PDO includes" >&5 ++echo "configure:68817: checking for PDO includes" >&5 + if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:67846: checking for PDO includes" >&5 ++echo "configure:68823: checking for PDO includes" >&5 + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then +@@ -68314,7 +69291,7 @@ + php_with_pdo_mysql=no + + echo $ac_n "checking for MySQL support for PDO""... $ac_c" 1>&6 +-echo "configure:68318: checking for MySQL support for PDO" >&5 ++echo "configure:69295: checking for MySQL support for PDO" >&5 + # Check whether --with-pdo-mysql or --without-pdo-mysql was given. + if test "${with_pdo_mysql+set}" = set; then + withval="$with_pdo_mysql" +@@ -68359,7 +69336,7 @@ + php_with_zlib_dir=no + + echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 +-echo "configure:68363: checking for the location of libz" >&5 ++echo "configure:69340: checking for the location of libz" >&5 + # Check whether --with-zlib-dir or --without-zlib-dir was given. + if test "${with_zlib_dir+set}" = set; then + withval="$with_zlib_dir" +@@ -68423,14 +69400,14 @@ + + + echo $ac_n "checking for mysql_config""... $ac_c" 1>&6 +-echo "configure:68427: checking for mysql_config" >&5 ++echo "configure:69404: checking for mysql_config" >&5 + if test -n "$PDO_MYSQL_CONFIG"; then + echo "$ac_t""$PDO_MYSQL_CONFIG" 1>&6 + if test "x$SED" = "x"; then + # Extract the first word of "sed", so it can be a program name with args. + set dummy sed; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:68434: checking for $ac_word" >&5 ++echo "configure:69411: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SED'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -68474,7 +69451,7 @@ + elif test -n "$PDO_MYSQL_DIR"; then + echo "$ac_t""not found" 1>&6 + echo $ac_n "checking for mysql install under $PDO_MYSQL_DIR""... $ac_c" 1>&6 +-echo "configure:68478: checking for mysql install under $PDO_MYSQL_DIR" >&5 ++echo "configure:69455: checking for mysql install under $PDO_MYSQL_DIR" >&5 + if test -r $PDO_MYSQL_DIR/include/mysql; then + PDO_MYSQL_INC_DIR=$PDO_MYSQL_DIR/include/mysql + else +@@ -68628,7 +69605,7 @@ + done + + echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 +-echo "configure:68632: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ++echo "configure:69609: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 + ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -68636,7 +69613,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:69628: \"$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 +@@ -69000,7 +69977,7 @@ + done + + echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 +-echo "configure:69004: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ++echo "configure:69981: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 + ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -69008,7 +69985,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:70000: \"$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 +@@ -69174,7 +70151,7 @@ + done + + echo $ac_n "checking for mysql_query in -l$PDO_MYSQL_LIBNAME""... $ac_c" 1>&6 +-echo "configure:69178: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 ++echo "configure:70155: checking for mysql_query in -l$PDO_MYSQL_LIBNAME" >&5 + ac_lib_var=`echo $PDO_MYSQL_LIBNAME'_'mysql_query | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -69182,7 +70159,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$PDO_MYSQL_LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:70174: \"$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 +@@ -69367,12 +70344,12 @@ + for ac_func in mysql_commit mysql_stmt_prepare mysql_next_result mysql_sqlstate + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:69371: checking for $ac_func" >&5 ++echo "configure:70348: 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:70376: \"$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 +@@ -69425,13 +70402,13 @@ + + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:69429: checking for PDO includes" >&5 ++echo "configure:70406: checking for PDO includes" >&5 + if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:69435: checking for PDO includes" >&5 ++echo "configure:70412: checking for PDO includes" >&5 + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then +@@ -69816,7 +70793,7 @@ + php_with_pdo_oci=no + + echo $ac_n "checking Oracle OCI support for PDO""... $ac_c" 1>&6 +-echo "configure:69820: checking Oracle OCI support for PDO" >&5 ++echo "configure:70797: checking Oracle OCI support for PDO" >&5 + # Check whether --with-pdo-oci or --without-pdo-oci was given. + if test "${with_pdo_oci+set}" = set; then + withval="$with_pdo_oci" +@@ -69863,7 +70840,7 @@ + fi + + echo $ac_n "checking Oracle Install-Dir""... $ac_c" 1>&6 +-echo "configure:69867: checking Oracle Install-Dir" >&5 ++echo "configure:70844: checking Oracle Install-Dir" >&5 + if test "$PHP_PDO_OCI" = "yes" || test -z "$PHP_PDO_OCI"; then + PDO_OCI_DIR=$ORACLE_HOME + else +@@ -69872,7 +70849,7 @@ + echo "$ac_t""$PHP_PDO_OCI" 1>&6 + + echo $ac_n "checking if that is sane""... $ac_c" 1>&6 +-echo "configure:69876: checking if that is sane" >&5 ++echo "configure:70853: checking if that is sane" >&5 + if test -z "$PDO_OCI_DIR"; then + { echo "configure: error: + You need to tell me where to find your Oracle Instant Client SDK, or set ORACLE_HOME. +@@ -69885,7 +70862,7 @@ + PDO_OCI_IC_PREFIX="`echo $PDO_OCI_DIR | cut -d, -f2`" + PDO_OCI_IC_VERS="`echo $PDO_OCI_DIR | cut -d, -f3`" + echo $ac_n "checking for oci.h""... $ac_c" 1>&6 +-echo "configure:69889: checking for oci.h" >&5 ++echo "configure:70866: checking for oci.h" >&5 + if test -f $PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client/oci.h ; then + + if test "$PDO_OCI_IC_PREFIX/include/oracle/$PDO_OCI_IC_VERS/client" != "/usr/include"; then +@@ -70034,7 +71011,7 @@ + else + + echo $ac_n "checking size of long int""... $ac_c" 1>&6 +-echo "configure:70038: checking size of long int" >&5 ++echo "configure:71015: checking size of long int" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_long_int'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -70042,18 +71019,19 @@ + ac_cv_sizeof_long_int=4 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long int)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:70057: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:71035: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_long_int=`cat conftestval` + else +@@ -70073,7 +71051,7 @@ + + + echo $ac_n "checking if we're on a 64-bit platform""... $ac_c" 1>&6 +-echo "configure:70077: checking if we're on a 64-bit platform" >&5 ++echo "configure:71055: checking if we're on a 64-bit platform" >&5 + if test "$ac_cv_sizeof_long_int" = "4" ; then + echo "$ac_t""no" 1>&6 + TMP_PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib32" +@@ -70083,7 +71061,7 @@ + fi + + echo $ac_n "checking OCI8 libraries dir""... $ac_c" 1>&6 +-echo "configure:70087: checking OCI8 libraries dir" >&5 ++echo "configure:71065: checking OCI8 libraries dir" >&5 + if test -d "$PDO_OCI_DIR/lib" && test ! -d "$PDO_OCI_DIR/lib32"; then + PDO_OCI_LIB_DIR="$PDO_OCI_DIR/lib" + elif test ! -d "$PDO_OCI_DIR/lib" && test -d "$PDO_OCI_DIR/lib32"; then +@@ -70450,7 +71428,7 @@ + fi + + echo $ac_n "checking Oracle version""... $ac_c" 1>&6 +-echo "configure:70454: checking Oracle version" >&5 ++echo "configure:71432: checking Oracle version" >&5 + for OCI_VER in $SUPPORTED_LIB_VERS; do + if test -f $PDO_OCI_DIR/lib/libclntsh.$SHLIB_SUFFIX_NAME.$OCI_VER; then + PDO_OCI_VERSION="$OCI_VER" +@@ -70632,7 +71610,7 @@ + done --/* */ --#undef HAVE_ADABAS -+/* */ -+#undef HAVE_SOCKETPAIR + echo $ac_n "checking for OCIEnvCreate in -lclntsh""... $ac_c" 1>&6 +-echo "configure:70636: checking for OCIEnvCreate in -lclntsh" >&5 ++echo "configure:71614: checking for OCIEnvCreate in -lclntsh" >&5 + ac_lib_var=`echo clntsh'_'OCIEnvCreate | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -70640,7 +71618,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lclntsh $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71633: \"$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 +@@ -70785,7 +71763,7 @@ + done --/* whether the compiler supports __alignof__ */ --#undef HAVE_ALIGNOF -+/* */ -+#undef HAVE_LIBSOCKET + echo $ac_n "checking for OCIEnvNlsCreate in -lclntsh""... $ac_c" 1>&6 +-echo "configure:70789: checking for OCIEnvNlsCreate in -lclntsh" >&5 ++echo "configure:71767: checking for OCIEnvNlsCreate in -lclntsh" >&5 + ac_lib_var=`echo clntsh'_'OCIEnvNlsCreate | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -70793,7 +71771,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lclntsh $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71786: \"$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 +@@ -70938,7 +71916,7 @@ + done --/* Define to 1 if you have `alloca', as a function or macro. */ --#undef HAVE_ALLOCA -+/* */ -+#undef HAVE_HTONL + echo $ac_n "checking for OCILobIsTemporary in -lclntsh""... $ac_c" 1>&6 +-echo "configure:70942: checking for OCILobIsTemporary in -lclntsh" >&5 ++echo "configure:71920: checking for OCILobIsTemporary in -lclntsh" >&5 + ac_lib_var=`echo clntsh'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -70946,7 +71924,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lclntsh $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:71939: \"$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 +@@ -71087,7 +72065,7 @@ + done --/* Define to 1 if you have and it should be used (not on Ultrix). -- */ --#undef HAVE_ALLOCA_H -+/* */ -+#undef HAVE_HTONL + echo $ac_n "checking for OCILobIsTemporary in -locijdbc8""... $ac_c" 1>&6 +-echo "configure:71091: checking for OCILobIsTemporary in -locijdbc8" >&5 ++echo "configure:72069: checking for OCILobIsTemporary in -locijdbc8" >&5 + ac_lib_var=`echo ocijdbc8'_'OCILobIsTemporary | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -71095,7 +72073,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-locijdbc8 $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:72088: \"$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 +@@ -71267,7 +72245,7 @@ + done --/* Define to 1 if you have the `alphasort' function. */ --#undef HAVE_ALPHASORT -+/* */ -+#undef HAVE_LIBSOCKET + echo $ac_n "checking for OCICollAssign in -lclntsh""... $ac_c" 1>&6 +-echo "configure:71271: checking for OCICollAssign in -lclntsh" >&5 ++echo "configure:72249: checking for OCICollAssign in -lclntsh" >&5 + ac_lib_var=`echo clntsh'_'OCICollAssign | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -71275,7 +72253,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lclntsh $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:72268: \"$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 +@@ -71420,7 +72398,7 @@ + done --/* Whether you have AOLserver */ --#undef HAVE_AOLSERVER -+/* */ -+#undef HAVE_GETHOSTNAME + echo $ac_n "checking for OCIStmtFetch2 in -lclntsh""... $ac_c" 1>&6 +-echo "configure:71424: checking for OCIStmtFetch2 in -lclntsh" >&5 ++echo "configure:72402: checking for OCIStmtFetch2 in -lclntsh" >&5 + ac_lib_var=`echo clntsh'_'OCIStmtFetch2 | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -71428,7 +72406,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lclntsh $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:72421: \"$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 +@@ -71478,13 +72456,13 @@ + + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:71482: checking for PDO includes" >&5 ++echo "configure:72460: checking for PDO includes" >&5 + if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:71488: checking for PDO includes" >&5 ++echo "configure:72466: checking for PDO includes" >&5 + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then +@@ -71852,7 +72830,7 @@ + php_with_pdo_odbc=no --/* */ --#undef HAVE_APACHE -+/* */ -+#undef HAVE_GETHOSTNAME + echo $ac_n "checking for ODBC v3 support for PDO""... $ac_c" 1>&6 +-echo "configure:71856: checking for ODBC v3 support for PDO" >&5 ++echo "configure:72834: checking for ODBC v3 support for PDO" >&5 + # Check whether --with-pdo-odbc or --without-pdo-odbc was given. + if test "${with_pdo_odbc+set}" = set; then + withval="$with_pdo_odbc" +@@ -71904,13 +72882,13 @@ + + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:71908: checking for PDO includes" >&5 ++echo "configure:72886: checking for PDO includes" >&5 + if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:71914: checking for PDO includes" >&5 ++echo "configure:72892: checking for PDO includes" >&5 + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then +@@ -71931,7 +72909,7 @@ + --/* */ --#undef HAVE_APACHE_HOOKS -+/* */ -+#undef HAVE_LIBNSL + echo $ac_n "checking for selected PDO ODBC flavour""... $ac_c" 1>&6 +-echo "configure:71935: checking for selected PDO ODBC flavour" >&5 ++echo "configure:72913: checking for selected PDO ODBC flavour" >&5 --/* Define to 1 if you have the -- header file. */ --#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H -+/* */ -+#undef HAVE_GETHOSTBYADDR + pdo_odbc_flavour="`echo $PHP_PDO_ODBC | cut -d, -f1`" + pdo_odbc_dir="`echo $PHP_PDO_ODBC | cut -d, -f2`" +@@ -72010,7 +72988,7 @@ --/* */ --#undef HAVE_AP_COMPAT_H -+/* */ -+#undef HAVE_GETHOSTBYADDR + + echo $ac_n "checking for odbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72014: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:72992: checking for odbc.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/odbc.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72024,7 +73002,7 @@ --/* */ --#undef HAVE_AP_CONFIG_H -+/* */ -+#undef HAVE_LIBNSL + + echo $ac_n "checking for odbcsdk.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72028: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73006: checking for odbcsdk.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/odbcsdk.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72038,7 +73016,7 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_ARPA_INET_H -+/* */ -+#undef HAVE_YP_GET_DEFAULT_DOMAIN + + echo $ac_n "checking for iodbc.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72042: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73020: checking for iodbc.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/iodbc.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72052,7 +73030,7 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_ARPA_NAMESER_H -+/* */ -+#undef HAVE_YP_GET_DEFAULT_DOMAIN + + echo $ac_n "checking for sqlunix.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72056: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73034: checking for sqlunix.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/sqlunix.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72066,7 +73044,7 @@ --/* Define to 1 if you have the `asctime_r' function. */ --#undef HAVE_ASCTIME_R -+/* */ -+#undef HAVE_LIBNSL + + echo $ac_n "checking for sqltypes.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72070: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73048: checking for sqltypes.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/sqltypes.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72080,7 +73058,7 @@ --/* Define to 1 if you have the `asinh' function. */ --#undef HAVE_ASINH -+/* */ -+#undef HAVE_DLOPEN + + echo $ac_n "checking for sqlucode.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72084: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73062: checking for sqlucode.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/sqlucode.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72094,7 +73072,7 @@ --/* Define to 1 if you have the `asprintf' function. */ --#undef HAVE_ASPRINTF -+/* */ -+#undef HAVE_DLOPEN + + echo $ac_n "checking for sql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72098: checking for sql.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73076: checking for sql.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/sql.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72108,7 +73086,7 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_ASSERT_H -+/* */ -+#undef HAVE_LIBDL + + echo $ac_n "checking for isql.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72112: checking for isql.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73090: checking for isql.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/isql.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72122,7 +73100,7 @@ --/* Define to 1 if you have the `atanh' function. */ --#undef HAVE_ATANH -+/* */ -+#undef HAVE_LIBDL + + echo $ac_n "checking for sqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72126: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73104: checking for sqlext.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/sqlext.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72136,7 +73114,7 @@ --/* whether atof() accepts INF */ --#undef HAVE_ATOF_ACCEPTS_INF -+/* */ -+#undef HAVE_INET_ATON + + echo $ac_n "checking for isqlext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72140: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73118: checking for isqlext.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/isqlext.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72150,7 +73128,7 @@ --/* whether atof() accepts NAN */ --#undef HAVE_ATOF_ACCEPTS_NAN -+/* */ -+#undef HAVE_INET_ATON + + echo $ac_n "checking for udbcext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72154: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73132: checking for udbcext.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/udbcext.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72164,7 +73142,7 @@ --/* Define to 1 if you have the `atoll' function. */ --#undef HAVE_ATOLL -+/* */ -+#undef HAVE_LIBRESOLV + + echo $ac_n "checking for sqlcli1.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72168: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73146: checking for sqlcli1.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/sqlcli1.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72178,7 +73156,7 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_ATOMIC_H -+/* */ -+#undef HAVE_INET_ATON + + echo $ac_n "checking for LibraryManager.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72182: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73160: checking for LibraryManager.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/LibraryManager.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72192,7 +73170,7 @@ --/* whether the compiler supports __attribute__ ((__aligned__)) */ --#undef HAVE_ATTRIBUTE_ALIGNED -+/* */ -+#undef HAVE_LIBBIND + + echo $ac_n "checking for cli0core.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72196: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73174: checking for cli0core.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/cli0core.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72206,7 +73184,7 @@ --/* Whether you have bcmath */ --#undef HAVE_BCMATH -+/* */ -+#undef HAVE_FOPENCOOKIE + + echo $ac_n "checking for cli0ext.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72210: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73188: checking for cli0ext.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/cli0ext.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72220,7 +73198,7 @@ --/* */ --#undef HAVE_BIND_TEXTDOMAIN_CODESET -+/* */ -+#undef COOKIE_IO_FUNCTIONS_T + + echo $ac_n "checking for cli0cli.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72224: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73202: checking for cli0cli.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/cli0cli.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72234,7 +73212,7 @@ --/* */ --#undef HAVE_BIRDSTEP -+/* */ -+#undef COOKIE_SEEKER_USES_OFF64_T - - /* Define if system has broken getcwd */ - #undef HAVE_BROKEN_GETCWD -@@ -475,1975 +1145,1977 @@ - /* Define if your glibc borks on fopen with mode a+ */ - #undef HAVE_BROKEN_GLIBC_FOPEN_APPEND - --/* Whether we have librecode 3.5 */ --#undef HAVE_BROKEN_RECODE -+/* Whether localtime_r is declared */ -+#undef MISSING_LOCALTIME_R_DECL - --/* Konstantin Chuguev's iconv implementation */ --#undef HAVE_BSD_ICONV -+/* Whether gmtime_r is declared */ -+#undef MISSING_GMTIME_R_DECL - --/* */ --#undef HAVE_BUILD_DEFS_H -+/* Whether asctime_r is declared */ -+#undef MISSING_ASCTIME_R_DECL - --/* Define to 1 if gcc supports __sync_bool_compare_and_swap() a.o. */ --#undef HAVE_BUILTIN_ATOMIC -+/* Whether ctime_r is declared */ -+#undef MISSING_CTIME_R_DECL - --/* */ --#undef HAVE_BUNDLED_PCRE -+/* Whether strtok_r is declared */ -+#undef MISSING_STRTOK_R_DECL - --/* */ --#undef HAVE_BZ2 -+/* */ -+#undef MISSING_FCLOSE_DECL + + echo $ac_n "checking for cli0defs.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72238: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73216: checking for cli0defs.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/cli0defs.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72248,7 +73226,7 @@ --/* */ --#undef HAVE_CALENDAR -+/* */ -+#undef MISSING_FCLOSE_DECL - --/* Whether to compile with Caudium support */ --#undef HAVE_CAUDIUM -+/* whether you have tm_gmtoff in struct tm */ -+#undef HAVE_TM_GMTOFF - --/* Define to 1 if you have the `chroot' function. */ --#undef HAVE_CHROOT -+/* whether you have struct flock */ -+#undef HAVE_STRUCT_FLOCK - --/* Define to 1 if you have the `clearenv' function. */ --#undef HAVE_CLEARENV -+/* Whether you have socklen_t */ -+#undef HAVE_SOCKLEN_T - --/* */ --#undef HAVE_CLI0CLI_H -+/* Size of intmax_t */ -+#undef SIZEOF_INTMAX_T - --/* */ --#undef HAVE_CLI0CORE_H -+/* Whether intmax_t is available */ -+#undef HAVE_INTMAX_T - --/* */ --#undef HAVE_CLI0DEFS_H -+/* Size of ssize_t */ -+#undef SIZEOF_SSIZE_T - --/* */ --#undef HAVE_CLI0ENV_H -+/* Whether ssize_t is available */ -+#undef HAVE_SSIZE_T - --/* */ --#undef HAVE_CLI0EXT_H -+/* Size of ptrdiff_t */ -+#undef SIZEOF_PTRDIFF_T - --/* do we have clock_gettime? */ --#undef HAVE_CLOCK_GETTIME -+/* Whether ptrdiff_t is available */ -+#undef HAVE_PTRDIFF_T - --/* do we have clock_get_time? */ --#undef HAVE_CLOCK_GET_TIME -+/* Whether you have struct sockaddr_storage */ -+#undef HAVE_SOCKADDR_STORAGE - --/* Whether you have struct cmsghdr */ --#undef HAVE_CMSGHDR -+/* Whether struct sockaddr has field sa_len */ -+#undef HAVE_SOCKADDR_SA_LEN - --/* */ --#undef HAVE_CODBC -+/* */ -+#undef HAVE_NANOSLEEP + + echo $ac_n "checking for cli0env.h in $PDO_ODBC_INCDIR""... $ac_c" 1>&6 +-echo "configure:72252: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 ++echo "configure:73230: checking for cli0env.h in $PDO_ODBC_INCDIR" >&5 + if test -f "$PDO_ODBC_INCDIR/cli0env.h"; then + php_pdo_have_header=yes + cat >> confdefs.h <<\EOF +@@ -72454,7 +73432,7 @@ + done --/* */ --#undef HAVE_COLORCLOSESTHWB -+/* */ -+#undef HAVE_LIBRT - --/* Whether you have a Continuity Server */ --#undef HAVE_CONTINUITY -+/* Define if you have the getaddrinfo function */ -+#undef HAVE_GETADDRINFO - --/* Define to 1 if you have the `CreateProcess' function. */ --#undef HAVE_CREATEPROCESS -+/* Define if you have the __sync_fetch_and_add function */ -+#undef HAVE_SYNC_FETCH_AND_ADD - --/* */ --#undef HAVE_CRYPT -+/* Whether system headers declare timezone */ -+#undef HAVE_DECLARED_TIMEZONE - --/* Define to 1 if you have the header file. */ --#undef HAVE_CRYPT_H -+/* Whether you have HP-UX 10.x */ -+#undef PHP_HPUX_TIME_R - --/* Define to 1 if you have the `crypt_r' function. */ --#undef HAVE_CRYPT_R -+/* Whether you have IRIX-style functions */ -+#undef PHP_IRIX_TIME_R - --/* Define to 1 if you have the `ctermid' function. */ --#undef HAVE_CTERMID -+/* whether you have POSIX readdir_r */ -+#undef HAVE_POSIX_READDIR_R - --/* Define to 1 if you have the `ctime_r' function. */ --#undef HAVE_CTIME_R -+/* whether you have old-style readdir_r */ -+#undef HAVE_OLD_READDIR_R - --/* */ --#undef HAVE_CTYPE -+/* */ -+#undef in_addr_t - --/* */ --#undef HAVE_CURL -+/* Define if crypt_r has uses CRYPTD */ -+#undef CRYPT_R_CRYPTD - --/* */ --#undef HAVE_CURL_EASY_STRERROR -+/* Define if crypt_r uses struct crypt_data */ -+#undef CRYPT_R_STRUCT_CRYPT_DATA - --/* Have cURL with GnuTLS support */ --#undef HAVE_CURL_GNUTLS -+/* Define if struct crypt_data requires _GNU_SOURCE */ -+#undef CRYPT_R_GNU_SOURCE - --/* */ --#undef HAVE_CURL_MULTI_STRERROR -+/* Whether you have gcov */ -+#undef HAVE_GCOV - --/* Have cURL with OpenSSL support */ --#undef HAVE_CURL_OPENSSL -+/* */ -+#undef PHP_SAFE_MODE + echo $ac_n "checking for SQLBindCol in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 +-echo "configure:72458: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 ++echo "configure:73436: checking for SQLBindCol in -l$pdo_odbc_def_lib" >&5 + ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLBindCol | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -72462,7 +73440,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$pdo_odbc_def_lib $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73455: \"$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 +@@ -72588,7 +73566,7 @@ + done --/* Have cURL with SSL support */ --#undef HAVE_CURL_SSL -+/* */ -+#undef PHP_SAFE_MODE + echo $ac_n "checking for SQLAllocHandle in -l$pdo_odbc_def_lib""... $ac_c" 1>&6 +-echo "configure:72592: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 ++echo "configure:73570: checking for SQLAllocHandle in -l$pdo_odbc_def_lib" >&5 + ac_lib_var=`echo $pdo_odbc_def_lib'_'SQLAllocHandle | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -72596,7 +73574,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$pdo_odbc_def_lib $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:73589: \"$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 +@@ -72981,7 +73959,7 @@ + php_with_pdo_pgsql=no --/* */ --#undef HAVE_CURL_VERSION_INFO -+/* */ -+#undef PHP_SAFE_MODE_EXEC_DIR + echo $ac_n "checking for PostgreSQL support for PDO""... $ac_c" 1>&6 +-echo "configure:72985: checking for PostgreSQL support for PDO" >&5 ++echo "configure:73963: checking for PostgreSQL support for PDO" >&5 + # Check whether --with-pdo-pgsql or --without-pdo-pgsql was given. + if test "${with_pdo_pgsql+set}" = set; then + withval="$with_pdo_pgsql" +@@ -73040,7 +74018,7 @@ --/* Define to 1 if you have the `cuserid' function. */ --#undef HAVE_CUSERID -+/* */ -+#undef PHP_SAFE_MODE_EXEC_DIR -+ -+/* */ -+#undef PHP_SIGCHILD -+ -+/* */ -+#undef PHP_SIGCHILD -+ -+/* */ -+#undef MAGIC_QUOTES -+ -+/* */ -+#undef MAGIC_QUOTES --/* */ --#undef HAVE_DBA -+/* */ -+#undef DEFAULT_SHORT_OPEN_TAG + echo $ac_n "checking for pg_config""... $ac_c" 1>&6 +-echo "configure:73044: checking for pg_config" >&5 ++echo "configure:74022: checking for pg_config" >&5 + for i in $PHP_PDO_PGSQL $PHP_PDO_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do + if test -x $i/pg_config; then + PG_CONFIG="$i/pg_config" +@@ -73104,13 +74082,13 @@ --/* Whether you want DBMaker */ --#undef HAVE_DBMAKER -+/* */ -+#undef DEFAULT_SHORT_OPEN_TAG - --/* */ --#undef HAVE_DCNGETTEXT -+/* Whether you have dmalloc */ -+#undef HAVE_DMALLOC - --/* Whether system headers declare timezone */ --#undef HAVE_DECLARED_TIMEZONE -+/* Whether to enable IPv6 support */ -+#undef HAVE_IPV6 - --/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't. -- */ --#undef HAVE_DECL_TZNAME -+/* Define if int32_t type is present. */ -+#undef HAVE_INT32_T - --/* Define to 1 if you have the header file. */ --#undef HAVE_DEFAULT_STORE_H -+/* Define if uint32_t type is present. */ -+#undef HAVE_UINT32_T - --/* do we have /dev/poll? */ --#undef HAVE_DEVPOLL -+/* Define if system timezone data is used */ -+#undef HAVE_SYSTEM_TZDATA - --/* Define if the target system has /dev/urandom device */ --#undef HAVE_DEV_URANDOM -+/* Define for location of system timezone data */ -+#undef HAVE_SYSTEM_TZDATA_PREFIX - --/* Define to 1 if you have the header file. */ --#undef HAVE_DIRENT_H -+/* Whether to build date as dynamic module */ -+#undef COMPILE_DL_DATE - --/* Define to 1 if you have the header file. */ --#undef HAVE_DLFCN_H -+/* Whether to build ereg as dynamic module */ -+#undef COMPILE_DL_EREG - --/* */ --#undef HAVE_DLOPEN -+/* */ -+#undef HAVE_REGEX_T_RE_MAGIC --/* Whether you have dmalloc */ --#undef HAVE_DMALLOC -+/* */ -+#undef HSREGEX + echo $ac_n "checking for openssl dependencies""... $ac_c" 1>&6 +-echo "configure:73108: checking for openssl dependencies" >&5 ++echo "configure:74086: checking for openssl dependencies" >&5 + if grep -q openssl $PGSQL_INCLUDE/libpq-fe.h ; then + echo "$ac_t""yes" 1>&6 + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:73114: checking for $ac_word" >&5 ++echo "configure:74092: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -73154,7 +74132,7 @@ + old_LDFLAGS=$LDFLAGS + LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" + echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 +-echo "configure:73158: checking for PQparameterStatus in -lpq" >&5 ++echo "configure:74136: checking for PQparameterStatus in -lpq" >&5 + ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -73162,7 +74140,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:74155: \"$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 +@@ -73202,7 +74180,7 @@ --/* */ --#undef HAVE_DNGETTEXT -+/* */ -+#undef REGEX --/* Define to 1 if you have the header file. */ --#undef HAVE_DNS_H -+/* */ -+#undef REGEX + echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 +-echo "configure:73206: checking for PQprepare in -lpq" >&5 ++echo "configure:74184: checking for PQprepare in -lpq" >&5 + ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -73210,7 +74188,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:74203: \"$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 +@@ -73245,7 +74223,7 @@ + fi --/* */ --#undef HAVE_DNS_SEARCH -+/* 1 */ -+#undef HAVE_REGEX_T_RE_MAGIC + echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 +-echo "configure:73249: checking for PQescapeStringConn in -lpq" >&5 ++echo "configure:74227: checking for PQescapeStringConn in -lpq" >&5 + ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -73253,7 +74231,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:74246: \"$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 +@@ -73288,7 +74266,7 @@ + fi --/* */ --#undef HAVE_DN_EXPAND -+/* */ -+#undef HAVE_LIBXML + echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 +-echo "configure:73292: checking for PQescapeByteaConn in -lpq" >&5 ++echo "configure:74270: checking for PQescapeByteaConn in -lpq" >&5 + ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -73296,7 +74274,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:74289: \"$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 +@@ -73332,7 +74310,7 @@ --/* */ --#undef HAVE_DN_SKIPNAME -+/* */ -+#undef HAVE_LIBXML --/* */ --#undef HAVE_DOM -+/* Whether to build libxml as dynamic module */ -+#undef COMPILE_DL_LIBXML + echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 +-echo "configure:73336: checking for pg_encoding_to_char in -lpq" >&5 ++echo "configure:74314: 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 +@@ -73340,7 +74318,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:74333: \"$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 +@@ -73515,13 +74493,13 @@ + + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:73519: checking for PDO includes" >&5 ++echo "configure:74497: checking for PDO includes" >&5 + if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:73525: checking for PDO includes" >&5 ++echo "configure:74503: checking for PDO includes" >&5 + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then +@@ -73861,7 +74839,7 @@ + php_with_pdo_sqlite=$PHP_PDO --/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ --#undef HAVE_DOPRNT -+/* Whether to build openssl as dynamic module */ -+#undef COMPILE_DL_OPENSSL + echo $ac_n "checking for sqlite 3 support for PDO""... $ac_c" 1>&6 +-echo "configure:73865: checking for sqlite 3 support for PDO" >&5 ++echo "configure:74843: checking for sqlite 3 support for PDO" >&5 + # Check whether --with-pdo-sqlite or --without-pdo-sqlite was given. + if test "${with_pdo_sqlite+set}" = set; then + withval="$with_pdo_sqlite" +@@ -73910,13 +74888,13 @@ + + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:73914: checking for PDO includes" >&5 ++echo "configure:74892: checking for PDO includes" >&5 + if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:73920: checking for PDO includes" >&5 ++echo "configure:74898: checking for PDO includes" >&5 + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then +@@ -73945,7 +74923,7 @@ + PDO_SQLITE_DIR=$PHP_PDO_SQLITE + else # search default path list + echo $ac_n "checking for sqlite3 files in default path""... $ac_c" 1>&6 +-echo "configure:73949: checking for sqlite3 files in default path" >&5 ++echo "configure:74927: checking for sqlite3 files in default path" >&5 + for i in $SEARCH_PATH ; do + if test -r $i/$SEARCH_FOR; then + PDO_SQLITE_DIR=$i +@@ -74091,7 +75069,7 @@ + done - /* OpenSSL 0.9.7 or later */ - #undef HAVE_DSA_DEFAULT_METHOD + echo $ac_n "checking for $LIBSYMBOL in -l$LIBNAME""... $ac_c" 1>&6 +-echo "configure:74095: checking for $LIBSYMBOL in -l$LIBNAME" >&5 ++echo "configure:75073: checking for $LIBSYMBOL in -l$LIBNAME" >&5 + ac_lib_var=`echo $LIBNAME'_'$LIBSYMBOL | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -74099,7 +75077,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75092: \"$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 +@@ -74340,7 +75318,7 @@ + done --/* embedded MySQL support enabled */ --#undef HAVE_EMBEDDED_MYSQLI -+/* OpenSSL 0.9.7 or later */ -+#undef HAVE_DSA_DEFAULT_METHOD + echo $ac_n "checking for sqlite3_key in -lsqlite3""... $ac_c" 1>&6 +-echo "configure:74344: checking for sqlite3_key in -lsqlite3" >&5 ++echo "configure:75322: checking for sqlite3_key in -lsqlite3" >&5 + ac_lib_var=`echo sqlite3'_'sqlite3_key | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -74348,7 +75326,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsqlite3 $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:75341: \"$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 +@@ -75100,12 +76078,12 @@ + for ac_func in usleep nanosleep + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:75104: checking for $ac_func" >&5 ++echo "configure:76082: 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:76110: \"$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 +@@ -75156,17 +76134,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:75160: checking for $ac_hdr" >&5 ++echo "configure:76138: 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:75170: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:76148: \"$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* +@@ -75290,7 +76268,7 @@ + done --/* */ --#undef HAVE_ENCHANT -+/* */ -+#undef HAVE_PCRE + echo $ac_n "checking for fdatasync in -lrt""... $ac_c" 1>&6 +-echo "configure:75294: checking for fdatasync in -lrt" >&5 ++echo "configure:76272: checking for fdatasync in -lrt" >&5 + ac_lib_var=`echo rt'_'fdatasync | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75298,7 +76276,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lrt $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:76291: \"$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 +@@ -75390,7 +76368,7 @@ + php_with_pgsql=no --/* */ --#undef HAVE_ENCHANT_BROKER_SET_PARAM -+/* Whether to build pcre as dynamic module */ -+#undef COMPILE_DL_PCRE + echo $ac_n "checking for PostgreSQL support""... $ac_c" 1>&6 +-echo "configure:75394: checking for PostgreSQL support" >&5 ++echo "configure:76372: checking for PostgreSQL support" >&5 + # Check whether --with-pgsql or --without-pgsql was given. + if test "${with_pgsql+set}" = set; then + withval="$with_pgsql" +@@ -75444,7 +76422,7 @@ --/* do we have epoll? */ --#undef HAVE_EPOLL -+/* Whether to build pcre as dynamic module */ -+#undef COMPILE_DL_PCRE --/* Define to 1 if you have the header file. */ --#undef HAVE_ERRNO_H -+/* */ -+#undef HAVE_BUNDLED_PCRE + echo $ac_n "checking for pg_config""... $ac_c" 1>&6 +-echo "configure:75448: checking for pg_config" >&5 ++echo "configure:76426: checking for pg_config" >&5 + for i in $PHP_PGSQL $PHP_PGSQL/bin /usr/local/pgsql/bin /usr/local/bin /usr/bin ""; do + if test -x $i/pg_config; then + PG_CONFIG="$i/pg_config" +@@ -75512,7 +76490,7 @@ + old_LDFLAGS=$LDFLAGS + LDFLAGS="-L$PGSQL_LIBDIR $LDFLAGS" + echo $ac_n "checking for PQescapeString in -lpq""... $ac_c" 1>&6 +-echo "configure:75516: checking for PQescapeString in -lpq" >&5 ++echo "configure:76494: checking for PQescapeString in -lpq" >&5 + ac_lib_var=`echo pq'_'PQescapeString | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75520,7 +76498,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:76513: \"$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 +@@ -75555,7 +76533,7 @@ + fi --/* */ --#undef HAVE_ESOOB -+/* have commercial sqlite3 with crypto support */ -+#undef HAVE_SQLITE3_KEY + echo $ac_n "checking for PQunescapeBytea in -lpq""... $ac_c" 1>&6 +-echo "configure:75559: checking for PQunescapeBytea in -lpq" >&5 ++echo "configure:76537: checking for PQunescapeBytea in -lpq" >&5 + ac_lib_var=`echo pq'_'PQunescapeBytea | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75563,7 +76541,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:76556: \"$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 +@@ -75598,7 +76576,7 @@ + fi --/* Whether you want EXIF (metadata from images) support */ --#undef HAVE_EXIF -+/* have sqlite3 with extension support */ -+#undef SQLITE_OMIT_LOAD_EXTENSION + echo $ac_n "checking for PQsetnonblocking in -lpq""... $ac_c" 1>&6 +-echo "configure:75602: checking for PQsetnonblocking in -lpq" >&5 ++echo "configure:76580: checking for PQsetnonblocking in -lpq" >&5 + ac_lib_var=`echo pq'_'PQsetnonblocking | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75606,7 +76584,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:76599: \"$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 +@@ -75641,7 +76619,7 @@ + fi --/* Define to 1 if you have the `fabsf' function. */ --#undef HAVE_FABSF -+/* */ -+#undef HAVE_SQLITE3 + echo $ac_n "checking for PQcmdTuples in -lpq""... $ac_c" 1>&6 +-echo "configure:75645: checking for PQcmdTuples in -lpq" >&5 ++echo "configure:76623: 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 +@@ -75649,7 +76627,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:76642: \"$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 +@@ -75684,7 +76662,7 @@ + fi --/* Define to 1 if you have the header file. */ --#undef HAVE_FCNTL_H -+/* Whether to build sqlite3 as dynamic module */ -+#undef COMPILE_DL_SQLITE3 + echo $ac_n "checking for PQoidValue in -lpq""... $ac_c" 1>&6 +-echo "configure:75688: checking for PQoidValue in -lpq" >&5 ++echo "configure:76666: 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 +@@ -75692,7 +76670,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:76685: \"$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 +@@ -75727,7 +76705,7 @@ + fi --/* Define to 1 if you have the `finite' function. */ --#undef HAVE_FINITE -+/* Whether to build zlib as dynamic module */ -+#undef COMPILE_DL_ZLIB + echo $ac_n "checking for PQclientEncoding in -lpq""... $ac_c" 1>&6 +-echo "configure:75731: checking for PQclientEncoding in -lpq" >&5 ++echo "configure:76709: 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 +@@ -75735,7 +76713,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:76728: \"$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 +@@ -75770,7 +76748,7 @@ + fi --/* Define to 1 if you have the `flock' function. */ --#undef HAVE_FLOCK -+/* */ -+#undef HAVE_ZLIB + echo $ac_n "checking for PQparameterStatus in -lpq""... $ac_c" 1>&6 +-echo "configure:75774: checking for PQparameterStatus in -lpq" >&5 ++echo "configure:76752: checking for PQparameterStatus in -lpq" >&5 + ac_lib_var=`echo pq'_'PQparameterStatus | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75778,7 +76756,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:76771: \"$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 +@@ -75813,7 +76791,7 @@ + fi --/* Define to 1 if you have the `floorf' function. */ --#undef HAVE_FLOORF -+/* */ -+#undef APC_MMAP + echo $ac_n "checking for PQprotocolVersion in -lpq""... $ac_c" 1>&6 +-echo "configure:75817: checking for PQprotocolVersion in -lpq" >&5 ++echo "configure:76795: checking for PQprotocolVersion in -lpq" >&5 + ac_lib_var=`echo pq'_'PQprotocolVersion | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75821,7 +76799,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:76814: \"$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 +@@ -75856,7 +76834,7 @@ + fi --/* Define if flush should be called explicitly after a buffered io. */ --#undef HAVE_FLUSHIO -+/* */ -+#undef APC_FILEHITS + echo $ac_n "checking for PQtransactionStatus in -lpq""... $ac_c" 1>&6 +-echo "configure:75860: checking for PQtransactionStatus in -lpq" >&5 ++echo "configure:76838: checking for PQtransactionStatus in -lpq" >&5 + ac_lib_var=`echo pq'_'PQtransactionStatus | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75864,7 +76842,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:76857: \"$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 +@@ -75899,7 +76877,7 @@ + fi --/* Define to 1 if your system has a working POSIX `fnmatch' function. */ --#undef HAVE_FNMATCH -+/* */ -+#undef __DEBUG_APC__ + echo $ac_n "checking for PQexecParams in -lpq""... $ac_c" 1>&6 +-echo "configure:75903: checking for PQexecParams in -lpq" >&5 ++echo "configure:76881: checking for PQexecParams in -lpq" >&5 + ac_lib_var=`echo pq'_'PQexecParams | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75907,7 +76885,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:76900: \"$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 +@@ -75942,7 +76920,7 @@ + fi --/* */ --#undef HAVE_FOPENCOOKIE -+/* */ -+#undef APC_SEM_LOCKS + echo $ac_n "checking for PQprepare in -lpq""... $ac_c" 1>&6 +-echo "configure:75946: checking for PQprepare in -lpq" >&5 ++echo "configure:76924: checking for PQprepare in -lpq" >&5 + ac_lib_var=`echo pq'_'PQprepare | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75950,7 +76928,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:76943: \"$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 +@@ -75985,7 +76963,7 @@ + fi --/* Define to 1 if you have the `fork' function. */ --#undef HAVE_FORK -+/* */ -+#undef APC_SPIN_LOCKS + echo $ac_n "checking for PQexecPrepared in -lpq""... $ac_c" 1>&6 +-echo "configure:75989: checking for PQexecPrepared in -lpq" >&5 ++echo "configure:76967: checking for PQexecPrepared in -lpq" >&5 + ac_lib_var=`echo pq'_'PQexecPrepared | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -75993,7 +76971,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:76986: \"$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 +@@ -76028,7 +77006,7 @@ + fi --/* Define to 1 if you have the `fpclass' function. */ --#undef HAVE_FPCLASS -+/* */ -+#undef APC_PTHREADMUTEX_LOCKS + echo $ac_n "checking for PQresultErrorField in -lpq""... $ac_c" 1>&6 +-echo "configure:76032: checking for PQresultErrorField in -lpq" >&5 ++echo "configure:77010: checking for PQresultErrorField in -lpq" >&5 + ac_lib_var=`echo pq'_'PQresultErrorField | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76036,7 +77014,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:77029: \"$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 +@@ -76071,7 +77049,7 @@ + fi --/* whether fpsetprec is present and usable */ --#undef HAVE_FPSETPREC -+/* */ -+#undef APC_FCNTL_LOCKS + echo $ac_n "checking for PQsendQueryParams in -lpq""... $ac_c" 1>&6 +-echo "configure:76075: checking for PQsendQueryParams in -lpq" >&5 ++echo "configure:77053: checking for PQsendQueryParams in -lpq" >&5 + ac_lib_var=`echo pq'_'PQsendQueryParams | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76079,7 +77057,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:77072: \"$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 +@@ -76114,7 +77092,7 @@ + fi --/* whether FPU control word can be manipulated by inline assembler */ --#undef HAVE_FPU_INLINE_ASM_X86 -+/* shm/mmap memory protection */ -+#undef APC_MEMPROTECT + echo $ac_n "checking for PQsendPrepare in -lpq""... $ac_c" 1>&6 +-echo "configure:76118: checking for PQsendPrepare in -lpq" >&5 ++echo "configure:77096: checking for PQsendPrepare in -lpq" >&5 + ac_lib_var=`echo pq'_'PQsendPrepare | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76122,7 +77100,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:77115: \"$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 +@@ -76157,7 +77135,7 @@ + fi --/* whether floatingpoint.h defines fp_except */ --#undef HAVE_FP_EXCEPT -+/* */ -+#undef APC_HAVE_LOOKUP_HOOKS + echo $ac_n "checking for PQsendQueryPrepared in -lpq""... $ac_c" 1>&6 +-echo "configure:76161: checking for PQsendQueryPrepared in -lpq" >&5 ++echo "configure:77139: checking for PQsendQueryPrepared in -lpq" >&5 + ac_lib_var=`echo pq'_'PQsendQueryPrepared | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76165,7 +77143,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:77158: \"$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 +@@ -76200,7 +77178,7 @@ + fi --/* */ --#undef HAVE_FREETDS -+/* */ -+#undef APC_HAVE_LOOKUP_HOOKS + echo $ac_n "checking for PQputCopyData in -lpq""... $ac_c" 1>&6 +-echo "configure:76204: checking for PQputCopyData in -lpq" >&5 ++echo "configure:77182: checking for PQputCopyData in -lpq" >&5 + ac_lib_var=`echo pq'_'PQputCopyData | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76208,7 +77186,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:77201: \"$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 +@@ -76243,7 +77221,7 @@ + fi --/* Define to 1 if you have the `ftok' function. */ --#undef HAVE_FTOK -+/* */ -+#undef HAVE_SEMUN + echo $ac_n "checking for PQputCopyEnd in -lpq""... $ac_c" 1>&6 +-echo "configure:76247: checking for PQputCopyEnd in -lpq" >&5 ++echo "configure:77225: checking for PQputCopyEnd in -lpq" >&5 + ac_lib_var=`echo pq'_'PQputCopyEnd | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76251,7 +77229,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:77244: \"$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 +@@ -76286,7 +77264,7 @@ + fi --/* Whether you want FTP support */ --#undef HAVE_FTP -+/* */ -+#undef HAVE_SEMUN + echo $ac_n "checking for PQgetCopyData in -lpq""... $ac_c" 1>&6 +-echo "configure:76290: checking for PQgetCopyData in -lpq" >&5 ++echo "configure:77268: checking for PQgetCopyData in -lpq" >&5 + ac_lib_var=`echo pq'_'PQgetCopyData | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76294,7 +77272,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:77287: \"$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 +@@ -76329,7 +77307,7 @@ + fi --/* Define to 1 if you have the `funopen' function. */ --#undef HAVE_FUNOPEN -+/* enable valgrind memchecks */ -+#undef HAVE_VALGRIND_MEMCHECK_H + echo $ac_n "checking for PQfreemem in -lpq""... $ac_c" 1>&6 +-echo "configure:76333: checking for PQfreemem in -lpq" >&5 ++echo "configure:77311: checking for PQfreemem in -lpq" >&5 + ac_lib_var=`echo pq'_'PQfreemem | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76337,7 +77315,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:77330: \"$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 +@@ -76372,7 +77350,7 @@ + fi --/* Define to 1 if you have the `gai_strerror' function. */ --#undef HAVE_GAI_STRERROR -+/* Whether to build apc as dynamic module */ -+#undef COMPILE_DL_APC + echo $ac_n "checking for PQsetErrorVerbosity in -lpq""... $ac_c" 1>&6 +-echo "configure:76376: checking for PQsetErrorVerbosity in -lpq" >&5 ++echo "configure:77354: checking for PQsetErrorVerbosity in -lpq" >&5 + ac_lib_var=`echo pq'_'PQsetErrorVerbosity | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76380,7 +77358,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:77373: \"$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 +@@ -76415,7 +77393,7 @@ + fi --/* Whether you have gcov */ --#undef HAVE_GCOV -+/* */ -+#undef HAVE_APC + echo $ac_n "checking for PQftable in -lpq""... $ac_c" 1>&6 +-echo "configure:76419: checking for PQftable in -lpq" >&5 ++echo "configure:77397: checking for PQftable in -lpq" >&5 + ac_lib_var=`echo pq'_'PQftable | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76423,7 +77401,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:77416: \"$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 +@@ -76458,7 +77436,7 @@ + fi --/* Define to 1 if you have the `gcvt' function. */ --#undef HAVE_GCVT -+/* Whether to build bcmath as dynamic module */ -+#undef COMPILE_DL_BCMATH + echo $ac_n "checking for PQescapeStringConn in -lpq""... $ac_c" 1>&6 +-echo "configure:76462: checking for PQescapeStringConn in -lpq" >&5 ++echo "configure:77440: checking for PQescapeStringConn in -lpq" >&5 + ac_lib_var=`echo pq'_'PQescapeStringConn | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76466,7 +77444,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:77459: \"$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 +@@ -76501,7 +77479,7 @@ + fi --/* */ --#undef HAVE_GDIMAGECOLORRESOLVE -+/* Whether you have bcmath */ -+#undef HAVE_BCMATH + echo $ac_n "checking for PQescapeByteaConn in -lpq""... $ac_c" 1>&6 +-echo "configure:76505: checking for PQescapeByteaConn in -lpq" >&5 ++echo "configure:77483: checking for PQescapeByteaConn in -lpq" >&5 + ac_lib_var=`echo pq'_'PQescapeByteaConn | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76509,7 +77487,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:77502: \"$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 +@@ -76544,7 +77522,7 @@ + fi --/* */ --#undef HAVE_GD_BUNDLED -+/* */ -+#undef HAVE_BZ2 + echo $ac_n "checking for pg_encoding_to_char in -lpq""... $ac_c" 1>&6 +-echo "configure:76548: checking for pg_encoding_to_char in -lpq" >&5 ++echo "configure:77526: 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 +@@ -76552,7 +77530,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:77545: \"$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 +@@ -76587,7 +77565,7 @@ + fi --/* */ --#undef HAVE_GD_CACHE_CREATE -+/* Whether to build bz2 as dynamic module */ -+#undef COMPILE_DL_BZ2 + echo $ac_n "checking for lo_create in -lpq""... $ac_c" 1>&6 +-echo "configure:76591: checking for lo_create in -lpq" >&5 ++echo "configure:77569: checking for lo_create in -lpq" >&5 + ac_lib_var=`echo pq'_'lo_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 +@@ -76595,7 +77573,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:77588: \"$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 +@@ -76630,7 +77608,7 @@ + fi --/* */ --#undef HAVE_GD_DYNAMIC_CTX_EX -+/* */ -+#undef HAVE_CALENDAR + echo $ac_n "checking for lo_import_with_oid in -lpq""... $ac_c" 1>&6 +-echo "configure:76634: checking for lo_import_with_oid in -lpq" >&5 ++echo "configure:77612: checking for lo_import_with_oid in -lpq" >&5 + ac_lib_var=`echo pq'_'lo_import_with_oid | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -76638,7 +77616,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:77631: \"$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 +@@ -77109,7 +78087,7 @@ + php_enable_phar=yes + + echo $ac_n "checking for phar archive support""... $ac_c" 1>&6 +-echo "configure:77113: checking for phar archive support" >&5 ++echo "configure:78091: checking for phar archive support" >&5 + # Check whether --enable-phar or --disable-phar was given. + if test "${enable_phar+set}" = set; then + enableval="$enable_phar" +@@ -77443,7 +78421,7 @@ + fi + + echo $ac_n "checking for phar openssl support""... $ac_c" 1>&6 +-echo "configure:77447: checking for phar openssl support" >&5 ++echo "configure:78425: checking for phar openssl support" >&5 + if test "$PHP_HASH_SHARED" != "yes"; then + if test "$PHP_HASH" != "no"; then + cat >> confdefs.h <<\EOF +@@ -77518,7 +78496,7 @@ + php_enable_posix=yes + + echo $ac_n "checking whether to enable POSIX-like functions""... $ac_c" 1>&6 +-echo "configure:77522: checking whether to enable POSIX-like functions" >&5 ++echo "configure:78500: checking whether to enable POSIX-like functions" >&5 + # Check whether --enable-posix or --disable-posix was given. + if test "${enable_posix+set}" = set; then + enableval="$enable_posix" +@@ -77860,17 +78838,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:77864: checking for $ac_hdr" >&5 ++echo "configure:78842: 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:77874: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:78852: \"$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* +@@ -77900,12 +78878,12 @@ + for ac_func in seteuid setegid setsid getsid setpgid getpgid ctermid mkfifo mknod getrlimit getlogin getgroups makedev initgroups getpwuid_r getgrgid_r + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:77904: checking for $ac_func" >&5 ++echo "configure:78882: 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:78910: \"$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 +@@ -77954,14 +78932,14 @@ --/* */ --#undef HAVE_GD_FONTMUTEX -+/* */ -+#undef HAVE_CTYPE - --/* */ --#undef HAVE_GD_FREEFONTCACHE -+/* Whether to build ctype as dynamic module */ -+#undef COMPILE_DL_CTYPE - --/* */ --#undef HAVE_GD_GD2 -+/* Have cURL with SSL support */ -+#undef HAVE_CURL_SSL - --/* */ --#undef HAVE_GD_GIF_CREATE -+/* Have cURL with OpenSSL support */ -+#undef HAVE_CURL_OPENSSL - --/* */ --#undef HAVE_GD_GIF_CTX -+/* Have cURL with GnuTLS support */ -+#undef HAVE_CURL_GNUTLS - --/* */ --#undef HAVE_GD_GIF_READ -+/* */ -+#undef HAVE_CURL --/* */ --#undef HAVE_GD_IMAGEELLIPSE -+/* */ -+#undef HAVE_CURL_VERSION_INFO + echo $ac_n "checking for working ttyname_r() implementation""... $ac_c" 1>&6 +-echo "configure:77958: checking for working ttyname_r() implementation" >&5 ++echo "configure:78936: checking for working ttyname_r() implementation" >&5 + if test "$cross_compiling" = yes; then + + echo "$ac_t""no, cannot detect working ttyname_r() when cross compiling. posix_ttyname() will be thread-unsafe" 1>&6 + + else + cat > conftest.$ac_ext < +@@ -77974,7 +78952,7 @@ + } + + EOF +-if { (eval echo configure:77978: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:78956: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + echo "$ac_t""yes" 1>&6 +@@ -77996,13 +78974,13 @@ --/* */ --#undef HAVE_GD_IMAGESETTILE -+/* */ -+#undef HAVE_CURL_MULTI_STRERROR --/* */ --#undef HAVE_GD_JPG -+/* */ -+#undef PHP_CURL_URL_WRAPPERS + echo $ac_n "checking for utsname.domainname""... $ac_c" 1>&6 +-echo "configure:78000: checking for utsname.domainname" >&5 ++echo "configure:78978: checking for utsname.domainname" >&5 + if eval "test \"`echo '$''{'ac_cv_have_utsname_domainname'+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:78996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + ac_cv_have_utsname_domainname=yes +@@ -78045,7 +79023,7 @@ + php_with_pspell=no --/* */ --#undef HAVE_GD_STRINGFT -+/* */ -+#undef QDBM_INCLUDE_FILE + echo $ac_n "checking for PSPELL support""... $ac_c" 1>&6 +-echo "configure:78049: checking for PSPELL support" >&5 ++echo "configure:79027: checking for PSPELL support" >&5 + # Check whether --with-pspell or --without-pspell was given. + if test "${with_pspell+set}" = set; then + withval="$with_pspell" +@@ -78595,7 +79573,7 @@ + done --/* */ --#undef HAVE_GD_STRINGFTEX -+/* */ -+#undef DBA_QDBM + echo $ac_n "checking for new_aspell_config in -laspell""... $ac_c" 1>&6 +-echo "configure:78599: checking for new_aspell_config in -laspell" >&5 ++echo "configure:79577: checking for new_aspell_config in -laspell" >&5 + ac_lib_var=`echo aspell'_'new_aspell_config | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -78603,7 +79581,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-laspell $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:79596: \"$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 +@@ -78788,7 +79766,7 @@ + php_with_libedit=no + + echo $ac_n "checking for libedit readline replacement""... $ac_c" 1>&6 +-echo "configure:78792: checking for libedit readline replacement" >&5 ++echo "configure:79770: 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" +@@ -78833,7 +79811,7 @@ + php_with_readline=no + + echo $ac_n "checking for readline support""... $ac_c" 1>&6 +-echo "configure:78837: checking for readline support" >&5 ++echo "configure:79815: checking for readline support" >&5 + # Check whether --with-readline or --without-readline was given. + if test "${with_readline+set}" = set; then + withval="$with_readline" +@@ -78919,7 +79897,7 @@ + + PHP_READLINE_LIBS="" + echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 +-echo "configure:78923: checking for tgetent in -lncurses" >&5 ++echo "configure:79901: 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 +@@ -78927,7 +79905,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:79920: \"$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 +@@ -78983,7 +79961,7 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_GD_STRINGTTF -+/* */ -+#undef GDBM_INCLUDE_FILE + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 +-echo "configure:78987: checking for tgetent in -ltermcap" >&5 ++echo "configure:79965: 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 +@@ -78991,7 +79969,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:79984: \"$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 +@@ -79149,7 +80127,7 @@ + done --/* */ --#undef HAVE_GD_WBMP -+/* */ -+#undef DBA_GDBM + echo $ac_n "checking for readline in -lreadline""... $ac_c" 1>&6 +-echo "configure:79153: checking for readline in -lreadline" >&5 ++echo "configure:80131: checking for readline in -lreadline" >&5 + ac_lib_var=`echo readline'_'readline | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -79157,7 +80135,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lreadline $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:80150: \"$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 +@@ -79397,7 +80375,7 @@ + done --/* */ --#undef HAVE_GD_XBM -+/* */ -+#undef NDBM_INCLUDE_FILE + echo $ac_n "checking for rl_pending_input in -lreadline""... $ac_c" 1>&6 +-echo "configure:79401: checking for rl_pending_input in -lreadline" >&5 ++echo "configure:80379: checking for rl_pending_input in -lreadline" >&5 + ac_lib_var=`echo readline'_'rl_pending_input | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -79405,7 +80383,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lreadline $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:80398: \"$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 +@@ -79547,7 +80525,7 @@ + done --/* */ --#undef HAVE_GD_XPM -+/* */ -+#undef DBA_NDBM + echo $ac_n "checking for rl_callback_read_char in -lreadline""... $ac_c" 1>&6 +-echo "configure:79551: checking for rl_callback_read_char in -lreadline" >&5 ++echo "configure:80529: checking for rl_callback_read_char in -lreadline" >&5 + ac_lib_var=`echo readline'_'rl_callback_read_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 +@@ -79555,7 +80533,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lreadline $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:80548: \"$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 +@@ -79650,7 +80628,7 @@ --/* Define if you have the getaddrinfo function */ --#undef HAVE_GETADDRINFO -+/* */ -+#undef DBA_DB4 --/* Define to 1 if you have the `getcwd' function. */ --#undef HAVE_GETCWD -+/* */ -+#undef DB4_INCLUDE_FILE + echo $ac_n "checking for tgetent in -lncurses""... $ac_c" 1>&6 +-echo "configure:79654: checking for tgetent in -lncurses" >&5 ++echo "configure:80632: 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 +@@ -79658,7 +80636,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:80651: \"$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 +@@ -79713,7 +80691,7 @@ + echo "$ac_t""no" 1>&6 --/* Define to 1 if you have the `getgrgid_r' function. */ --#undef HAVE_GETGRGID_R -+/* */ -+#undef DBA_DB3 + echo $ac_n "checking for tgetent in -ltermcap""... $ac_c" 1>&6 +-echo "configure:79717: checking for tgetent in -ltermcap" >&5 ++echo "configure:80695: 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 +@@ -79721,7 +80699,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:80714: \"$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 +@@ -79878,7 +80856,7 @@ + done --/* Define to 1 if you have the `getgrnam_r' function. */ --#undef HAVE_GETGRNAM_R -+/* */ -+#undef DB3_INCLUDE_FILE + echo $ac_n "checking for readline in -ledit""... $ac_c" 1>&6 +-echo "configure:79882: checking for readline in -ledit" >&5 ++echo "configure:80860: checking for readline in -ledit" >&5 + ac_lib_var=`echo edit'_'readline | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -79886,7 +80864,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ledit $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:80879: \"$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 +@@ -80038,12 +81016,12 @@ + for ac_func in rl_completion_matches + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:80042: checking for $ac_func" >&5 ++echo "configure:81020: 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:81048: \"$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 +@@ -80392,7 +81370,7 @@ + php_with_recode=no --/* */ --#undef HAVE_GETHOSTBYADDR -+/* */ -+#undef DB2_INCLUDE_FILE + echo $ac_n "checking for recode support""... $ac_c" 1>&6 +-echo "configure:80396: checking for recode support" >&5 ++echo "configure:81374: checking for recode support" >&5 + # Check whether --with-recode or --without-recode was given. + if test "${with_recode+set}" = set; then + withval="$with_recode" +@@ -80556,7 +81534,7 @@ + done --/* Define to 1 if you have the `gethostname' function. */ --#undef HAVE_GETHOSTNAME -+/* */ -+#undef DB1_VERSION + echo $ac_n "checking for recode_format_table in -lrecode""... $ac_c" 1>&6 +-echo "configure:80560: checking for recode_format_table in -lrecode" >&5 ++echo "configure:81538: checking for recode_format_table in -lrecode" >&5 + ac_lib_var=`echo recode'_'recode_format_table | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -80564,7 +81542,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lrecode $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:81557: \"$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 +@@ -80705,7 +81683,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:81698: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + + +@@ -80879,17 +81857,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:80883: checking for $ac_hdr" >&5 ++echo "configure:81861: 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:80893: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:81871: \"$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* +@@ -81512,7 +82490,7 @@ + php_enable_session=yes --/* Define to 1 if you have the `getlogin' function. */ --#undef HAVE_GETLOGIN -+/* */ -+#undef DB1_INCLUDE_FILE + echo $ac_n "checking whether to enable PHP sessions""... $ac_c" 1>&6 +-echo "configure:81516: checking whether to enable PHP sessions" >&5 ++echo "configure:82494: checking whether to enable PHP sessions" >&5 + # Check whether --enable-session or --disable-session was given. + if test "${enable_session+set}" = set; then + enableval="$enable_session" +@@ -81556,7 +82534,7 @@ + php_with_mm=no --/* Define to 1 if you have the `getopt' function. */ --#undef HAVE_GETOPT -+/* */ -+#undef DBA_DB1 + echo $ac_n "checking for mm support""... $ac_c" 1>&6 +-echo "configure:81560: checking for mm support" >&5 ++echo "configure:82538: checking for mm support" >&5 + # Check whether --with-mm or --without-mm was given. + if test "${with_mm+set}" = set; then + withval="$with_mm" +@@ -81578,7 +82556,7 @@ + if test "$PHP_SESSION" != "no"; then + + echo $ac_n "checking whether pwrite works""... $ac_c" 1>&6 +-echo "configure:81582: checking whether pwrite works" >&5 ++echo "configure:82560: checking whether pwrite works" >&5 + if eval "test \"`echo '$''{'ac_cv_pwrite'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -81590,7 +82568,7 @@ + + else + cat > conftest.$ac_ext < +@@ -81611,7 +82589,7 @@ --/* Define to 1 if you have the `getpid' function. */ --#undef HAVE_GETPID -+/* */ -+#undef DBM_VERSION + + EOF +-if { (eval echo configure:81615: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:82593: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_pwrite=yes +@@ -81636,7 +82614,7 @@ + + else + cat > conftest.$ac_ext < +@@ -81657,7 +82635,7 @@ --/* Define to 1 if you have the `getprotobyname' function. */ --#undef HAVE_GETPROTOBYNAME -+/* */ -+#undef DBA_DBM + + EOF +-if { (eval echo configure:81661: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:82639: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_pwrite=yes +@@ -81698,7 +82676,7 @@ --/* Define to 1 if you have the `getprotobynumber' function. */ --#undef HAVE_GETPROTOBYNUMBER -+/* */ -+#undef DBA_CDB_BUILTIN + + echo $ac_n "checking whether pread works""... $ac_c" 1>&6 +-echo "configure:81702: checking whether pread works" >&5 ++echo "configure:82680: checking whether pread works" >&5 + if eval "test \"`echo '$''{'ac_cv_pread'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -81711,7 +82689,7 @@ + + else + cat > conftest.$ac_ext < +@@ -81731,7 +82709,7 @@ + } + + EOF +-if { (eval echo configure:81735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:82713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_pread=yes +@@ -81758,7 +82736,7 @@ + + else + cat > conftest.$ac_ext < +@@ -81778,7 +82756,7 @@ + } + + EOF +-if { (eval echo configure:81782: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:82760: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_pread=yes +@@ -82342,7 +83320,7 @@ + php_enable_shmop=no + + echo $ac_n "checking whether to enable shmop support""... $ac_c" 1>&6 +-echo "configure:82346: checking whether to enable shmop support" >&5 ++echo "configure:83324: 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" +@@ -82686,7 +83664,7 @@ + php_enable_simplexml=yes + + echo $ac_n "checking whether to enable SimpleXML support""... $ac_c" 1>&6 +-echo "configure:82690: checking whether to enable SimpleXML support" >&5 ++echo "configure:83668: checking whether to enable SimpleXML support" >&5 + # Check whether --enable-simplexml or --disable-simplexml was given. + if test "${enable_simplexml+set}" = set; then + enableval="$enable_simplexml" +@@ -82731,7 +83709,7 @@ + php_with_libxml_dir=no --/* Define to 1 if you have the `getrlimit' function. */ --#undef HAVE_GETRLIMIT -+/* */ -+#undef CDB_INCLUDE_FILE + echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:82735: checking libxml2 install dir" >&5 ++echo "configure:83713: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -82759,7 +83737,7 @@ --/* Define to 1 if you have the `getrusage' function. */ --#undef HAVE_GETRUSAGE -+/* */ -+#undef DBA_CDB + + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:82763: checking for xml2-config path" >&5 ++echo "configure:83741: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -82917,7 +83895,7 @@ --/* Define to 1 if you have the `getservbyname' function. */ --#undef HAVE_GETSERVBYNAME -+/* */ -+#undef DBA_INIFILE --/* Define to 1 if you have the `getservbyport' function. */ --#undef HAVE_GETSERVBYPORT -+/* */ -+#undef DBA_FLATFILE + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:82921: checking whether libxml build works" >&5 ++echo "configure:83899: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -82933,7 +83911,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:83926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -83332,7 +84310,7 @@ + php_with_snmp=no + + echo $ac_n "checking for SNMP support""... $ac_c" 1>&6 +-echo "configure:83336: checking for SNMP support" >&5 ++echo "configure:84314: checking for SNMP support" >&5 + # Check whether --with-snmp or --without-snmp was given. + if test "${with_snmp+set}" = set; then + withval="$with_snmp" +@@ -83376,7 +84354,7 @@ + php_with_openssl_dir=no --/* Define to 1 if you have the `gettimeofday' function. */ --#undef HAVE_GETTIMEOFDAY -+/* Whether to build dba as dynamic module */ -+#undef COMPILE_DL_DBA + echo $ac_n "checking OpenSSL dir for SNMP""... $ac_c" 1>&6 +-echo "configure:83380: checking OpenSSL dir for SNMP" >&5 ++echo "configure:84358: checking OpenSSL dir for SNMP" >&5 + # Check whether --with-openssl-dir or --without-openssl-dir was given. + if test "${with_openssl_dir+set}" = set; then + withval="$with_openssl_dir" +@@ -83399,7 +84377,7 @@ + php_enable_ucd_snmp_hack=no + + echo $ac_n "checking whether to enable UCD SNMP hack""... $ac_c" 1>&6 +-echo "configure:83403: checking whether to enable UCD SNMP hack" >&5 ++echo "configure:84381: 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" +@@ -83424,7 +84402,7 @@ + # Extract the first word of "net-snmp-config", so it can be a program name with args. + set dummy net-snmp-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:83428: checking for $ac_word" >&5 ++echo "configure:84406: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_SNMP_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -83625,17 +84603,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:83629: checking for $ac_hdr" >&5 ++echo "configure:84607: 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:83639: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:84617: \"$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* +@@ -83663,9 +84641,9 @@ --/* Define to 1 if you have the `getwd' function. */ --#undef HAVE_GETWD -+/* Whether to build dio as dynamic module */ -+#undef COMPILE_DL_DIO + if test "$ac_cv_header_default_store_h" = "yes"; then + echo $ac_n "checking for OpenSSL support in SNMP libraries""... $ac_c" 1>&6 +-echo "configure:83667: checking for OpenSSL support in SNMP libraries" >&5 ++echo "configure:84645: checking for OpenSSL support in SNMP libraries" >&5 + cat > conftest.$ac_ext < +@@ -83720,7 +84698,7 @@ + # Extract the first word of "pkg-config", so it can be a program name with args. + set dummy pkg-config; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:83724: checking for $ac_word" >&5 ++echo "configure:84702: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_path_PKG_CONFIG'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -83925,9 +84903,9 @@ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=-I$OPENSSL_INCDIR + echo $ac_n "checking for OpenSSL version""... $ac_c" 1>&6 +-echo "configure:83929: checking for OpenSSL version" >&5 ++echo "configure:84907: checking for OpenSSL version" >&5 + cat > conftest.$ac_ext < +@@ -84082,7 +85060,7 @@ + done --/* Define to 1 if you have the `glob' function. */ --#undef HAVE_GLOB -+/* Whether to build dom as dynamic module */ -+#undef COMPILE_DL_DOM + echo $ac_n "checking for CRYPTO_free in -lcrypto""... $ac_c" 1>&6 +-echo "configure:84086: checking for CRYPTO_free in -lcrypto" >&5 ++echo "configure:85064: 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 +@@ -84090,7 +85068,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:85083: \"$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 +@@ -84258,7 +85236,7 @@ + done --/* */ --#undef HAVE_GMP -+/* Whether to build enchant as dynamic module */ -+#undef COMPILE_DL_ENCHANT + echo $ac_n "checking for SSL_CTX_set_ssl_version in -lssl""... $ac_c" 1>&6 +-echo "configure:84262: checking for SSL_CTX_set_ssl_version in -lssl" >&5 ++echo "configure:85240: 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 +@@ -84266,7 +85244,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:85259: \"$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 +@@ -84390,7 +85368,7 @@ + fi --/* Define to 1 if you have the `gmtime_r' function. */ --#undef HAVE_GMTIME_R -+/* */ -+#undef HAVE_ENCHANT + echo $ac_n "checking for kstat_read in -lkstat""... $ac_c" 1>&6 +-echo "configure:84394: checking for kstat_read in -lkstat" >&5 ++echo "configure:85372: 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 +@@ -84398,7 +85376,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:85391: \"$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 +@@ -84680,7 +85658,7 @@ + done --/* Define to 1 if you have the `grantpt' function. */ --#undef HAVE_GRANTPT -+/* */ -+#undef HAVE_ENCHANT_BROKER_SET_PARAM + echo $ac_n "checking for snmp_parse_oid in -l$SNMP_LIBNAME""... $ac_c" 1>&6 +-echo "configure:84684: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 ++echo "configure:85662: checking for snmp_parse_oid in -l$SNMP_LIBNAME" >&5 + ac_lib_var=`echo $SNMP_LIBNAME'_'snmp_parse_oid | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -84688,7 +85666,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$SNMP_LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:85681: \"$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 +@@ -84833,7 +85811,7 @@ + done --/* Define to 1 if you have the header file. */ --#undef HAVE_GRP_H -+/* */ -+#undef ENCHANT_VERSION_STRING - --/* Have HASH Extension */ --#undef HAVE_HASH_EXT -+/* Whether you want EXIF (metadata from images) support */ -+#undef HAVE_EXIF - --/* Define to 1 if you have the `hstrerror' function. */ --#undef HAVE_HSTRERROR -+/* Whether to build exif as dynamic module */ -+#undef COMPILE_DL_EXIF - --/* */ --#undef HAVE_HTONL -+/* Whether to build fileinfo as dynamic module */ -+#undef COMPILE_DL_FILEINFO - --/* whether HUGE_VAL == INF */ --#undef HAVE_HUGE_VAL_INF -+/* Whether to build filter as dynamic module */ -+#undef COMPILE_DL_FILTER - --/* whether HUGE_VAL + -HUGEVAL == NAN */ --#undef HAVE_HUGE_VAL_NAN -+/* Whether you want FTP support */ -+#undef HAVE_FTP - --/* Define to 1 if you have the `hypot' function. */ --#undef HAVE_HYPOT -+/* Whether to build ftp as dynamic module */ -+#undef COMPILE_DL_FTP - --/* */ --#undef HAVE_IBASE -+/* */ -+#undef USE_GD_IMGSTRTTF + echo $ac_n "checking for init_snmp in -l$SNMP_LIBNAME""... $ac_c" 1>&6 +-echo "configure:84837: checking for init_snmp in -l$SNMP_LIBNAME" >&5 ++echo "configure:85815: checking for init_snmp in -l$SNMP_LIBNAME" >&5 + ac_lib_var=`echo $SNMP_LIBNAME'_'init_snmp | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -84841,7 +85819,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$SNMP_LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:85834: \"$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 +@@ -85199,7 +86177,7 @@ + php_enable_soap=no --/* */ --#undef HAVE_IBMDB2 -+/* */ -+#undef USE_GD_IMGSTRTTF + echo $ac_n "checking whether to enable SOAP support""... $ac_c" 1>&6 +-echo "configure:85203: checking whether to enable SOAP support" >&5 ++echo "configure:86181: checking whether to enable SOAP support" >&5 + # Check whether --enable-soap or --disable-soap was given. + if test "${enable_soap+set}" = set; then + enableval="$enable_soap" +@@ -85244,7 +86222,7 @@ + php_with_libxml_dir=no --/* IBM iconv implementation */ --#undef HAVE_IBM_ICONV -+/* */ -+#undef HAVE_LIBFREETYPE + echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:85248: checking libxml2 install dir" >&5 ++echo "configure:86226: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -85272,7 +86250,7 @@ --/* */ --#undef HAVE_ICONV -+/* */ -+#undef ENABLE_GD_TTF + + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:85276: checking for xml2-config path" >&5 ++echo "configure:86254: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -85430,7 +86408,7 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_IEEEFP_H -+/* */ -+#undef HAVE_LIBT1 --/* */ --#undef HAVE_IMAP -+/* */ -+#undef HAVE_LIBGD + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:85434: checking whether libxml build works" >&5 ++echo "configure:86412: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -85446,7 +86424,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:86439: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -85807,7 +86785,7 @@ + php_enable_sockets=no --/* */ --#undef HAVE_IMAP2001 -+/* */ -+#undef HAVE_LIBGD15 + echo $ac_n "checking whether to enable sockets support""... $ac_c" 1>&6 +-echo "configure:85811: checking whether to enable sockets support" >&5 ++echo "configure:86789: 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" +@@ -85849,13 +86827,13 @@ --/* */ --#undef HAVE_IMAP2004 -+/* */ -+#undef HAVE_LIBGD20 + if test "$PHP_SOCKETS" != "no"; then + echo $ac_n "checking for struct cmsghdr""... $ac_c" 1>&6 +-echo "configure:85853: checking for struct cmsghdr" >&5 ++echo "configure:86831: checking for struct cmsghdr" >&5 + if eval "test \"`echo '$''{'ac_cv_cmsghdr'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + cat > conftest.$ac_ext < +@@ -85864,7 +86842,7 @@ + struct cmsghdr s; s + ; return 0; } + EOF +-if { (eval echo configure:85868: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:86846: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_cmsghdr=yes + else +@@ -85889,12 +86867,12 @@ + for ac_func in hstrerror socketpair + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:85893: checking for $ac_func" >&5 ++echo "configure:86871: 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:86899: \"$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 +@@ -85945,17 +86923,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:85949: checking for $ac_hdr" >&5 ++echo "configure:86927: 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:85959: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:86937: \"$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* +@@ -85982,7 +86960,7 @@ + done --/* */ --#undef HAVE_IMAP_MUTF7 -+/* */ -+#undef HAVE_GD_IMAGESETBRUSH + cat > conftest.$ac_ext < +@@ -85992,7 +86970,7 @@ + static struct msghdr tp; int n = (int) tp.msg_flags; return n + ; return 0; } + EOF +-if { (eval echo configure:85996: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:86974: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + : + else + echo "configure: failed program was:" >&5 +@@ -86326,7 +87304,7 @@ --/* */ --#undef HAVE_INET_ATON -+/* */ -+#undef HAVE_COLORCLOSESTHWB --/* Define to 1 if you have the `inet_ntoa' function. */ --#undef HAVE_INET_NTOA -+/* */ -+#undef HAVE_GD_WBMP + echo $ac_n "checking whether zend_object_value is packed""... $ac_c" 1>&6 +-echo "configure:86330: checking whether zend_object_value is packed" >&5 ++echo "configure:87308: checking whether zend_object_value is packed" >&5 + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS="$INCLUDES -I$abs_srcdir $CPPFLAGS" + if test "$cross_compiling" = yes; then +@@ -86336,7 +87314,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:87327: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_result=1 +@@ -86709,7 +87687,7 @@ + php_with_sqlite=yes + + echo $ac_n "checking for sqlite support""... $ac_c" 1>&6 +-echo "configure:86713: checking for sqlite support" >&5 ++echo "configure:87691: checking for sqlite support" >&5 + # Check whether --with-sqlite or --without-sqlite was given. + if test "${with_sqlite+set}" = set; then + withval="$with_sqlite" +@@ -86753,7 +87731,7 @@ + php_enable_sqlite_utf8=no + + echo $ac_n "checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)""... $ac_c" 1>&6 +-echo "configure:86757: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 ++echo "configure:87735: checking whether to enable UTF-8 support in sqlite (default: ISO-8859-1)" >&5 + # Check whether --enable-sqlite-utf8 or --disable-sqlite-utf8 was given. + if test "${enable_sqlite_utf8+set}" = set; then + enableval="$enable_sqlite_utf8" +@@ -86781,13 +87759,13 @@ + if test "$PHP_PDO" != "no"; then + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:86785: checking for PDO includes" >&5 ++echo "configure:87763: checking for PDO includes" >&5 + if eval "test \"`echo '$''{'pdo_inc_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + echo $ac_n "checking for PDO includes""... $ac_c" 1>&6 +-echo "configure:86791: checking for PDO includes" >&5 ++echo "configure:87769: checking for PDO includes" >&5 + if test -f $abs_srcdir/include/php/ext/pdo/php_pdo_driver.h; then + pdo_inc_path=$abs_srcdir/ext + elif test -f $abs_srcdir/ext/pdo/php_pdo_driver.h; then +@@ -86821,7 +87799,7 @@ + SQLITE_DIR=$PHP_SQLITE + else # search default path list + echo $ac_n "checking for sqlite files in default path""... $ac_c" 1>&6 +-echo "configure:86825: checking for sqlite files in default path" >&5 ++echo "configure:87803: checking for sqlite files in default path" >&5 + for i in $SEARCH_PATH ; do + if test -r $i/$SEARCH_FOR; then + SQLITE_DIR=$i +@@ -86933,7 +87911,7 @@ + done --/* Define to 1 if you have the `inet_pton' function. */ --#undef HAVE_INET_PTON -+/* */ -+#undef HAVE_GD_PNG + echo $ac_n "checking for sqlite_open in -lsqlite""... $ac_c" 1>&6 +-echo "configure:86937: checking for sqlite_open in -lsqlite" >&5 ++echo "configure:87915: checking for sqlite_open in -lsqlite" >&5 + ac_lib_var=`echo sqlite'_'sqlite_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 +@@ -86941,7 +87919,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsqlite $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:87934: \"$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 +@@ -87125,7 +88103,7 @@ + # Extract the first word of "lemon", so it can be a program name with args. + set dummy lemon; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:87129: checking for $ac_word" >&5 ++echo "configure:88107: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_LEMON'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -87153,7 +88131,7 @@ --/* Define to 1 if you have the `initgroups' function. */ --#undef HAVE_INITGROUPS -+/* */ -+#undef HAVE_GD_XBM + if test "$LEMON"; then + echo $ac_n "checking for lemon version""... $ac_c" 1>&6 +-echo "configure:87157: checking for lemon version" >&5 ++echo "configure:88135: checking for lemon version" >&5 + if eval "test \"`echo '$''{'php_cv_lemon_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -87566,7 +88544,7 @@ + --/* Define if int32_t type is present. */ --#undef HAVE_INT32_T -+/* */ -+#undef HAVE_GD_BUNDLED + echo $ac_n "checking size of char *""... $ac_c" 1>&6 +-echo "configure:87570: checking size of char *" >&5 ++echo "configure:88548: checking size of char *" >&5 + if eval "test \"`echo '$''{'ac_cv_sizeof_char_p'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -87574,18 +88552,19 @@ + ac_cv_sizeof_char_p=4 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(char *)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:87589: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:88568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_sizeof_char_p=`cat conftestval` + else +@@ -87647,12 +88626,12 @@ + for ac_func in usleep nanosleep + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:87651: checking for $ac_func" >&5 ++echo "configure:88630: 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:88658: \"$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 +@@ -87703,17 +88682,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:87707: checking for $ac_hdr" >&5 ++echo "configure:88686: 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:87717: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:88696: \"$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* +@@ -87744,7 +88723,7 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_INTTYPES_H -+/* */ -+#undef HAVE_GD_GIF_CREATE --/* */ --#undef HAVE_IODBC -+/* */ -+#undef HAVE_GD_IMAGEELLIPSE + echo $ac_n "checking whether flush should be called explicitly after a buffered io""... $ac_c" 1>&6 +-echo "configure:87748: checking whether flush should be called explicitly after a buffered io" >&5 ++echo "configure:88727: checking whether flush should be called explicitly after a buffered io" >&5 + if eval "test \"`echo '$''{'ac_cv_flush_io'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -87755,7 +88734,7 @@ --/* */ --#undef HAVE_IODBC_H -+/* */ -+#undef HAVE_GD_FONTCACHESHUTDOWN + else + cat > conftest.$ac_ext < +@@ -87793,7 +88772,7 @@ + } --/* Define to 1 if you have the `isascii' function. */ --#undef HAVE_ISASCII -+/* */ -+#undef HAVE_GD_DYNAMIC_CTX_EX + EOF +-if { (eval echo configure:87797: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:88776: \"$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 +@@ -87821,7 +88800,7 @@ --/* Define to 1 if you have the `isfinite' function. */ --#undef HAVE_ISFINITE -+/* */ -+#undef HAVE_GD_GIF_CTX + if test "$ac_cv_func_crypt" = "no"; then + echo $ac_n "checking for crypt in -lcrypt""... $ac_c" 1>&6 +-echo "configure:87825: checking for crypt in -lcrypt" >&5 ++echo "configure:88804: 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 +@@ -87829,7 +88808,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:88823: \"$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 +@@ -87869,7 +88848,7 @@ + fi + + echo $ac_n "checking for standard DES crypt""... $ac_c" 1>&6 +-echo "configure:87873: checking for standard DES crypt" >&5 ++echo "configure:88852: 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 +@@ -87880,7 +88859,7 @@ --/* Define to 1 if you have the `isinf' function. */ --#undef HAVE_ISINF -+/* */ -+#undef HAVE_GD_JPG + 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:88882: \"$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 +@@ -87920,7 +88899,7 @@ + echo "$ac_t""$ac_cv_crypt_des" 1>&6 --/* */ --#undef HAVE_ISQLEXT_H -+/* */ -+#undef HAVE_GD_STRINGFT + echo $ac_n "checking for extended DES crypt""... $ac_c" 1>&6 +-echo "configure:87924: checking for extended DES crypt" >&5 ++echo "configure:88903: 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 +@@ -87931,7 +88910,7 @@ --/* */ --#undef HAVE_ISQL_H -+/* */ -+#undef HAVE_GD_STRINGFTEX + 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:88933: \"$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 +@@ -87971,7 +88950,7 @@ + echo "$ac_t""$ac_cv_crypt_ext_des" 1>&6 --/* Define to 1 if you have the `kill' function. */ --#undef HAVE_KILL -+/* */ -+#undef USE_GD_JISX0208 + echo $ac_n "checking for MD5 crypt""... $ac_c" 1>&6 +-echo "configure:87975: checking for MD5 crypt" >&5 ++echo "configure:88954: 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 +@@ -87982,7 +88961,7 @@ --/* do we have kqueue? */ --#undef HAVE_KQUEUE -+/* */ -+#undef USE_GD_IMGSTRTTF + else + cat > conftest.$ac_ext < header file. */ --#undef HAVE_LANGINFO_H -+/* */ -+#undef USE_GD_IMGSTRTTF + #if HAVE_UNISTD_H +@@ -88010,7 +88989,7 @@ + #endif + } + EOF +-if { (eval echo configure:88014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:88993: \"$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 +@@ -88031,7 +89010,7 @@ + echo "$ac_t""$ac_cv_crypt_md5" 1>&6 --/* Define to 1 if you have the `lchown' function. */ --#undef HAVE_LCHOWN -+/* */ -+#undef HAVE_LIBFREETYPE + echo $ac_n "checking for Blowfish crypt""... $ac_c" 1>&6 +-echo "configure:88035: checking for Blowfish crypt" >&5 ++echo "configure:89014: 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 +@@ -88042,7 +89021,7 @@ --/* */ --#undef HAVE_LDAP -+/* */ -+#undef ENABLE_GD_TTF + 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:89050: \"$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 +@@ -88088,7 +89067,7 @@ + echo "$ac_t""$ac_cv_crypt_blowfish" 1>&6 --/* Define to 1 if you have the `ldap_parse_result' function. */ --#undef HAVE_LDAP_PARSE_RESULT -+/* */ -+#undef HAVE_LIBGD + echo $ac_n "checking for SHA512 crypt""... $ac_c" 1>&6 +-echo "configure:88092: checking for SHA512 crypt" >&5 ++echo "configure:89071: checking for SHA512 crypt" >&5 + if eval "test \"`echo '$''{'ac_cv_crypt_SHA512'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -88099,7 +89078,7 @@ --/* LDAP SASL support */ --#undef HAVE_LDAP_SASL -+/* */ -+#undef HAVE_LIBGD13 + 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:89106: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_crypt_SHA512=yes +@@ -88144,7 +89123,7 @@ + echo "$ac_t""$ac_cv_crypt_SHA512" 1>&6 --/* */ --#undef HAVE_LDAP_SASL_SASL_H -+/* */ -+#undef HAVE_GD_PNG + echo $ac_n "checking for SHA256 crypt""... $ac_c" 1>&6 +-echo "configure:88148: checking for SHA256 crypt" >&5 ++echo "configure:89127: checking for SHA256 crypt" >&5 + if eval "test \"`echo '$''{'ac_cv_crypt_SHA256'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -88155,7 +89134,7 @@ --/* Define to 1 if you have the `ldap_start_tls_s' function. */ --#undef HAVE_LDAP_START_TLS_S -+/* */ -+#undef HAVE_GD_GIF_READ + 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:89162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_crypt_SHA256=yes +@@ -88203,13 +89182,13 @@ + if test "$ac_cv_crypt_blowfish" = "no" || test "$ac_cv_crypt_des" = "no" || test "$ac_cv_crypt_ext_des" = "no" || test "x$php_crypt_r" = "x0"; then --/* */ --#undef HAVE_LIBCRYPT -+/* */ -+#undef HAVE_GD_WBMP + echo $ac_n "checking whether the compiler supports __alignof__""... $ac_c" 1>&6 +-echo "configure:88207: checking whether the compiler supports __alignof__" >&5 ++echo "configure:89186: checking whether the compiler supports __alignof__" >&5 + if eval "test \"`echo '$''{'ac_cv_alignof_exists'+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:89202: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + ac_cv_alignof_exists=yes +@@ -88244,13 +89223,13 @@ + fi --/* */ --#undef HAVE_LIBDNET_STUB -+/* */ -+#undef HAVE_GD_XPM + echo $ac_n "checking whether the compiler supports aligned attribute""... $ac_c" 1>&6 +-echo "configure:88248: checking whether the compiler supports aligned attribute" >&5 ++echo "configure:89227: checking whether the compiler supports aligned attribute" >&5 + if eval "test \"`echo '$''{'ac_cv_attribute_aligned'+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:89243: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + ac_cv_attribute_aligned=yes +@@ -88439,12 +89418,12 @@ + for ac_func in getcwd getwd asinh acosh atanh log1p hypot glob strfmon nice fpclass isinf isnan mempcpy strpncpy + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:88443: checking for $ac_func" >&5 ++echo "configure:89422: 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:89450: \"$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 +@@ -88492,7 +89471,7 @@ + done --/* */ --#undef HAVE_LIBFREETYPE -+/* */ -+#undef HAVE_GD_IMAGESETTILE + echo $ac_n "checking for working fnmatch""... $ac_c" 1>&6 +-echo "configure:88496: checking for working fnmatch" >&5 ++echo "configure:89475: checking for working fnmatch" >&5 + if eval "test \"`echo '$''{'ac_cv_func_fnmatch_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -88503,11 +89482,11 @@ + ac_cv_func_fnmatch_works=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:89490: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + ac_cv_func_fnmatch_works=yes + else +@@ -88534,12 +89513,12 @@ + for ac_func in fork CreateProcess + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:88538: checking for $ac_func" >&5 ++echo "configure:89517: 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:89545: \"$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 +@@ -88592,7 +89571,7 @@ + done --/* */ --#undef HAVE_LIBGD13 -+/* */ -+#undef HAVE_GD_IMAGESETBRUSH + echo $ac_n "checking if your OS can spawn processes with inherited handles""... $ac_c" 1>&6 +-echo "configure:88596: checking if your OS can spawn processes with inherited handles" >&5 ++echo "configure:89575: checking if your OS can spawn processes with inherited handles" >&5 + if test "$php_can_support_proc_open" = "yes"; then + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF +@@ -88616,12 +89595,12 @@ + unset found + + echo $ac_n "checking for res_nsearch""... $ac_c" 1>&6 +-echo "configure:88620: checking for res_nsearch" >&5 ++echo "configure:89599: checking for res_nsearch" >&5 + if eval "test \"`echo '$''{'ac_cv_func_res_nsearch'+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:89627: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_res_nsearch=yes" + else +@@ -88662,12 +89641,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __res_nsearch""... $ac_c" 1>&6 +-echo "configure:88666: checking for __res_nsearch" >&5 ++echo "configure:89645: checking for __res_nsearch" >&5 + if eval "test \"`echo '$''{'ac_cv_func___res_nsearch'+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:89673: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func___res_nsearch=yes" + else +@@ -88728,7 +89707,7 @@ + unset ac_cv_lib_resolv___res_nsearch + unset found + echo $ac_n "checking for res_nsearch in -lresolv""... $ac_c" 1>&6 +-echo "configure:88732: checking for res_nsearch in -lresolv" >&5 ++echo "configure:89711: checking for res_nsearch in -lresolv" >&5 + ac_lib_var=`echo resolv'_'res_nsearch | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -88736,7 +89715,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:89730: \"$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 +@@ -88767,7 +89746,7 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_LIBGD204 -+/* */ -+#undef HAVE_GD_STRINGFTEX + echo $ac_n "checking for __res_nsearch in -lresolv""... $ac_c" 1>&6 +-echo "configure:88771: checking for __res_nsearch in -lresolv" >&5 ++echo "configure:89750: checking for __res_nsearch in -lresolv" >&5 + ac_lib_var=`echo resolv'_'__res_nsearch | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -88775,7 +89754,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:89769: \"$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 +@@ -88818,11 +89797,11 @@ + found=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:89805: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -88864,7 +89843,7 @@ + unset ac_cv_lib_bind___res_nsearch + unset found + echo $ac_n "checking for res_nsearch in -lbind""... $ac_c" 1>&6 +-echo "configure:88868: checking for res_nsearch in -lbind" >&5 ++echo "configure:89847: checking for res_nsearch in -lbind" >&5 + ac_lib_var=`echo bind'_'res_nsearch | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -88872,7 +89851,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:89866: \"$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 +@@ -88903,7 +89882,7 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_LIBICONV -+/* */ -+#undef HAVE_COLORCLOSESTHWB + echo $ac_n "checking for __res_nsearch in -lbind""... $ac_c" 1>&6 +-echo "configure:88907: checking for __res_nsearch in -lbind" >&5 ++echo "configure:89886: checking for __res_nsearch in -lbind" >&5 + ac_lib_var=`echo bind'_'__res_nsearch | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -88911,7 +89890,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:89905: \"$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 +@@ -88954,11 +89933,11 @@ + found=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:89941: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -89000,7 +89979,7 @@ + unset ac_cv_lib_socket___res_nsearch + unset found + echo $ac_n "checking for res_nsearch in -lsocket""... $ac_c" 1>&6 +-echo "configure:89004: checking for res_nsearch in -lsocket" >&5 ++echo "configure:89983: checking for res_nsearch in -lsocket" >&5 + ac_lib_var=`echo socket'_'res_nsearch | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -89008,7 +89987,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:90002: \"$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 +@@ -89039,7 +90018,7 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_LIBINTL -+/* */ -+#undef HAVE_GDIMAGECOLORRESOLVE + echo $ac_n "checking for __res_nsearch in -lsocket""... $ac_c" 1>&6 +-echo "configure:89043: checking for __res_nsearch in -lsocket" >&5 ++echo "configure:90022: checking for __res_nsearch in -lsocket" >&5 + ac_lib_var=`echo socket'_'__res_nsearch | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -89047,7 +90026,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:90041: \"$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 +@@ -89090,11 +90069,11 @@ + found=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:90077: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -89151,12 +90130,12 @@ + unset found + + echo $ac_n "checking for dns_search""... $ac_c" 1>&6 +-echo "configure:89155: checking for dns_search" >&5 ++echo "configure:90134: checking for dns_search" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dns_search'+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:90162: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dns_search=yes" + else +@@ -89197,12 +90176,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __dns_search""... $ac_c" 1>&6 +-echo "configure:89201: checking for __dns_search" >&5 ++echo "configure:90180: checking for __dns_search" >&5 + if eval "test \"`echo '$''{'ac_cv_func___dns_search'+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:90208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func___dns_search=yes" + else +@@ -89263,7 +90242,7 @@ + unset ac_cv_lib_resolv___dns_search + unset found + echo $ac_n "checking for dns_search in -lresolv""... $ac_c" 1>&6 +-echo "configure:89267: checking for dns_search in -lresolv" >&5 ++echo "configure:90246: checking for dns_search in -lresolv" >&5 + ac_lib_var=`echo resolv'_'dns_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 +@@ -89271,7 +90250,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:90265: \"$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 +@@ -89302,7 +90281,7 @@ + echo "$ac_t""no" 1>&6 --/* Whether you have libmm */ --#undef HAVE_LIBMM -+/* */ -+#undef HAVE_GD_FONTCACHESHUTDOWN + echo $ac_n "checking for __dns_search in -lresolv""... $ac_c" 1>&6 +-echo "configure:89306: checking for __dns_search in -lresolv" >&5 ++echo "configure:90285: checking for __dns_search in -lresolv" >&5 + ac_lib_var=`echo resolv'_'__dns_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 +@@ -89310,7 +90289,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:90304: \"$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 +@@ -89353,11 +90332,11 @@ + found=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:90340: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -89399,7 +90378,7 @@ + unset ac_cv_lib_bind___dns_search + unset found + echo $ac_n "checking for dns_search in -lbind""... $ac_c" 1>&6 +-echo "configure:89403: checking for dns_search in -lbind" >&5 ++echo "configure:90382: checking for dns_search in -lbind" >&5 + ac_lib_var=`echo bind'_'dns_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 +@@ -89407,7 +90386,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:90401: \"$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 +@@ -89438,7 +90417,7 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_LIBNSL -+/* */ -+#undef HAVE_GD_FREEFONTCACHE + echo $ac_n "checking for __dns_search in -lbind""... $ac_c" 1>&6 +-echo "configure:89442: checking for __dns_search in -lbind" >&5 ++echo "configure:90421: checking for __dns_search in -lbind" >&5 + ac_lib_var=`echo bind'_'__dns_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 +@@ -89446,7 +90425,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:90440: \"$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 +@@ -89489,11 +90468,11 @@ + found=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:90476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -89535,7 +90514,7 @@ + unset ac_cv_lib_socket___dns_search + unset found + echo $ac_n "checking for dns_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:89539: checking for dns_search in -lsocket" >&5 ++echo "configure:90518: checking for dns_search in -lsocket" >&5 + ac_lib_var=`echo socket'_'dns_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 +@@ -89543,7 +90522,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:90537: \"$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 +@@ -89574,7 +90553,7 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_LIBPAM -+/* */ -+#undef HAVE_GD_FONTMUTEX + echo $ac_n "checking for __dns_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:89578: checking for __dns_search in -lsocket" >&5 ++echo "configure:90557: checking for __dns_search in -lsocket" >&5 + ac_lib_var=`echo socket'_'__dns_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 +@@ -89582,7 +90561,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:90576: \"$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 +@@ -89625,11 +90604,11 @@ + found=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:90612: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -89686,12 +90665,12 @@ + unset found + + echo $ac_n "checking for dn_expand""... $ac_c" 1>&6 +-echo "configure:89690: checking for dn_expand" >&5 ++echo "configure:90669: checking for dn_expand" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dn_expand'+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:90697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dn_expand=yes" + else +@@ -89732,12 +90711,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __dn_expand""... $ac_c" 1>&6 +-echo "configure:89736: checking for __dn_expand" >&5 ++echo "configure:90715: checking for __dn_expand" >&5 + if eval "test \"`echo '$''{'ac_cv_func___dn_expand'+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:90743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func___dn_expand=yes" + else +@@ -89798,7 +90777,7 @@ + unset ac_cv_lib_resolv___dn_expand + unset found + echo $ac_n "checking for dn_expand in -lresolv""... $ac_c" 1>&6 +-echo "configure:89802: checking for dn_expand in -lresolv" >&5 ++echo "configure:90781: checking for dn_expand in -lresolv" >&5 + ac_lib_var=`echo resolv'_'dn_expand | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -89806,7 +90785,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:90800: \"$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 +@@ -89837,7 +90816,7 @@ + echo "$ac_t""no" 1>&6 --/* Whether we have librecode 3.5 or higher */ --#undef HAVE_LIBRECODE -+/* Whether to build gd as dynamic module */ -+#undef COMPILE_DL_GD + echo $ac_n "checking for __dn_expand in -lresolv""... $ac_c" 1>&6 +-echo "configure:89841: checking for __dn_expand in -lresolv" >&5 ++echo "configure:90820: checking for __dn_expand in -lresolv" >&5 + ac_lib_var=`echo resolv'_'__dn_expand | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -89845,7 +90824,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:90839: \"$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 +@@ -89888,11 +90867,11 @@ + found=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:90875: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -89934,7 +90913,7 @@ + unset ac_cv_lib_bind___dn_expand + unset found + echo $ac_n "checking for dn_expand in -lbind""... $ac_c" 1>&6 +-echo "configure:89938: checking for dn_expand in -lbind" >&5 ++echo "configure:90917: checking for dn_expand in -lbind" >&5 + ac_lib_var=`echo bind'_'dn_expand | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -89942,7 +90921,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:90936: \"$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 +@@ -89973,7 +90952,7 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_LIBRESOLV -+/* */ -+#undef HAVE_LIBINTL + echo $ac_n "checking for __dn_expand in -lbind""... $ac_c" 1>&6 +-echo "configure:89977: checking for __dn_expand in -lbind" >&5 ++echo "configure:90956: checking for __dn_expand in -lbind" >&5 + ac_lib_var=`echo bind'_'__dn_expand | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -89981,7 +90960,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:90975: \"$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 +@@ -90024,11 +91003,11 @@ + found=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:91011: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -90070,7 +91049,7 @@ + unset ac_cv_lib_socket___dn_expand + unset found + echo $ac_n "checking for dn_expand in -lsocket""... $ac_c" 1>&6 +-echo "configure:90074: checking for dn_expand in -lsocket" >&5 ++echo "configure:91053: checking for dn_expand in -lsocket" >&5 + ac_lib_var=`echo socket'_'dn_expand | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -90078,7 +91057,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:91072: \"$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 +@@ -90109,7 +91088,7 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_LIBRT -+/* Whether to build gettext as dynamic module */ -+#undef COMPILE_DL_GETTEXT + echo $ac_n "checking for __dn_expand in -lsocket""... $ac_c" 1>&6 +-echo "configure:90113: checking for __dn_expand in -lsocket" >&5 ++echo "configure:91092: checking for __dn_expand in -lsocket" >&5 + ac_lib_var=`echo socket'_'__dn_expand | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -90117,7 +91096,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:91111: \"$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 +@@ -90160,11 +91139,11 @@ + found=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:91147: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -90221,12 +91200,12 @@ + unset found + + echo $ac_n "checking for dn_skipname""... $ac_c" 1>&6 +-echo "configure:90225: checking for dn_skipname" >&5 ++echo "configure:91204: checking for dn_skipname" >&5 + if eval "test \"`echo '$''{'ac_cv_func_dn_skipname'+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:91232: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_dn_skipname=yes" + else +@@ -90267,12 +91246,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __dn_skipname""... $ac_c" 1>&6 +-echo "configure:90271: checking for __dn_skipname" >&5 ++echo "configure:91250: checking for __dn_skipname" >&5 + if eval "test \"`echo '$''{'ac_cv_func___dn_skipname'+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:91278: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func___dn_skipname=yes" + else +@@ -90333,7 +91312,7 @@ + unset ac_cv_lib_resolv___dn_skipname + unset found + echo $ac_n "checking for dn_skipname in -lresolv""... $ac_c" 1>&6 +-echo "configure:90337: checking for dn_skipname in -lresolv" >&5 ++echo "configure:91316: 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 +@@ -90341,7 +91320,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:91335: \"$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 +@@ -90372,7 +91351,7 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_LIBXML -+/* */ -+#undef HAVE_DCNGETTEXT + echo $ac_n "checking for __dn_skipname in -lresolv""... $ac_c" 1>&6 +-echo "configure:90376: checking for __dn_skipname in -lresolv" >&5 ++echo "configure:91355: 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 +@@ -90380,7 +91359,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:91374: \"$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 +@@ -90423,11 +91402,11 @@ + found=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:91410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -90469,7 +91448,7 @@ + unset ac_cv_lib_bind___dn_skipname + unset found + echo $ac_n "checking for dn_skipname in -lbind""... $ac_c" 1>&6 +-echo "configure:90473: checking for dn_skipname in -lbind" >&5 ++echo "configure:91452: checking for dn_skipname in -lbind" >&5 + ac_lib_var=`echo bind'_'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 +@@ -90477,7 +91456,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:91471: \"$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 +@@ -90508,7 +91487,7 @@ + echo "$ac_t""no" 1>&6 --/* Define to 1 if you have the header file. */ --#undef HAVE_LIMITS_H -+/* */ -+#undef HAVE_BIND_TEXTDOMAIN_CODESET + echo $ac_n "checking for __dn_skipname in -lbind""... $ac_c" 1>&6 +-echo "configure:90512: checking for __dn_skipname in -lbind" >&5 ++echo "configure:91491: checking for __dn_skipname in -lbind" >&5 + ac_lib_var=`echo bind'_'__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 +@@ -90516,7 +91495,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:91510: \"$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 +@@ -90559,11 +91538,11 @@ + found=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:91546: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -90605,7 +91584,7 @@ + unset ac_cv_lib_socket___dn_skipname + unset found + echo $ac_n "checking for dn_skipname in -lsocket""... $ac_c" 1>&6 +-echo "configure:90609: checking for dn_skipname in -lsocket" >&5 ++echo "configure:91588: checking for dn_skipname in -lsocket" >&5 + ac_lib_var=`echo socket'_'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 +@@ -90613,7 +91592,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:91607: \"$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 +@@ -90644,7 +91623,7 @@ + echo "$ac_t""no" 1>&6 --/* Define to 1 if you have the `link' function. */ --#undef HAVE_LINK -+/* Whether to build gmp as dynamic module */ -+#undef COMPILE_DL_GMP + echo $ac_n "checking for __dn_skipname in -lsocket""... $ac_c" 1>&6 +-echo "configure:90648: checking for __dn_skipname in -lsocket" >&5 ++echo "configure:91627: checking for __dn_skipname in -lsocket" >&5 + ac_lib_var=`echo socket'_'__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 +@@ -90652,7 +91631,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:91646: \"$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 +@@ -90695,11 +91674,11 @@ + found=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:91682: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -90758,12 +91737,12 @@ + unset found + + echo $ac_n "checking for res_search""... $ac_c" 1>&6 +-echo "configure:90762: checking for res_search" >&5 ++echo "configure:91741: checking for res_search" >&5 + if eval "test \"`echo '$''{'ac_cv_func_res_search'+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:91769: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_res_search=yes" + else +@@ -90804,12 +91783,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for __res_search""... $ac_c" 1>&6 +-echo "configure:90808: checking for __res_search" >&5 ++echo "configure:91787: checking for __res_search" >&5 + if eval "test \"`echo '$''{'ac_cv_func___res_search'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + cat > conftest.$ac_ext < header file. */ --#undef HAVE_LOCALE_H -+/* */ -+#undef PHP_MHASH_BC + ; return 0; } + EOF +-if { (eval echo configure:90836: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:91815: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func___res_search=yes" + else +@@ -90870,7 +91849,7 @@ + unset ac_cv_lib_resolv___res_search + unset found + echo $ac_n "checking for res_search in -lresolv""... $ac_c" 1>&6 +-echo "configure:90874: checking for res_search in -lresolv" >&5 ++echo "configure:91853: 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 +@@ -90878,7 +91857,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:91872: \"$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 +@@ -90909,7 +91888,7 @@ + echo "$ac_t""no" 1>&6 --/* Define to 1 if you have the `localtime_r' function. */ --#undef HAVE_LOCALTIME_R -+/* Have HASH Extension */ -+#undef HAVE_HASH_EXT + echo $ac_n "checking for __res_search in -lresolv""... $ac_c" 1>&6 +-echo "configure:90913: checking for __res_search in -lresolv" >&5 ++echo "configure:91892: 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 +@@ -90917,7 +91896,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:91911: \"$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 +@@ -90960,11 +91939,11 @@ + found=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:91947: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -91006,7 +91985,7 @@ + unset ac_cv_lib_bind___res_search + unset found + echo $ac_n "checking for res_search in -lbind""... $ac_c" 1>&6 +-echo "configure:91010: checking for res_search in -lbind" >&5 ++echo "configure:91989: checking for res_search in -lbind" >&5 + ac_lib_var=`echo bind'_'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 +@@ -91014,7 +91993,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:92008: \"$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 +@@ -91045,7 +92024,7 @@ + echo "$ac_t""no" 1>&6 --/* Define to 1 if you have the `lockf' function. */ --#undef HAVE_LOCKF -+/* Define if processor uses big-endian word */ -+#undef WORDS_BIGENDIAN + echo $ac_n "checking for __res_search in -lbind""... $ac_c" 1>&6 +-echo "configure:91049: checking for __res_search in -lbind" >&5 ++echo "configure:92028: checking for __res_search in -lbind" >&5 + ac_lib_var=`echo bind'_'__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 +@@ -91053,7 +92032,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:92047: \"$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 +@@ -91096,11 +92075,11 @@ + found=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:92083: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -91142,7 +92121,7 @@ + unset ac_cv_lib_socket___res_search + unset found + echo $ac_n "checking for res_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:91146: checking for res_search in -lsocket" >&5 ++echo "configure:92125: 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 +@@ -91150,7 +92129,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:92144: \"$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 +@@ -91181,7 +92160,7 @@ + echo "$ac_t""no" 1>&6 --/* Define to 1 if you have the `log1p' function. */ --#undef HAVE_LOG1P -+/* Whether to build hash as dynamic module */ -+#undef COMPILE_DL_HASH + echo $ac_n "checking for __res_search in -lsocket""... $ac_c" 1>&6 +-echo "configure:91185: checking for __res_search in -lsocket" >&5 ++echo "configure:92164: 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 +@@ -91189,7 +92168,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:92183: \"$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 +@@ -91232,11 +92211,11 @@ + found=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:92219: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + found=yes + else +@@ -91289,7 +92268,7 @@ --/* do we have SO_LISTENQxxx? */ --#undef HAVE_LQ_SO_LISTENQ -+/* */ -+#undef HAVE_LIBICONV --/* do we have TCP_INFO? */ --#undef HAVE_LQ_TCP_INFO -+/* */ -+#undef HAVE_GICONV_H + echo $ac_n "checking whether atof() accepts NAN""... $ac_c" 1>&6 +-echo "configure:91293: checking whether atof() accepts NAN" >&5 ++echo "configure:92272: checking whether atof() accepts NAN" >&5 + if eval "test \"`echo '$''{'ac_cv_atof_accept_nan'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -91300,7 +92279,7 @@ --/* Define to 1 if you have the `lrand48' function. */ --#undef HAVE_LRAND48 -+/* */ -+#undef HAVE_LIBICONV + else + cat > conftest.$ac_ext < +@@ -91320,7 +92299,7 @@ + } --/* Define to 1 if you have the `makedev' function. */ --#undef HAVE_MAKEDEV -+/* */ -+#undef HAVE_ICONV - --/* Define to 1 if you have the header file. */ --#undef HAVE_MALLOC_H -+/* Which iconv implementation to use */ -+#undef PHP_ICONV_IMPL - --/* Define to 1 if you have the `mblen' function. */ --#undef HAVE_MBLEN -+/* Konstantin Chuguev's iconv implementation */ -+#undef HAVE_BSD_ICONV - --/* whether to have multibyte regex support */ --#undef HAVE_MBREGEX -+/* Which iconv implementation to use */ -+#undef PHP_ICONV_IMPL - --/* Define to 1 if you have the `mbrlen' function. */ --#undef HAVE_MBRLEN -+/* glibc's iconv implementation */ -+#undef HAVE_GLIBC_ICONV - --/* Define to 1 if you have the `mbsinit' function. */ --#undef HAVE_MBSINIT -+/* Which iconv implementation to use */ -+#undef PHP_ICONV_IMPL - --/* Define if your system has mbstate_t in wchar.h */ --#undef HAVE_MBSTATE_T -+/* IBM iconv implementation */ -+#undef HAVE_IBM_ICONV - --/* whether to have multibyte string support */ --#undef HAVE_MBSTRING -+/* Which iconv implementation to use */ -+#undef PHP_ICONV_IMPL - --/* Define to 1 if you have the `memcpy' function. */ --#undef HAVE_MEMCPY -+/* Whether iconv supports error no or not */ -+#undef ICONV_SUPPORTS_ERRNO - --/* Define to 1 if you have the `memmove' function. */ --#undef HAVE_MEMMOVE -+/* Whether iconv supports error no or not */ -+#undef ICONV_SUPPORTS_ERRNO - --/* Define to 1 if you have the header file. */ --#undef HAVE_MEMORY_H -+/* Whether iconv supports error no or not */ -+#undef ICONV_SUPPORTS_ERRNO - --/* Define to 1 if you have the `mempcpy' function. */ --#undef HAVE_MEMPCPY -+/* Path to iconv.h */ -+#undef PHP_ICONV_H_PATH - --/* Define if the target system has support for memory allocation using -- mmap(MAP_ANON) */ --#undef HAVE_MEM_MMAP_ANON -+/* Whether to build iconv as dynamic module */ -+#undef COMPILE_DL_ICONV - --/* Define if the target system has support for memory allocation using -- mmap("/dev/zero") */ --#undef HAVE_MEM_MMAP_ZERO -+/* Whether to build imap as dynamic module */ -+#undef COMPILE_DL_IMAP - --/* Define to 1 if you have the `mkfifo' function. */ --#undef HAVE_MKFIFO -+/* */ -+#undef HAVE_IMAP + EOF +-if { (eval echo configure:91324: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:92303: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_atof_accept_nan=yes +@@ -91347,7 +92326,7 @@ + fi --/* Define to 1 if you have the `mknod' function. */ --#undef HAVE_MKNOD -+/* */ -+#undef HAVE_IMAP2000 + echo $ac_n "checking whether atof() accepts INF""... $ac_c" 1>&6 +-echo "configure:91351: checking whether atof() accepts INF" >&5 ++echo "configure:92330: checking whether atof() accepts INF" >&5 + if eval "test \"`echo '$''{'ac_cv_atof_accept_inf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -91358,7 +92337,7 @@ --/* Define to 1 if you have the `mkstemp' function. */ --#undef HAVE_MKSTEMP -+/* */ -+#undef HAVE_IMAP2000 + else + cat > conftest.$ac_ext < +@@ -91381,7 +92360,7 @@ + } --/* Define to 1 if you have the header file. */ --#undef HAVE_MONETARY_H -+/* */ -+#undef HAVE_IMAP2000 + EOF +-if { (eval echo configure:91385: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:92364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_atof_accept_inf=yes +@@ -91408,7 +92387,7 @@ + fi --/* Define to 1 if you have the `mremap' function. */ --#undef HAVE_MREMAP -+/* */ -+#undef HAVE_IMAP2000 + echo $ac_n "checking whether HUGE_VAL == INF""... $ac_c" 1>&6 +-echo "configure:91412: checking whether HUGE_VAL == INF" >&5 ++echo "configure:92391: checking whether HUGE_VAL == INF" >&5 + if eval "test \"`echo '$''{'ac_cv_huge_val_inf'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -91419,7 +92398,7 @@ --/* */ --#undef HAVE_MSSQL -+/* */ -+#undef HAVE_IMAP2000 + else + cat > conftest.$ac_ext < +@@ -91442,7 +92421,7 @@ + } --/* */ --#undef HAVE_MYSQLILIB -+/* Whether utf8_mime2text() has new signature */ -+#undef HAVE_NEW_MIME2TEXT + EOF +-if { (eval echo configure:91446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:92425: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_huge_val_inf=yes +@@ -91469,7 +92448,7 @@ + fi --/* Define to 1 if you have the `mysql_commit' function. */ --#undef HAVE_MYSQL_COMMIT -+/* */ -+#undef HAVE_IMAP2001 + echo $ac_n "checking whether HUGE_VAL + -HUGEVAL == NAN""... $ac_c" 1>&6 +-echo "configure:91473: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 ++echo "configure:92452: checking whether HUGE_VAL + -HUGEVAL == NAN" >&5 + if eval "test \"`echo '$''{'ac_cv_huge_val_nan'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -91480,7 +92459,7 @@ --/* Define to 1 if you have the `mysql_next_result' function. */ --#undef HAVE_MYSQL_NEXT_RESULT -+/* */ -+#undef HAVE_LIBPAM + else + cat > conftest.$ac_ext < +@@ -91505,7 +92484,7 @@ + } --/* Define to 1 if you have the `mysql_stmt_prepare' function. */ --#undef HAVE_MYSQL_STMT_PREPARE -+/* */ -+#undef HAVE_IMAP_KRB + EOF +-if { (eval echo configure:91509: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:92488: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + ac_cv_huge_val_nan=yes +@@ -91532,13 +92511,13 @@ + fi --/* Define to 1 if you have the `nanosleep' function. */ --#undef HAVE_NANOSLEEP -+/* */ -+#undef HAVE_IMAP_SSL + echo $ac_n "checking whether strptime() declaration fails""... $ac_c" 1>&6 +-echo "configure:91536: checking whether strptime() declaration fails" >&5 ++echo "configure:92515: checking whether strptime() declaration fails" >&5 + if eval "test \"`echo '$''{'ac_cv_strptime_decl_fails'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + + cat > conftest.$ac_ext < header file, and it defines `DIR'. */ --#undef HAVE_NDIR_H -+/* */ -+#undef HAVE_IMAP_AUTH_GSS + #include +@@ -91554,7 +92533,7 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_NETDB_H -+/* */ -+#undef HAVE_IMAP_MUTF7 + ; return 0; } + EOF +-if { (eval echo configure:91558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:92537: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + ac_cv_strptime_decl_fails=no +@@ -91582,17 +92561,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:91586: checking for $ac_hdr" >&5 ++echo "configure:92565: 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:91596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:92575: \"$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* +@@ -91621,12 +92600,12 @@ + for ac_func in mblen + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:91625: checking for $ac_func" >&5 ++echo "configure:92604: 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 < header file. */ --#undef HAVE_NETINET_IN_H -+/* */ -+#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST + ; return 0; } + EOF +-if { (eval echo configure:91653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92632: \"$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 +@@ -91676,12 +92655,12 @@ + for ac_func in mbrlen mbsinit + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:91680: checking for $ac_func" >&5 ++echo "configure:92659: 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 < header file. */ --#undef HAVE_NETINET_TCP_H -+/* */ -+#undef HAVE_IBASE - --/* */ --#undef HAVE_NET_SNMP -+/* Whether to build interbase as dynamic module */ -+#undef COMPILE_DL_INTERBASE - --/* Whether utf8_mime2text() has new signature */ --#undef HAVE_NEW_MIME2TEXT -+/* Whether to build intl as dynamic module */ -+#undef COMPILE_DL_INTL - --/* */ --#undef HAVE_NGETTEXT -+/* whether to enable JavaScript Object Serialization support */ -+#undef HAVE_JSON - --/* Define to 1 if you have the `nice' function. */ --#undef HAVE_NICE -+/* Whether to build json as dynamic module */ -+#undef COMPILE_DL_JSON - --/* Define to 1 if you have the `nl_langinfo' function. */ --#undef HAVE_NL_LANGINFO -+/* Whether to build ldap as dynamic module */ -+#undef COMPILE_DL_LDAP - --/* Whether you have a Netscape/iPlanet/Sun Webserver */ --#undef HAVE_NSAPI -+/* */ -+#undef HAVE_NSLDAP + ; return 0; } + EOF +-if { (eval echo configure:91708: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:92687: \"$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 +@@ -91729,13 +92708,13 @@ + done --/* */ -+/* */ - #undef HAVE_NSLDAP + echo $ac_n "checking for mbstate_t""... $ac_c" 1>&6 +-echo "configure:91733: checking for mbstate_t" >&5 ++echo "configure:92712: checking for mbstate_t" >&5 + if eval "test \"`echo '$''{'ac_cv_type_mbstate_t'+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:92731: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + ac_cv_type_mbstate_t=yes +@@ -91776,17 +92755,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:91780: checking for $ac_hdr" >&5 ++echo "configure:92759: 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:91790: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:92769: \"$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* +@@ -92176,7 +93155,7 @@ + php_with_sybase_ct=no --/* */ --#undef HAVE_OCIENVCREATE -+/* */ -+#undef HAVE_ORALDAP + echo $ac_n "checking for Sybase-CT support""... $ac_c" 1>&6 +-echo "configure:92180: checking for Sybase-CT support" >&5 ++echo "configure:93159: checking for Sybase-CT support" >&5 + # Check whether --with-sybase-ct or --without-sybase-ct was given. + if test "${with_sybase_ct+set}" = set; then + withval="$with_sybase_ct" +@@ -92828,7 +93807,7 @@ + done --/* */ --#undef HAVE_OCIENVNLSCREATE -+/* */ -+#undef HAVE_ORALDAP_10 + echo $ac_n "checking for netg_errstr in -lsybtcl64""... $ac_c" 1>&6 +-echo "configure:92832: checking for netg_errstr in -lsybtcl64" >&5 ++echo "configure:93811: checking for netg_errstr in -lsybtcl64" >&5 + ac_lib_var=`echo sybtcl64'_'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 +@@ -92836,7 +93815,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsybtcl64 $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:93830: \"$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 +@@ -93022,7 +94001,7 @@ + done --/* */ --#undef HAVE_OCILOBISTEMPORARY -+/* */ -+#undef HAVE_LDAP + echo $ac_n "checking for insck__getVdate in -linsck64""... $ac_c" 1>&6 +-echo "configure:93026: checking for insck__getVdate in -linsck64" >&5 ++echo "configure:94005: checking for insck__getVdate in -linsck64" >&5 + ac_lib_var=`echo insck64'_'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 +@@ -93030,7 +94009,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-linsck64 $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:94024: \"$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 +@@ -93189,7 +94168,7 @@ + done --/* */ --#undef HAVE_OCISTMTFETCH2 -+/* Whether 3 arg set_rebind_proc() */ -+#undef HAVE_3ARG_SETREBINDPROC + echo $ac_n "checking for bsd_tcp in -linsck64""... $ac_c" 1>&6 +-echo "configure:93193: checking for bsd_tcp in -linsck64" >&5 ++echo "configure:94172: checking for bsd_tcp in -linsck64" >&5 + ac_lib_var=`echo insck64'_'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 +@@ -93197,7 +94176,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-linsck64 $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:94191: \"$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 +@@ -93454,7 +94433,7 @@ + done --/* */ --#undef HAVE_OCI_INSTANT_CLIENT -+/* */ -+#undef HAVE_LDAP_SASL_SASL_H + echo $ac_n "checking for netg_errstr in -lsybtcl""... $ac_c" 1>&6 +-echo "configure:93458: checking for netg_errstr in -lsybtcl" >&5 ++echo "configure:94437: checking for netg_errstr in -lsybtcl" >&5 + ac_lib_var=`echo sybtcl'_'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 +@@ -93462,7 +94441,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsybtcl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:94456: \"$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 +@@ -93648,7 +94627,7 @@ + done --/* */ --#undef HAVE_OCI_LOB_READ2 -+/* */ -+#undef HAVE_LDAP_SASL_H - --/* */ --#undef HAVE_ODBC2 -+/* LDAP SASL support */ -+#undef HAVE_LDAP_SASL - --/* */ --#undef HAVE_ODBCSDK_H -+/* Whether to build libevent as dynamic module */ -+#undef COMPILE_DL_LIBEVENT - --/* */ --#undef HAVE_ODBC_H -+/* whether to have multibyte string support */ -+#undef HAVE_MBSTRING - --/* */ --#undef HAVE_ODBC_ROUTER -+/* whether to check multibyte regex backtrack */ -+#undef USE_COMBINATION_EXPLOSION_CHECK - --/* */ --#undef HAVE_OLD_COMPAT_H -+/* Define to 1 if you have the header file. */ -+#undef HAVE_STDARG_PROTOTYPES - --/* whether you have old-style readdir_r */ --#undef HAVE_OLD_READDIR_R -+/* Define to 1 if the bundled oniguruma is used */ -+#undef PHP_ONIG_BUNDLED - - /* Define to 1 if the oniguruma library is available */ - #undef HAVE_ONIG - --/* Define to 1 if you have the header file. */ --#undef HAVE_OPENSSL_CRYPTO_H -+/* Define to 1 if the oniguruma library is available */ -+#undef HAVE_ONIG - --/* */ --#undef HAVE_OPENSSL_EXT -+/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */ -+#undef PHP_ONIG_BAD_KOI8_ENTRY - --/* */ --#undef HAVE_ORALDAP -+/* whether to have multibyte regex support */ -+#undef HAVE_MBREGEX - --/* */ --#undef HAVE_ORALDAP_10 -+/* Whether to build mbstring as dynamic module */ -+#undef COMPILE_DL_MBSTRING - --/* Whether struct _zend_object_value is packed */ --#undef HAVE_PACKED_OBJECT_VALUE -+/* */ -+#undef HAVE_LIBMCRYPT + echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 +-echo "configure:93652: checking for insck__getVdate in -linsck" >&5 ++echo "configure:94631: 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 +@@ -93656,7 +94635,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-linsck $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:94650: \"$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 +@@ -93815,7 +94794,7 @@ + done --/* */ --#undef HAVE_PCRE -+/* */ -+#undef HAVE_LIBMCRYPT + echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 +-echo "configure:93819: checking for bsd_tcp in -linsck" >&5 ++echo "configure:94798: 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 +@@ -93823,7 +94802,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-linsck $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:94817: \"$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 +@@ -94080,7 +95059,7 @@ + done --/* */ --#undef HAVE_PDO_DBLIB -+/* Whether to build mcrypt as dynamic module */ -+#undef COMPILE_DL_MCRYPT + echo $ac_n "checking for netg_errstr in -ltcl""... $ac_c" 1>&6 +-echo "configure:94084: checking for netg_errstr in -ltcl" >&5 ++echo "configure:95063: 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 +@@ -94088,7 +95067,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ltcl $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:95082: \"$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 +@@ -94274,7 +95253,7 @@ + done --/* */ --#undef HAVE_PDO_FIREBIRD -+/* Whether to build mssql as dynamic module */ -+#undef COMPILE_DL_MSSQL + echo $ac_n "checking for insck__getVdate in -linsck""... $ac_c" 1>&6 +-echo "configure:94278: checking for insck__getVdate in -linsck" >&5 ++echo "configure:95257: 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 +@@ -94282,7 +95261,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-linsck $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:95276: \"$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 +@@ -94441,7 +95420,7 @@ + done --/* Whether to build PostgreSQL for PDO support or not */ --#undef HAVE_PDO_PGSQL -+/* */ -+#undef HAVE_LIBDNET_STUB + echo $ac_n "checking for bsd_tcp in -linsck""... $ac_c" 1>&6 +-echo "configure:94445: checking for bsd_tcp in -linsck" >&5 ++echo "configure:95424: 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 +@@ -94449,7 +95428,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-linsck $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:95443: \"$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 +@@ -94520,7 +95499,7 @@ + php_enable_sysvmsg=no + + echo $ac_n "checking whether to enable System V IPC support""... $ac_c" 1>&6 +-echo "configure:94524: checking whether to enable System V IPC support" >&5 ++echo "configure:95503: checking whether to enable System V IPC support" >&5 + # Check whether --enable-sysvmsg or --disable-sysvmsg was given. + if test "${enable_sysvmsg+set}" = set; then + enableval="$enable_sysvmsg" +@@ -94563,17 +95542,17 @@ + if test "$PHP_SYSVMSG" != "no"; then + ac_safe=`echo "sys/msg.h" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for sys/msg.h""... $ac_c" 1>&6 +-echo "configure:94567: checking for sys/msg.h" >&5 ++echo "configure:95546: checking for sys/msg.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:94577: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:95556: \"$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* +@@ -94900,7 +95879,7 @@ + php_enable_sysvsem=no --/* */ --#undef HAVE_PDO_SQLITELIB -+/* */ -+#undef HAVE_MSSQL + echo $ac_n "checking whether to enable System V semaphore support""... $ac_c" 1>&6 +-echo "configure:94904: checking whether to enable System V semaphore support" >&5 ++echo "configure:95883: 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" +@@ -95238,12 +96217,12 @@ + EOF --/* Define to 1 if you have the `perror' function. */ --#undef HAVE_PERROR -+/* */ -+#undef HAVE_FREETDS + echo $ac_n "checking for union semun""... $ac_c" 1>&6 +-echo "configure:95242: checking for union semun" >&5 ++echo "configure:96221: 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 < +@@ -95254,7 +96233,7 @@ + union semun x; + ; return 0; } + EOF +-if { (eval echo configure:95258: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:96237: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + php_cv_semun=yes +@@ -95290,7 +96269,7 @@ + php_enable_sysvshm=no + + echo $ac_n "checking whether to enable System V shared memory support""... $ac_c" 1>&6 +-echo "configure:95294: checking whether to enable System V shared memory support" >&5 ++echo "configure:96273: 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" +@@ -95634,7 +96613,7 @@ + php_with_tidy=no + + echo $ac_n "checking for TIDY support""... $ac_c" 1>&6 +-echo "configure:95638: checking for TIDY support" >&5 ++echo "configure:96617: checking for TIDY support" >&5 + # Check whether --with-tidy or --without-tidy was given. + if test "${with_tidy+set}" = set; then + withval="$with_tidy" +@@ -95923,7 +96902,7 @@ + done --/* Whether libpq is compiled with --enable-multibyte */ --#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT -+/* */ -+#undef PHP_MYSQL_UNIX_SOCK_ADDR - --/* PostgreSQL 7.4 or later */ --#undef HAVE_PGTRANSACTIONSTATUS -+/* Whether you have MySQL */ -+#undef HAVE_MYSQL - --/* Whether to have pg_config.h */ --#undef HAVE_PG_CONFIG_H -+/* Whether to build mysql as dynamic module */ -+#undef COMPILE_DL_MYSQL - --/* PostgreSQL 8.1 or later */ --#undef HAVE_PG_LO_CREATE -+/* Whether mysqlnd is enabled */ -+#undef MYSQL_USE_MYSQLND - --/* PostgreSQL 8.4 or later */ --#undef HAVE_PG_LO_IMPORT_WITH_OID -+/* embedded MySQL support enabled */ -+#undef HAVE_EMBEDDED_MYSQLI - --/* */ --#undef HAVE_PHP_SESSION -+/* */ -+#undef HAVE_MYSQLILIB + echo $ac_n "checking for tidyOptGetDoc in -ltidy""... $ac_c" 1>&6 +-echo "configure:95927: checking for tidyOptGetDoc in -ltidy" >&5 ++echo "configure:96906: checking for tidyOptGetDoc in -ltidy" >&5 + ac_lib_var=`echo tidy'_'tidyOptGetDoc | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -95931,7 +96910,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ltidy $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:96925: \"$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 +@@ -96286,7 +97265,7 @@ + php_enable_tokenizer=yes + + echo $ac_n "checking whether to enable tokenizer support""... $ac_c" 1>&6 +-echo "configure:96290: checking whether to enable tokenizer support" >&5 ++echo "configure:97269: checking whether to enable tokenizer support" >&5 + # Check whether --enable-tokenizer or --disable-tokenizer was given. + if test "${enable_tokenizer+set}" = set; then + enableval="$enable_tokenizer" +@@ -96632,7 +97611,7 @@ + php_enable_wddx=no + + echo $ac_n "checking whether to enable WDDX support""... $ac_c" 1>&6 +-echo "configure:96636: checking whether to enable WDDX support" >&5 ++echo "configure:97615: 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" +@@ -96677,7 +97656,7 @@ + php_with_libxml_dir=no --/* Whether you have phttpd */ --#undef HAVE_PHTTPD -+/* */ -+#undef HAVE_STMT_NEXT_RESULT + echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:96681: checking libxml2 install dir" >&5 ++echo "configure:97660: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -96701,7 +97680,7 @@ + php_with_libexpat_dir=no --/* Define to 1 if you have the `poll' function. */ --#undef HAVE_POLL -+/* Whether to build mysqli as dynamic module */ -+#undef COMPILE_DL_MYSQLI + echo $ac_n "checking libexpat dir for WDDX""... $ac_c" 1>&6 +-echo "configure:96705: checking libexpat dir for WDDX" >&5 ++echo "configure:97684: checking libexpat dir for WDDX" >&5 + # Check whether --with-libexpat-dir or --without-libexpat-dir was given. + if test "${with_libexpat_dir+set}" = set; then + withval="$with_libexpat_dir" +@@ -96729,7 +97708,7 @@ --/* do we have port framework? */ --#undef HAVE_PORT -+/* Whether mysqlnd is enabled */ -+#undef MYSQLI_USE_MYSQLND + + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:96733: checking for xml2-config path" >&5 ++echo "configure:97712: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -96887,7 +97866,7 @@ --/* whether to include POSIX-like functions */ --#undef HAVE_POSIX -+/* */ -+#undef HAVE_OCI_LOB_READ2 --/* whether you have POSIX readdir_r */ --#undef HAVE_POSIX_READDIR_R -+/* Whether to build oci8 as dynamic module */ -+#undef COMPILE_DL_OCI8 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:96891: checking whether libxml build works" >&5 ++echo "configure:97870: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -96903,7 +97882,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:97897: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -97481,7 +98460,7 @@ + php_enable_xml=yes + + echo $ac_n "checking whether to enable XML support""... $ac_c" 1>&6 +-echo "configure:97485: checking whether to enable XML support" >&5 ++echo "configure:98464: checking whether to enable XML support" >&5 + # Check whether --enable-xml or --disable-xml was given. + if test "${enable_xml+set}" = set; then + enableval="$enable_xml" +@@ -97526,7 +98505,7 @@ + php_with_libxml_dir=no --/* Broken libpq under windows */ --#undef HAVE_PQCMDTUPLES -+/* */ -+#undef PHP_OCI8_DEF_DIR + echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:97530: checking libxml2 install dir" >&5 ++echo "configure:98509: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -97550,7 +98529,7 @@ + php_with_libexpat_dir=no --/* PostgreSQL 7.2.0 or later */ --#undef HAVE_PQESCAPE -+/* */ -+#undef PHP_OCI8_DEF_SHARED_LIBADD + echo $ac_n "checking libexpat install dir""... $ac_c" 1>&6 +-echo "configure:97554: checking libexpat install dir" >&5 ++echo "configure:98533: checking libexpat install dir" >&5 + # Check whether --with-libexpat-dir or --without-libexpat-dir was given. + if test "${with_libexpat_dir+set}" = set; then + withval="$with_libexpat_dir" +@@ -97579,7 +98558,7 @@ --/* PostgreSQL 8.1.4 or later */ --#undef HAVE_PQESCAPE_BYTEA_CONN -+/* */ -+#undef HAVE_OCI_INSTANT_CLIENT + + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:97583: checking for xml2-config path" >&5 ++echo "configure:98562: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -97737,7 +98716,7 @@ --/* PostgreSQL 8.1.4 or later */ --#undef HAVE_PQESCAPE_CONN -+/* */ -+#undef HAVE_OCI_LOB_READ2 --/* PostgreSQL 7.4 or later */ --#undef HAVE_PQEXECPARAMS -+/* Whether to build oci8 as dynamic module */ -+#undef COMPILE_DL_OCI8 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:97741: checking whether libxml build works" >&5 ++echo "configure:98720: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -97753,7 +98732,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:98747: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -98300,7 +99279,7 @@ + php_enable_xmlreader=yes + + echo $ac_n "checking whether to enable XMLReader support""... $ac_c" 1>&6 +-echo "configure:98304: checking whether to enable XMLReader support" >&5 ++echo "configure:99283: checking whether to enable XMLReader support" >&5 + # Check whether --enable-xmlreader or --disable-xmlreader was given. + if test "${enable_xmlreader+set}" = set; then + enableval="$enable_xmlreader" +@@ -98345,7 +99324,7 @@ + php_with_libxml_dir=no --/* PostgreSQL 7.4 or later */ --#undef HAVE_PQFREEMEM -+/* */ -+#undef HAVE_ADABAS + echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:98349: checking libxml2 install dir" >&5 ++echo "configure:99328: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -98373,7 +99352,7 @@ --/* PostgreSQL 7.4 or later */ --#undef HAVE_PQFTABLE -+/* */ -+#undef HAVE_SAPDB + + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:98377: checking for xml2-config path" >&5 ++echo "configure:99356: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -98531,7 +99510,7 @@ --/* PostgreSQL 7.4 or later */ --#undef HAVE_PQGETCOPYDATA -+/* */ -+#undef HAVE_SOLID_35 --/* Older PostgreSQL */ --#undef HAVE_PQOIDVALUE -+/* */ -+#undef HAVE_SOLID_30 + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:98535: checking whether libxml build works" >&5 ++echo "configure:99514: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -98547,7 +99526,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:99541: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -98940,7 +99919,7 @@ + php_with_xmlrpc=no + + echo $ac_n "checking for XMLRPC-EPI support""... $ac_c" 1>&6 +-echo "configure:98944: checking for XMLRPC-EPI support" >&5 ++echo "configure:99923: checking for XMLRPC-EPI support" >&5 + # Check whether --with-xmlrpc or --without-xmlrpc was given. + if test "${with_xmlrpc+set}" = set; then + withval="$with_xmlrpc" +@@ -98985,7 +99964,7 @@ + php_with_libxml_dir=no --/* PostgreSQL 7.4 or later */ --#undef HAVE_PQSENDPREPARE -+/* */ -+#undef HAVE_ODBC_ROUTER + echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:98989: checking libxml2 install dir" >&5 ++echo "configure:99968: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -99009,7 +99988,7 @@ + php_with_libexpat_dir=no + + echo $ac_n "checking libexpat dir for XMLRPC-EPI""... $ac_c" 1>&6 +-echo "configure:99013: checking libexpat dir for XMLRPC-EPI" >&5 ++echo "configure:99992: checking libexpat dir for XMLRPC-EPI" >&5 + # Check whether --with-libexpat-dir or --without-libexpat-dir was given. + if test "${with_libexpat_dir+set}" = set; then + withval="$with_libexpat_dir" +@@ -99032,7 +100011,7 @@ + php_with_iconv_dir=no + + echo $ac_n "checking iconv dir for XMLRPC-EPI""... $ac_c" 1>&6 +-echo "configure:99036: checking iconv dir for XMLRPC-EPI" >&5 ++echo "configure:100015: checking iconv dir for XMLRPC-EPI" >&5 + # Check whether --with-iconv-dir or --without-iconv-dir was given. + if test "${with_iconv_dir+set}" = set; then + withval="$with_iconv_dir" +@@ -99088,7 +100067,7 @@ --/* PostgreSQL 7.4 or later */ --#undef HAVE_PQSENDQUERYPARAMS -+/* */ -+#undef HAVE_EMPRESS + + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:99092: checking for xml2-config path" >&5 ++echo "configure:100071: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -99246,7 +100225,7 @@ --/* PostgreSQL 7.4 or later */ --#undef HAVE_PQSENDQUERYPREPARED -+/* */ -+#undef HAVE_EMPRESS --/* PostgreSQL 7.4 or later */ --#undef HAVE_PQSETERRORVERBOSITY -+/* */ -+#undef AIX + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:99250: checking whether libxml build works" >&5 ++echo "configure:100229: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -99262,7 +100241,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:100256: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -99542,12 +100521,12 @@ --/* PostgreSQL 7.3.0 or later */ --#undef HAVE_PQUNESCAPEBYTEA -+/* */ -+#undef LINUX + if test "$PHP_ICONV" = "yes"; then + echo $ac_n "checking for iconv""... $ac_c" 1>&6 +-echo "configure:99546: checking for iconv" >&5 ++echo "configure:100525: checking for iconv" >&5 + if eval "test \"`echo '$''{'ac_cv_func_iconv'+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:100553: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_iconv=yes" + else +@@ -99591,12 +100570,12 @@ + echo "$ac_t""no" 1>&6 --/* */ --#undef HAVE_PREAD -+/* */ -+#undef ISOLARIS + echo $ac_n "checking for libiconv""... $ac_c" 1>&6 +-echo "configure:99595: checking for libiconv" >&5 ++echo "configure:100574: checking for libiconv" >&5 + if eval "test \"`echo '$''{'ac_cv_func_libiconv'+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:100602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_libiconv=yes" + else +@@ -99775,7 +100754,7 @@ + done --/* do we have ptrace? */ --#undef HAVE_PTRACE -+/* */ -+#undef UNIXWARE + echo $ac_n "checking for libiconv in -l$iconv_lib_name""... $ac_c" 1>&6 +-echo "configure:99779: checking for libiconv in -l$iconv_lib_name" >&5 ++echo "configure:100758: checking for libiconv in -l$iconv_lib_name" >&5 + ac_lib_var=`echo $iconv_lib_name'_'libiconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -99783,7 +100762,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$iconv_lib_name $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:100777: \"$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 +@@ -99935,7 +100914,7 @@ + done --/* Whether ptrdiff_t is available */ --#undef HAVE_PTRDIFF_T -+/* */ -+#undef HAVE_BIRDSTEP + echo $ac_n "checking for iconv in -l$iconv_lib_name""... $ac_c" 1>&6 +-echo "configure:99939: checking for iconv in -l$iconv_lib_name" >&5 ++echo "configure:100918: checking for iconv in -l$iconv_lib_name" >&5 + ac_lib_var=`echo $iconv_lib_name'_'iconv | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -99943,7 +100922,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$iconv_lib_name $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:100937: \"$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 +@@ -100144,7 +101123,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:100148: checking for $ac_word" >&5 ++echo "configure:101127: 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 +@@ -100172,21 +101151,21 @@ + fi --/* Define to 1 if you have the `ptsname' function. */ --#undef HAVE_PTSNAME -+/* */ -+#undef HAVE_CODBC + echo $ac_n "checking for inline""... $ac_c" 1>&6 +-echo "configure:100176: checking for inline" >&5 ++echo "configure:101155: 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:101169: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_inline=$ac_kw; break + else +@@ -100224,12 +101203,12 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_PWD_H -+/* */ -+#undef HAVE_ODBC2 --/* */ --#undef HAVE_PWRITE -+/* */ -+#undef HAVE_ESOOB + echo $ac_n "checking for ANSI C header files""... $ac_c" 1>&6 +-echo "configure:100228: checking for ANSI C header files" >&5 ++echo "configure:101207: 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 +@@ -100237,7 +101216,7 @@ + #include + EOF + ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +-{ (eval echo configure:100241: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:101220: \"$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* +@@ -100254,7 +101233,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 +@@ -100272,7 +101251,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 +@@ -100293,7 +101272,7 @@ + : + else + cat > conftest.$ac_ext < + #define ISLOWER(c) ('a' <= (c) && (c) <= 'z') +@@ -100304,7 +101283,7 @@ + exit (0); } --/* Define to 1 if you have the `random' function. */ --#undef HAVE_RANDOM -+/* */ -+#undef HAVE_UNIXODBC + EOF +-if { (eval echo configure:100308: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:101287: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + : + else +@@ -100331,17 +101310,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:100335: checking for $ac_hdr" >&5 ++echo "configure:101314: 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:100345: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:101324: \"$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* +@@ -100373,7 +101352,7 @@ --/* Define to 1 if you have the `rand_r' function. */ --#undef HAVE_RAND_R -+/* Whether you want DBMaker */ -+#undef HAVE_DBMAKER --/* Define to 1 if you have the `realpath' function. */ --#undef HAVE_REALPATH -+/* */ -+#undef HAVE_SQLDATASOURCES + echo $ac_n "checking size of char""... $ac_c" 1>&6 +-echo "configure:100377: checking size of char" >&5 ++echo "configure:101356: 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 +@@ -100381,18 +101360,19 @@ + ac_cv_sizeof_char=1 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(char)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:100396: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:101376: \"$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 +@@ -100413,7 +101393,7 @@ --/* Whether Reflection is enabled */ --#undef HAVE_REFLECTION -+/* */ -+#undef HAVE_UODBC --/* 1 */ --#undef HAVE_REGEX_T_RE_MAGIC -+/* Whether to build odbc as dynamic module */ -+#undef COMPILE_DL_ODBC + echo $ac_n "checking size of int""... $ac_c" 1>&6 +-echo "configure:100417: checking size of int" >&5 ++echo "configure:101397: 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 +@@ -100421,18 +101401,19 @@ + ac_cv_sizeof_int=4 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(int)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:100436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:101417: \"$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 +@@ -100452,7 +101433,7 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_RESOLV_H -+/* */ -+#undef HAVE_FORK --/* */ --#undef HAVE_RES_NSEARCH -+/* */ -+#undef HAVE_WAITPID + echo $ac_n "checking size of long""... $ac_c" 1>&6 +-echo "configure:100456: checking size of long" >&5 ++echo "configure:101437: 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 +@@ -100460,18 +101441,19 @@ + ac_cv_sizeof_long=4 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:100475: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:101457: \"$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 +@@ -100491,7 +101473,7 @@ --/* */ --#undef HAVE_RES_SEARCH -+/* */ -+#undef HAVE_SIGACTION --/* */ --#undef HAVE_RFC822_OUTPUT_ADDRESS_LIST -+/* Whether to build pcntl as dynamic module */ -+#undef COMPILE_DL_PCNTL + echo $ac_n "checking size of long long""... $ac_c" 1>&6 +-echo "configure:100495: checking size of long long" >&5 ++echo "configure:101477: 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 +@@ -100499,18 +101481,19 @@ + ac_cv_sizeof_long_long=8 + else + cat > conftest.$ac_ext < +-int main() ++#include ++main() + { + FILE *f=fopen("conftestval", "w"); +- if (!f) return(1); ++ if (!f) exit(1); + fprintf(f, "%d\n", sizeof(long long)); +- return(0); ++ exit(0); + } + EOF +-if { (eval echo configure:100514: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:101497: \"$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 +@@ -100530,12 +101513,12 @@ --/* */ --#undef HAVE_RL_CALLBACK_READ_CHAR -+/* Whether to build pdo as dynamic module */ -+#undef COMPILE_DL_PDO --/* Define to 1 if you have the `rl_completion_matches' function. */ --#undef HAVE_RL_COMPLETION_MATCHES -+/* Whether to build pdo_dblib as dynamic module */ -+#undef COMPILE_DL_PDO_DBLIB + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:100534: checking for size_t" >&5 ++echo "configure:101517: 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 +@@ -100563,12 +101546,12 @@ + fi --/* Whether you use Roxen */ --#undef HAVE_ROXEN -+/* */ -+#undef HAVE_LIBDNET_STUB + echo $ac_n "checking whether time.h and sys/time.h may both be included""... $ac_c" 1>&6 +-echo "configure:100567: checking whether time.h and sys/time.h may both be included" >&5 ++echo "configure:101550: 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 +@@ -100577,7 +101560,7 @@ + struct tm *tp; + ; return 0; } + EOF +-if { (eval echo configure:100581: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:101564: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_header_time=yes + else +@@ -100598,12 +101581,12 @@ + fi --/* */ --#undef HAVE_SAPDB -+/* */ -+#undef HAVE_PDO_DBLIB + echo $ac_n "checking for uid_t in sys/types.h""... $ac_c" 1>&6 +-echo "configure:100602: checking for uid_t in sys/types.h" >&5 ++echo "configure:101585: 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 +@@ -100643,12 +101626,12 @@ + memcpy memmove + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:100647: checking for $ac_func" >&5 ++echo "configure:101630: 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:101658: \"$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 +@@ -101025,7 +102008,7 @@ + XMLRPC_DIR=$PHP_XMLRPC/include/xmlrpc-epi + else + echo $ac_n "checking for XMLRPC-EPI in default path""... $ac_c" 1>&6 +-echo "configure:101029: checking for XMLRPC-EPI in default path" >&5 ++echo "configure:102012: checking for XMLRPC-EPI in default path" >&5 + for i in /usr/local /usr; do + if test -r $i/include/xmlrpc.h; then + XMLRPC_DIR=$i/include +@@ -101468,7 +102451,7 @@ + php_enable_xmlwriter=yes + + echo $ac_n "checking whether to enable XMLWriter support""... $ac_c" 1>&6 +-echo "configure:101472: checking whether to enable XMLWriter support" >&5 ++echo "configure:102455: checking whether to enable XMLWriter support" >&5 + # Check whether --enable-xmlwriter or --disable-xmlwriter was given. + if test "${enable_xmlwriter+set}" = set; then + enableval="$enable_xmlwriter" +@@ -101513,7 +102496,7 @@ + php_with_libxml_dir=no --/* do we have select? */ --#undef HAVE_SELECT -+/* */ -+#undef HAVE_PDO_FIREBIRD + echo $ac_n "checking libxml2 install dir""... $ac_c" 1>&6 +-echo "configure:101517: checking libxml2 install dir" >&5 ++echo "configure:102500: checking libxml2 install dir" >&5 + # Check whether --with-libxml-dir or --without-libxml-dir was given. + if test "${with_libxml_dir+set}" = set; then + withval="$with_libxml_dir" +@@ -101541,7 +102524,7 @@ --/* */ --#undef HAVE_SEMUN -+/* Whether to build pdo_firebird as dynamic module */ -+#undef COMPILE_DL_PDO_FIREBIRD + + echo $ac_n "checking for xml2-config path""... $ac_c" 1>&6 +-echo "configure:101545: checking for xml2-config path" >&5 ++echo "configure:102528: checking for xml2-config path" >&5 + if eval "test \"`echo '$''{'ac_cv_php_xml2_config_path'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -101699,7 +102682,7 @@ --/* Define to 1 if you have the `setegid' function. */ --#undef HAVE_SETEGID -+/* Whether pdo_mysql uses mysqlnd */ -+#undef PDO_USE_MYSQLND -+ -+/* Whether you have MySQL */ -+#undef HAVE_MYSQL --/* Define to 1 if you have the `setenv' function. */ --#undef HAVE_SETENV -+/* */ -+#undef PDO_MYSQL_UNIX_ADDR + echo $ac_n "checking whether libxml build works""... $ac_c" 1>&6 +-echo "configure:101703: checking whether libxml build works" >&5 ++echo "configure:102686: checking whether libxml build works" >&5 + if eval "test \"`echo '$''{'php_cv_libxml_build_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -101715,7 +102698,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:102713: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBS=$old_LIBS +@@ -102076,7 +103059,7 @@ + php_with_xsl=no --/* Define to 1 if you have the `setitimer' function. */ --#undef HAVE_SETITIMER -+/* */ -+#undef HAVE_OCIENVCREATE + echo $ac_n "checking for XSL support""... $ac_c" 1>&6 +-echo "configure:102080: checking for XSL support" >&5 ++echo "configure:103063: checking for XSL support" >&5 + # Check whether --with-xsl or --without-xsl was given. + if test "${with_xsl+set}" = set; then + withval="$with_xsl" +@@ -102276,7 +103259,7 @@ --/* Define to 1 if you have the `setlocale' function. */ --#undef HAVE_SETLOCALE -+/* */ -+#undef HAVE_OCIENVNLSCREATE + + echo $ac_n "checking for EXSLT support""... $ac_c" 1>&6 +-echo "configure:102280: checking for EXSLT support" >&5 ++echo "configure:103263: checking for EXSLT support" >&5 + for i in $PHP_XSL /usr/local /usr; do + if test -r "$i/include/libexslt/exslt.h"; then + PHP_XSL_EXSL_DIR=$i +@@ -102752,7 +103735,7 @@ + php_enable_zip=no + + echo $ac_n "checking for zip archive read/writesupport""... $ac_c" 1>&6 +-echo "configure:102756: checking for zip archive read/writesupport" >&5 ++echo "configure:103739: checking for zip archive read/writesupport" >&5 + # Check whether --enable-zip or --disable-zip was given. + if test "${enable_zip+set}" = set; then + enableval="$enable_zip" +@@ -102797,7 +103780,7 @@ + php_with_zlib_dir=no --/* Define to 1 if you have the `setpgid' function. */ --#undef HAVE_SETPGID -+/* */ -+#undef HAVE_OCILOBISTEMPORARY + echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 +-echo "configure:102801: checking for the location of libz" >&5 ++echo "configure:103784: checking for the location of libz" >&5 + # Check whether --with-zlib-dir or --without-zlib-dir was given. + if test "${with_zlib_dir+set}" = set; then + withval="$with_zlib_dir" +@@ -102821,7 +103804,7 @@ + php_with_pcre_dir=no --/* Define to 1 if you have the `setpriority' function. */ --#undef HAVE_SETPRIORITY -+/* */ -+#undef HAVE_OCILOBISTEMPORARY + echo $ac_n "checking pcre install prefix""... $ac_c" 1>&6 +-echo "configure:102825: checking pcre install prefix" >&5 ++echo "configure:103808: checking pcre install prefix" >&5 + # Check whether --with-pcre-dir or --without-pcre-dir was given. + if test "${with_pcre_dir+set}" = set; then + withval="$with_pcre_dir" +@@ -102865,7 +103848,7 @@ + fi --/* Define to 1 if you have the `setproctitle' function. */ --#undef HAVE_SETPROCTITLE -+/* */ -+#undef HAVE_OCICOLLASSIGN + echo $ac_n "checking for the location of zlib""... $ac_c" 1>&6 +-echo "configure:102869: checking for the location of zlib" >&5 ++echo "configure:103852: checking for the location of zlib" >&5 + if test "$PHP_ZLIB_DIR" = "no"; then + { echo "configure: error: zip support requires ZLIB. Use --with-zlib-dir= to specify prefix where ZLIB include and library are located" 1>&2; exit 1; } + else +@@ -103003,7 +103986,7 @@ + old_CPPFLAGS=$CPPFLAGS + CPPFLAGS=$INCLUDES + cat > conftest.$ac_ext < +@@ -103022,7 +104005,7 @@ + rm -rf conftest* + + cat > conftest.$ac_ext < +@@ -103390,7 +104373,7 @@ + php_enable_disable_mysqlnd_compression_support=yes --/* Define to 1 if you have the `setvbuf' function. */ --#undef HAVE_SETVBUF -+/* */ -+#undef PHP_PDO_OCI_CLIENT_VERSION + echo $ac_n "checking whether to disable compressed protocol support in mysqlnd""... $ac_c" 1>&6 +-echo "configure:103394: checking whether to disable compressed protocol support in mysqlnd" >&5 ++echo "configure:104377: checking whether to disable compressed protocol support in mysqlnd" >&5 + # Check whether --enable-disable_mysqlnd_compression_support or --disable-disable_mysqlnd_compression_support was given. + if test "${enable_disable_mysqlnd_compression_support+set}" = set; then + enableval="$enable_disable_mysqlnd_compression_support" +@@ -103435,7 +104418,7 @@ + php_with_zlib_dir=no --/* */ --#undef HAVE_SHMOP -+/* */ -+#undef HAVE_ODBC_H + echo $ac_n "checking for the location of libz""... $ac_c" 1>&6 +-echo "configure:103439: checking for the location of libz" >&5 ++echo "configure:104422: checking for the location of libz" >&5 + # Check whether --with-zlib-dir or --without-zlib-dir was given. + if test "${with_zlib_dir+set}" = set; then + withval="$with_zlib_dir" +@@ -103901,7 +104884,7 @@ + + for php_typename in int8 uint8 int16 uint16 int32 uint32 uchar ulong int8_t uint8_t int16_t uint16_t int32_t uint32_t int64_t uint64_t; do + echo $ac_n "checking whether $php_typename exists""... $ac_c" 1>&6 +-echo "configure:103905: checking whether $php_typename exists" >&5 ++echo "configure:104888: checking whether $php_typename exists" >&5 + + php_cache_value=php_cv_sizeof_$php_typename + if eval "test \"`echo '$''{'php_cv_sizeof_$php_typename'+set}'`\" = set"; then +@@ -103918,7 +104901,7 @@ --/* Define to 1 if you have the `shutdown' function. */ --#undef HAVE_SHUTDOWN -+/* */ -+#undef HAVE_ODBCSDK_H + else + cat > conftest.$ac_ext < + #if STDC_HEADERS +@@ -103948,7 +104931,7 @@ + } + + EOF +-if { (eval echo configure:103952: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:104935: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + eval $php_cache_value=`cat conftestval` +@@ -104088,7 +105071,7 @@ + done --/* */ --#undef HAVE_SIGACTION -+/* */ -+#undef HAVE_IODBC_H + echo $ac_n "checking for hash_insert in -l$MYSQL_LIBNAME""... $ac_c" 1>&6 +-echo "configure:104092: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 ++echo "configure:105075: checking for hash_insert in -l$MYSQL_LIBNAME" >&5 + ac_lib_var=`echo $MYSQL_LIBNAME'_'hash_insert | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -104096,7 +105079,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-l$MYSQL_LIBNAME $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:105094: \"$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 +@@ -104209,7 +105192,7 @@ + php_with_pear=DEFAULT --/* Define to 1 if you have the header file. */ --#undef HAVE_SIGNAL_H -+/* */ -+#undef HAVE_SQLUNIX_H + echo $ac_n "checking whether to install PEAR""... $ac_c" 1>&6 +-echo "configure:104213: checking whether to install PEAR" >&5 ++echo "configure:105196: checking whether to install PEAR" >&5 + # Check whether --with-pear or --without-pear was given. + if test "${with_pear+set}" = set; then + withval="$with_pear" +@@ -104311,7 +105294,7 @@ + bison_version=none + if test "$YACC"; then + echo $ac_n "checking for bison version""... $ac_c" 1>&6 +-echo "configure:104315: checking for bison version" >&5 ++echo "configure:105298: checking for bison version" >&5 + if eval "test \"`echo '$''{'php_cv_bison_version'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -104367,17 +105350,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:104371: checking for $ac_hdr" >&5 ++echo "configure:105354: 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:104381: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:105364: \"$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* +@@ -104405,12 +105388,12 @@ --/* Define to 1 if you have the `sigprocmask' function. */ --#undef HAVE_SIGPROCMASK -+/* */ -+#undef HAVE_SQLTYPES_H --/* Define to 1 if you have the `sigsetjmp' function. */ --#undef HAVE_SIGSETJMP -+/* */ -+#undef HAVE_SQLUCODE_H + echo $ac_n "checking for size_t""... $ac_c" 1>&6 +-echo "configure:104409: checking for size_t" >&5 ++echo "configure:105392: 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 +@@ -104438,12 +105421,12 @@ + fi --/* Define to 1 if you have the `sigtimedwait' function. */ --#undef HAVE_SIGTIMEDWAIT -+/* */ -+#undef HAVE_SQL_H + echo $ac_n "checking return type of signal handlers""... $ac_c" 1>&6 +-echo "configure:104442: checking return type of signal handlers" >&5 ++echo "configure:105425: 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 +@@ -104460,7 +105443,7 @@ + int i; + ; return 0; } + EOF +-if { (eval echo configure:104464: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:105447: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_type_signal=void + else +@@ -104484,12 +105467,12 @@ --/* Define to 1 if you have the `sigwaitinfo' function. */ --#undef HAVE_SIGWAITINFO -+/* */ -+#undef HAVE_ISQL_H --/* */ --#undef HAVE_SIMPLEXML -+/* */ -+#undef HAVE_SQLEXT_H + echo $ac_n "checking for uint""... $ac_c" 1>&6 +-echo "configure:104488: checking for uint" >&5 ++echo "configure:105471: 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 +@@ -104517,12 +105500,12 @@ + fi --/* Define to 1 if you have the `sin' function. */ --#undef HAVE_SIN -+/* */ -+#undef HAVE_ISQLEXT_H + echo $ac_n "checking for ulong""... $ac_c" 1>&6 +-echo "configure:104521: checking for ulong" >&5 ++echo "configure:105504: 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 +@@ -104552,9 +105535,9 @@ --/* */ --#undef HAVE_SNMP -+/* */ -+#undef HAVE_UDBCEXT_H --/* */ --#undef HAVE_SNMP_PARSE_OID -+/* */ -+#undef HAVE_SQLCLI1_H + echo $ac_n "checking for int32_t""... $ac_c" 1>&6 +-echo "configure:104556: checking for int32_t" >&5 ++echo "configure:105539: checking for int32_t" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:105560: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h <&6 +-echo "configure:104596: checking for uint32_t" >&5 ++echo "configure:105579: checking for uint32_t" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:105600: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + cat >> confdefs.h < header file. */ --#undef HAVE_STDARG_H -+/* Older PostgreSQL */ -+#undef HAVE_PQOIDVALUE - --/* Define to 1 if you have the header file. */ --#undef HAVE_STDARG_PROTOTYPES -+/* PostgreSQL 7.0.x or later */ -+#undef HAVE_PQCLIENTENCODING - --/* Define to 1 if you have the header file. */ --#undef HAVE_STDBOOL_H -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQPARAMETERSTATUS - --/* Define to 1 if you have the header file. */ --#undef HAVE_STDINT_H -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQPROTOCOLVERSION - --/* Define to 1 if you have the header file. */ --#undef HAVE_STDIO_H -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PGTRANSACTIONSTATUS - --/* Define to 1 if you have the header file. */ --#undef HAVE_STDLIB_H -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQEXECPARAMS - --/* Define to 1 if you have the `std_syslog' function. */ --#undef HAVE_STD_SYSLOG -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQPREPARE - --/* */ --#undef HAVE_STMT_NEXT_RESULT -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQEXECPREPARED - --/* Define to 1 if you have the `strcasecmp' function. */ --#undef HAVE_STRCASECMP -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQRESULTERRORFIELD - --/* Define to 1 if you have the `strcoll' function. */ --#undef HAVE_STRCOLL -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQSENDQUERYPARAMS - --/* Define to 1 if you have the `strdup' function. */ --#undef HAVE_STRDUP -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQSENDPREPARE - --/* Define to 1 if you have the `strerror' function. */ --#undef HAVE_STRERROR -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQSENDQUERYPREPARED - --/* Define to 1 if you have the `strfmon' function. */ --#undef HAVE_STRFMON -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQPUTCOPYDATA - --/* Define to 1 if you have the `strftime' function. */ --#undef HAVE_STRFTIME -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQPUTCOPYEND - --/* Define to 1 if you have the header file. */ --#undef HAVE_STRINGS_H -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQGETCOPYDATA - --/* Define to 1 if you have the header file. */ --#undef HAVE_STRING_H -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQFREEMEM - --/* Define to 1 if you have the `strlcat' function. */ --#undef HAVE_STRLCAT -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQSETERRORVERBOSITY - --/* Define to 1 if you have the `strlcpy' function. */ --#undef HAVE_STRLCPY -+/* PostgreSQL 7.4 or later */ -+#undef HAVE_PQFTABLE - --/* Define to 1 if you have the `strndup' function. */ --#undef HAVE_STRNDUP -+/* PostgreSQL 8.1.4 or later */ -+#undef HAVE_PQESCAPE_CONN - --/* Define to 1 if you have the `strnlen' function. */ --#undef HAVE_STRNLEN -+/* PostgreSQL 8.1.4 or later */ -+#undef HAVE_PQESCAPE_BYTEA_CONN - --/* Define to 1 if you have the `strpbrk' function. */ --#undef HAVE_STRPBRK -+/* Whether libpq is compiled with --enable-multibyte */ -+#undef HAVE_PGSQL_WITH_MULTIBYTE_SUPPORT - --/* Define to 1 if you have the `strpncpy' function. */ --#undef HAVE_STRPNCPY -+/* PostgreSQL 8.1 or later */ -+#undef HAVE_PG_LO_CREATE - --/* Define to 1 if you have the `strptime' function. */ --#undef HAVE_STRPTIME -+/* PostgreSQL 8.4 or later */ -+#undef HAVE_PG_LO_IMPORT_WITH_OID - --/* whether strptime() declaration fails */ --#undef HAVE_STRPTIME_DECL_FAILS -+/* Whether to build pgsql as dynamic module */ -+#undef COMPILE_DL_PGSQL - --/* Define to 1 if you have the `strstr' function. */ --#undef HAVE_STRSTR -+/* Whether to build phar as dynamic module */ -+#undef COMPILE_DL_PHAR - --/* Define to 1 if you have the `strtod' function. */ --#undef HAVE_STRTOD -+/* */ -+#undef PHAR_HASH_OK + echo $ac_n "checking for vprintf""... $ac_c" 1>&6 +-echo "configure:104636: checking for vprintf" >&5 ++echo "configure:105619: 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:105647: \"$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 +@@ -104684,12 +105667,12 @@ --/* Define to 1 if `st_blksize' is member of `struct stat'. */ --#undef HAVE_STRUCT_STAT_ST_BLKSIZE -+/* */ -+#undef HAVE_LIBREADLINE + if test "$ac_cv_func_vprintf" != yes; then + echo $ac_n "checking for _doprnt""... $ac_c" 1>&6 +-echo "configure:104688: checking for _doprnt" >&5 ++echo "configure:105671: 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 < header file. */ --#undef HAVE_ST_H -+/* Whether Reflection is enabled */ -+#undef HAVE_REFLECTION - --/* Define to 1 if your `struct stat' has `st_rdev'. Deprecated, use -- `HAVE_STRUCT_STAT_ST_RDEV' instead. */ --#undef HAVE_ST_RDEV -+/* Whether to build reflection as dynamic module */ -+#undef COMPILE_DL_REFLECTION - --/* */ --#undef HAVE_SYBASE_CT -+/* */ -+#undef HAVE_PWRITE + ; return 0; } + EOF +-if { (eval echo configure:104716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:105699: \"$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 +@@ -104737,7 +105720,7 @@ + fi --/* Define to 1 if you have the `symlink' function. */ --#undef HAVE_SYMLINK -+/* whether pwrite64 is default */ -+#undef PHP_PWRITE_64 + echo $ac_n "checking for 8-bit clean memcmp""... $ac_c" 1>&6 +-echo "configure:104741: checking for 8-bit clean memcmp" >&5 ++echo "configure:105724: 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 +@@ -104745,7 +105728,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:105742: \"$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 +@@ -104775,19 +105758,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:104779: checking for working alloca.h" >&5 ++echo "configure:105762: 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:104791: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:105774: \"$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 +@@ -104808,12 +105791,12 @@ + fi --/* Define to 1 if you have the header file. */ --#undef HAVE_SYSEXITS_H -+/* Whether you have libmm */ -+#undef HAVE_LIBMM + echo $ac_n "checking for alloca""... $ac_c" 1>&6 +-echo "configure:104812: checking for alloca" >&5 ++echo "configure:105795: 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 < header file. */ --#undef HAVE_SYSLOG_H -+/* */ -+#undef HAVE_SHMOP + #ifdef __GNUC__ +@@ -104841,7 +105824,7 @@ + char *p = (char *) alloca(1); + ; return 0; } + EOF +-if { (eval echo configure:104845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:105828: \"$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 +@@ -104873,12 +105856,12 @@ --/* */ --#undef HAVE_SYSVMSG -+/* Whether to build shmop as dynamic module */ -+#undef COMPILE_DL_SHMOP --/* */ --#undef HAVE_SYSVSEM -+/* */ -+#undef HAVE_LIBXML + echo $ac_n "checking whether alloca needs Cray hooks""... $ac_c" 1>&6 +-echo "configure:104877: checking whether alloca needs Cray hooks" >&5 ++echo "configure:105860: 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:104907: checking for $ac_func" >&5 ++echo "configure:105890: 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:105918: \"$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 +@@ -104958,7 +105941,7 @@ + fi --/* Define to 1 if you have the header file, and it defines `DIR'. -- */ --#undef HAVE_SYS_DIR_H -+/* Whether to build simplexml as dynamic module */ -+#undef COMPILE_DL_SIMPLEXML + echo $ac_n "checking stack direction for C alloca""... $ac_c" 1>&6 +-echo "configure:104962: checking stack direction for C alloca" >&5 ++echo "configure:105945: 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 +@@ -104966,7 +105949,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:105972: \"$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 +@@ -105009,12 +105992,12 @@ + for ac_func in memcpy strdup getpid kill strtod strtol finite fpclass sigsetjmp + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:105013: checking for $ac_func" >&5 ++echo "configure:105996: 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 < header file. */ --#undef HAVE_SYS_FILE_H -+/* */ -+#undef HAVE_NET_SNMP + ; return 0; } + EOF +-if { (eval echo configure:105041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106024: \"$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 +@@ -105063,7 +106046,7 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_IOCTL_H -+/* */ -+#undef HAVE_SNMP_PARSE_OID --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_IPC_H -+/* */ -+#undef HAVE_SNMP + echo $ac_n "checking whether sprintf is broken""... $ac_c" 1>&6 +-echo "configure:105067: checking whether sprintf is broken" >&5 ++echo "configure:106050: 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 +@@ -105074,11 +106057,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:106065: \"$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 +@@ -105112,12 +106095,12 @@ + for ac_func in finite isfinite isinf isnan + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:105116: checking for $ac_func" >&5 ++echo "configure:106099: 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 < header file. */ --#undef HAVE_SYS_LOADAVG_H -+/* */ -+#undef UCD_SNMP_HACK + ; return 0; } + EOF +-if { (eval echo configure:105144: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106127: \"$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 +@@ -105167,13 +106150,13 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_MKDEV_H -+/* Whether to build snmp as dynamic module */ -+#undef COMPILE_DL_SNMP --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_MMAN_H -+/* */ -+#undef HAVE_LIBXML + echo $ac_n "checking whether fp_except is defined""... $ac_c" 1>&6 +-echo "configure:105171: checking whether fp_except is defined" >&5 ++echo "configure:106154: 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 < header file. */ --#undef HAVE_SYS_MOUNT_H -+/* */ -+#undef HAVE_SOAP + #include +@@ -105184,7 +106167,7 @@ --/* Define to 1 if you have the header file, and it defines `DIR'. -- */ --#undef HAVE_SYS_NDIR_H -+/* Whether to build soap as dynamic module */ -+#undef COMPILE_DL_SOAP + ; return 0; } + EOF +-if { (eval echo configure:105188: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:106171: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + + ac_cv_type_fp_except=yes +@@ -105211,9 +106194,9 @@ --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_PARAM_H -+/* Whether you have struct cmsghdr */ -+#undef HAVE_CMSGHDR --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_POLL_H -+/* */ -+#undef MISSING_MSGHDR_MSGFLAGS + echo $ac_n "checking for usable _FPU_SETCW""... $ac_c" 1>&6 +-echo "configure:105215: checking for usable _FPU_SETCW" >&5 ++echo "configure:106198: checking for usable _FPU_SETCW" >&5 + cat > conftest.$ac_ext < header file. */ --#undef HAVE_SYS_RESOURCE_H -+/* */ -+#undef HAVE_SOCKETS - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_SELECT_H -+/* Whether to build sockets as dynamic module */ -+#undef COMPILE_DL_SOCKETS - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_SOCKET_H -+/* Whether struct _zend_object_value is packed */ -+#undef HAVE_PACKED_OBJECT_VALUE - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_STATFS_H -+/* Whether you want SPL (Standard PHP Library) support */ -+#undef HAVE_SPL - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_STATVFS_H -+/* Whether to build spl as dynamic module */ -+#undef COMPILE_DL_SPL - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_STAT_H -+/* Have PDO */ -+#undef PHP_SQLITE2_HAVE_PDO - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_SYSEXITS_H -+/* Whether to build sqlite as dynamic module */ -+#undef COMPILE_DL_SQLITE - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_TIMES_H -+/* Size of a pointer */ -+#undef SQLITE_PTR_SZ - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_TIME_H -+/* */ -+#undef SQLITE_UTF8 + #include +@@ -105233,7 +106216,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:105237: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106220: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cfp_have__fpu_setcw=yes + else +@@ -105254,9 +106237,9 @@ + fi + + echo $ac_n "checking for usable fpsetprec""... $ac_c" 1>&6 +-echo "configure:105258: checking for usable fpsetprec" >&5 ++echo "configure:106241: checking for usable fpsetprec" >&5 + cat > conftest.$ac_ext < header file. */ --#undef HAVE_SYS_TYPES_H -+/* Define if flush should be called explicitly after a buffered io. */ -+#undef HAVE_FLUSHIO + #include +@@ -105275,7 +106258,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:105279: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106262: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cfp_have_fpsetprec=yes + else +@@ -105296,9 +106279,9 @@ + fi --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_UIO_H -+/* */ -+#undef HAVE_CRYPT - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_UN_H -+/* whether the compiler supports __alignof__ */ -+#undef HAVE_ALIGNOF - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_UTSNAME_H -+/* whether the compiler supports __attribute__ ((__aligned__)) */ -+#undef HAVE_ATTRIBUTE_ALIGNED - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_VARARGS_H -+/* Whether PHP has to use its own crypt_r for blowfish, des, ext des and md5 */ -+#undef PHP_USE_PHP_CRYPT_R - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_VFS_H -+/* Whether the system supports standard DES salt */ -+#undef PHP_STD_DES_CRYPT - --/* Define to 1 if you have the header file. */ --#undef HAVE_SYS_WAIT_H -+/* Whether the system supports BlowFish salt */ -+#undef PHP_BLOWFISH_CRYPT - --/* Define to 1 if you have the `tempnam' function. */ --#undef HAVE_TEMPNAM -+/* Whether the system supports extended DES salt */ -+#undef PHP_EXT_DES_CRYPT - --/* Define to 1 if you have the header file. */ --#undef HAVE_TERMIOS_H -+/* Whether the system supports MD5 salt */ -+#undef PHP_MD5_CRYPT - --/* */ --#undef HAVE_TIDY -+/* Whether the system supports SHA512 salt */ -+#undef PHP_SHA512_CRYPT - --/* */ --#undef HAVE_TIDYOPTGETDOC -+/* Whether the system supports SHA256 salt */ -+#undef PHP_SHA256_CRYPT - --/* do we have times? */ --#undef HAVE_TIMES -+/* Whether the system supports standard DES salt */ -+#undef PHP_STD_DES_CRYPT - --/* Define to 1 if you have the header file. */ --#undef HAVE_TIME_H -+/* Whether the system supports BlowFish salt */ -+#undef PHP_BLOWFISH_CRYPT - --/* whether you have tm_gmtoff in struct tm */ --#undef HAVE_TM_GMTOFF -+/* Whether the system supports extended DES salt */ -+#undef PHP_EXT_DES_CRYPT - --/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use -- `HAVE_STRUCT_TM_TM_ZONE' instead. */ --#undef HAVE_TM_ZONE -+/* Whether the system supports MD5 salt */ -+#undef PHP_MD5_CRYPT - --/* Whether you have a working ttyname_r */ --#undef HAVE_TTYNAME_R -+/* Whether the system supports SHA512 salt */ -+#undef PHP_SHA512_CRYPT - --/* Define to 1 if you have the header file. */ --#undef HAVE_TUXMODULE_H -+/* Whether the system supports SHA256 salt */ -+#undef PHP_SHA256_CRYPT - --/* Define to 1 if you don't have `tm_zone' but do have the external array -- `tzname'. */ --#undef HAVE_TZNAME -+/* Whether PHP has to use its own crypt_r for blowfish, des and ext des */ -+#undef PHP_USE_PHP_CRYPT_R - --/* Define to 1 if you have the `tzset' function. */ --#undef HAVE_TZSET -+/* Define if your system has fork/vfork/CreateProcess */ -+#undef PHP_CAN_SUPPORT_PROC_OPEN - --/* */ --#undef HAVE_UDBCEXT_H -+/* Whether to enable chroot() function */ -+#undef ENABLE_CHROOT_FUNC - --/* Define if uint32_t type is present. */ --#undef HAVE_UINT32_T -+/* */ -+#undef HAVE_RES_NSEARCH + echo $ac_n "checking for usable _controlfp""... $ac_c" 1>&6 +-echo "configure:105300: checking for usable _controlfp" >&5 ++echo "configure:106283: checking for usable _controlfp" >&5 + cat > conftest.$ac_ext < header file. */ --#undef HAVE_UNISTD_H -+/* */ -+#undef HAVE_RES_NSEARCH + #include +@@ -105317,7 +106300,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:105321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106304: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cfp_have__controlfp=yes + else +@@ -105338,9 +106321,9 @@ + fi --/* */ --#undef HAVE_UNIXODBC -+/* */ -+#undef HAVE_LIBRESOLV + echo $ac_n "checking for usable _controlfp_s""... $ac_c" 1>&6 +-echo "configure:105342: checking for usable _controlfp_s" >&5 ++echo "configure:106325: checking for usable _controlfp_s" >&5 + cat > conftest.$ac_ext < header file. */ --#undef HAVE_UNIX_H -+/* */ -+#undef HAVE_RES_NSEARCH + #include +@@ -105360,7 +106343,7 @@ + + ; return 0; } + EOF +-if { (eval echo configure:105364: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106347: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cfp_have__controlfp_s=yes + else +@@ -105381,9 +106364,9 @@ + fi --/* Define to 1 if you have the `unlockpt' function. */ --#undef HAVE_UNLOCKPT -+/* */ -+#undef HAVE_LIBBIND + echo $ac_n "checking whether FPU control word can be manipulated by inline assembler""... $ac_c" 1>&6 +-echo "configure:105385: checking whether FPU control word can be manipulated by inline assembler" >&5 ++echo "configure:106368: checking whether FPU control word can be manipulated by inline assembler" >&5 + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:106392: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + ac_cfp_have_fpu_inline_asm_x86=yes + else +@@ -105427,7 +106410,7 @@ --/* */ --#undef HAVE_UODBC -+/* */ -+#undef HAVE_LIBSOCKET --/* Define to 1 if you have the `usleep' function. */ --#undef HAVE_USLEEP -+/* */ -+#undef HAVE_DNS_SEARCH + echo $ac_n "checking whether double cast to long preserves least significant bits""... $ac_c" 1>&6 +-echo "configure:105431: checking whether double cast to long preserves least significant bits" >&5 ++echo "configure:106414: checking whether double cast to long preserves least significant bits" >&5 --/* Define to 1 if you have the `utime' function. */ --#undef HAVE_UTIME -+/* */ -+#undef HAVE_DNS_SEARCH + if test "$cross_compiling" = yes; then + +@@ -105435,7 +106418,7 @@ --/* Define to 1 if you have the `utimes' function. */ --#undef HAVE_UTIMES -+/* */ -+#undef HAVE_LIBRESOLV + else + cat > conftest.$ac_ext < header file. */ --#undef HAVE_UTIME_H -+/* */ -+#undef HAVE_DNS_SEARCH + #include +@@ -105459,7 +106442,7 @@ + } --/* Define to 1 if `utime(file, NULL)' sets file's timestamp to the present. */ --#undef HAVE_UTIME_NULL -+/* */ -+#undef HAVE_LIBBIND + EOF +-if { (eval echo configure:105463: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:106446: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + cat >> confdefs.h <<\EOF +@@ -105485,17 +106468,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:105489: checking for $ac_hdr" >&5 ++echo "configure:106472: 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:105499: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:106482: \"$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* +@@ -105523,14 +106506,14 @@ --/* Wether struct utsname has domainname */ --#undef HAVE_UTSNAME_DOMAINNAME -+/* */ -+#undef HAVE_DNS_SEARCH --/* Define to 1 if you have the `vasprintf' function. */ --#undef HAVE_VASPRINTF -+/* */ -+#undef HAVE_LIBSOCKET + echo $ac_n "checking whether dlsym() requires a leading underscore in symbol names""... $ac_c" 1>&6 +-echo "configure:105527: checking whether dlsym() requires a leading underscore in symbol names" >&5 ++echo "configure:106510: checking whether dlsym() requires a leading underscore in symbol names" >&5 + if test "$cross_compiling" = yes; then : + + else + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:106580: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -105676,23 +106659,23 @@ --/* Define to 1 if you have the `vsnprintf' function. */ --#undef HAVE_VSNPRINTF -+/* */ -+#undef HAVE_DN_EXPAND --/* Define to 1 if you have the `wait3' function. */ --#undef HAVE_WAIT3 -+/* */ -+#undef HAVE_LIBRESOLV + echo $ac_n "checking virtual machine dispatch method""... $ac_c" 1>&6 +-echo "configure:105680: checking virtual machine dispatch method" >&5 ++echo "configure:106663: checking virtual machine dispatch method" >&5 + echo "$ac_t""$PHP_ZEND_VM" 1>&6 --/* */ --#undef HAVE_WAITPID -+/* */ -+#undef HAVE_DN_EXPAND + echo $ac_n "checking whether to enable thread-safety""... $ac_c" 1>&6 +-echo "configure:105684: checking whether to enable thread-safety" >&5 ++echo "configure:106667: checking whether to enable thread-safety" >&5 + echo "$ac_t""$ZEND_MAINTAINER_ZTS" 1>&6 --/* Define to 1 if you have the header file. */ --#undef HAVE_WCHAR_H -+/* */ -+#undef HAVE_LIBBIND + echo $ac_n "checking whether to enable inline optimization for GCC""... $ac_c" 1>&6 +-echo "configure:105688: checking whether to enable inline optimization for GCC" >&5 ++echo "configure:106671: checking whether to enable inline optimization for GCC" >&5 + echo "$ac_t""$ZEND_INLINE_OPTIMIZATION" 1>&6 --/* */ --#undef HAVE_WDDX -+/* */ -+#undef HAVE_DN_EXPAND + echo $ac_n "checking whether to enable Zend debugging""... $ac_c" 1>&6 +-echo "configure:105692: checking whether to enable Zend debugging" >&5 ++echo "configure:106675: checking whether to enable Zend debugging" >&5 + echo "$ac_t""$ZEND_DEBUG" 1>&6 --/* */ --#undef HAVE_XML -+/* */ -+#undef HAVE_LIBSOCKET + echo $ac_n "checking whether to enable Zend multibyte""... $ac_c" 1>&6 +-echo "configure:105696: checking whether to enable Zend multibyte" >&5 ++echo "configure:106679: checking whether to enable Zend multibyte" >&5 + echo "$ac_t""$ZEND_MULTIBYTE" 1>&6 --/* Define to 1 if you have the header file. */ --#undef HAVE_XMLPARSE_H -+/* */ -+#undef HAVE_DN_SKIPNAME + case $PHP_ZEND_VM in +@@ -105765,21 +106748,21 @@ --/* */ --#undef HAVE_XMLREADER -+/* */ -+#undef HAVE_DN_SKIPNAME --/* */ --#undef HAVE_XMLRPC -+/* */ -+#undef HAVE_LIBRESOLV + echo $ac_n "checking for inline""... $ac_c" 1>&6 +-echo "configure:105769: checking for inline" >&5 ++echo "configure:106752: 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 < header file. */ --#undef HAVE_XMLTOK_H -+/* */ -+#undef HAVE_DN_SKIPNAME + int main() { + } $ac_kw foo() { + ; return 0; } + EOF +-if { (eval echo configure:105783: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:106766: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + rm -rf conftest* + ac_cv_c_inline=$ac_kw; break + else +@@ -105808,7 +106791,7 @@ --/* */ --#undef HAVE_XMLWRITER -+/* */ -+#undef HAVE_LIBBIND --/* */ --#undef HAVE_XSL -+/* */ -+#undef HAVE_DN_SKIPNAME + echo $ac_n "checking target system is Darwin""... $ac_c" 1>&6 +-echo "configure:105812: checking target system is Darwin" >&5 ++echo "configure:106795: checking target system is Darwin" >&5 + if echo "$target" | grep "darwin" > /dev/null; then + cat >> confdefs.h <<\EOF + #define DARWIN 1 +@@ -105820,7 +106803,7 @@ + fi --/* */ --#undef HAVE_XSL_EXSLT -+/* */ -+#undef HAVE_LIBSOCKET + echo $ac_n "checking for MM alignment and log values""... $ac_c" 1>&6 +-echo "configure:105824: checking for MM alignment and log values" >&5 ++echo "configure:106807: checking for MM alignment and log values" >&5 --/* */ --#undef HAVE_YP_GET_DEFAULT_DOMAIN -+/* */ -+#undef HAVE_RES_SEARCH + if test "$cross_compiling" = yes; then + +@@ -105828,7 +106811,7 @@ --/* */ --#undef HAVE_ZIP -+/* */ -+#undef HAVE_RES_SEARCH + else + cat > conftest.$ac_ext < +@@ -105864,7 +106847,7 @@ + } --/* whether _controlfp is present usable */ --#undef HAVE__CONTROLFP -+/* */ -+#undef HAVE_RES_SEARCH + EOF +-if { (eval echo configure:105868: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:106851: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + LIBZEND_MM_ALIGN=`cat conftest.zend | cut -d ' ' -f 1` +@@ -105889,7 +106872,7 @@ + echo "$ac_t""done" 1>&6 --/* whether _controlfp_s is present and usable */ --#undef HAVE__CONTROLFP_S -+/* */ -+#undef HAVE_LIBBIND + echo $ac_n "checking for memory allocation using mmap(MAP_ANON)""... $ac_c" 1>&6 +-echo "configure:105893: checking for memory allocation using mmap(MAP_ANON)" >&5 ++echo "configure:106876: checking for memory allocation using mmap(MAP_ANON)" >&5 --/* whether _FPU_SETCW is present and usable */ --#undef HAVE__FPU_SETCW -+/* */ -+#undef HAVE_RES_SEARCH + if test "$cross_compiling" = yes; then + +@@ -105897,7 +106880,7 @@ --/* */ --#undef HPUX -+/* */ -+#undef HAVE_LIBSOCKET - --/* */ --#undef HSREGEX -+/* whether atof() accepts NAN */ -+#undef HAVE_ATOF_ACCEPTS_NAN - --/* iconv() is aliased to libiconv() in -liconv */ --#undef ICONV_ALIASED_LIBICONV -+/* whether atof() accepts INF */ -+#undef HAVE_ATOF_ACCEPTS_INF - --/* Whether iconv supports error no or not */ --#undef ICONV_SUPPORTS_ERRNO -+/* whether HUGE_VAL == INF */ -+#undef HAVE_HUGE_VAL_INF - --/* */ --#undef ISOLARIS -+/* whether HUGE_VAL + -HUGEVAL == NAN */ -+#undef HAVE_HUGE_VAL_NAN - --/* */ --#undef LINUX -+/* whether strptime() declaration fails */ -+#undef HAVE_STRPTIME_DECL_FAILS - --/* */ --#undef MAGIC_QUOTES -+/* Define if your system has mbstate_t in wchar.h */ -+#undef HAVE_MBSTATE_T - --/* Whether asctime_r is declared */ --#undef MISSING_ASCTIME_R_DECL -+/* Whether to build standard as dynamic module */ -+#undef COMPILE_DL_STANDARD - --/* Whether ctime_r is declared */ --#undef MISSING_CTIME_R_DECL -+/* */ -+#undef HAVE_SYBASE_CT + else + cat > conftest.$ac_ext < +@@ -105933,7 +106916,7 @@ + } --/* Whether gmtime_r is declared */ --#undef MISSING_GMTIME_R_DECL -+/* */ -+#undef HAVE_SYSVMSG + EOF +-if { (eval echo configure:105937: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:106920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + cat >> confdefs.h <<\EOF +@@ -105955,7 +106938,7 @@ --/* Whether localtime_r is declared */ --#undef MISSING_LOCALTIME_R_DECL -+/* Whether to build sysvmsg as dynamic module */ -+#undef COMPILE_DL_SYSVMSG --/* */ --#undef MISSING_MSGHDR_MSGFLAGS -+/* Whether to build sysvsem as dynamic module */ -+#undef COMPILE_DL_SYSVSEM + echo $ac_n "checking for memory allocation using mmap("/dev/zero")""... $ac_c" 1>&6 +-echo "configure:105959: checking for memory allocation using mmap("/dev/zero")" >&5 ++echo "configure:106942: checking for memory allocation using mmap("/dev/zero")" >&5 --/* Whether strtok_r is declared */ --#undef MISSING_STRTOK_R_DECL -+/* */ -+#undef HAVE_SYSVSEM + if test "$cross_compiling" = yes; then + +@@ -105963,7 +106946,7 @@ --/* Whether mysqlnd is enabled */ --#undef MYSQLI_USE_MYSQLND -+/* */ -+#undef HAVE_SEMUN + else + cat > conftest.$ac_ext < +@@ -106009,7 +106992,7 @@ + } --/* Enable SSL support */ --#undef MYSQLND_SSL_SUPPORTED -+/* */ -+#undef HAVE_SYSVSHM -+ -+/* Whether to build sysvshm as dynamic module */ -+#undef COMPILE_DL_SYSVSHM + EOF +-if { (eval echo configure:106013: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:106996: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + cat >> confdefs.h <<\EOF +@@ -106033,12 +107016,12 @@ + for ac_func in mremap + do + echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 +-echo "configure:106037: checking for $ac_func" >&5 ++echo "configure:107020: 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:107048: \"$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 +@@ -106128,17 +107111,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:106132: checking for $ac_hdr" >&5 ++echo "configure:107115: 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:106142: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:107125: \"$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* +@@ -106215,7 +107198,7 @@ + --/* */ --#undef NDBM_INCLUDE_FILE -+/* Whether to build tidy as dynamic module */ -+#undef COMPILE_DL_TIDY + echo $ac_n "checking for GNU Pth""... $ac_c" 1>&6 +-echo "configure:106219: checking for GNU Pth" >&5 ++echo "configure:107202: 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 +@@ -106245,17 +107228,17 @@ + do + ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` + echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 +-echo "configure:106249: checking for $ac_hdr" >&5 ++echo "configure:107232: 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:106259: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:107242: \"$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* +@@ -106285,7 +107268,7 @@ --/* */ --#undef NEUTRINO -+/* */ -+#undef HAVE_TIDY + LIBS="$LIBS -lst" + echo $ac_n "checking for SGI's State Threads""... $ac_c" 1>&6 +-echo "configure:106289: checking for SGI's State Threads" >&5 ++echo "configure:107272: checking for SGI's State Threads" >&5 + echo "$ac_t""yes" 1>&6 + cat >> confdefs.h <<\EOF + #define TSRM_ST 1 +@@ -106324,7 +107307,7 @@ --/* Define to 1 if your C compiler doesn't accept -c and -o together. */ --#undef NO_MINUS_C_MINUS_O -+/* Whether to build tokenizer as dynamic module */ -+#undef COMPILE_DL_TOKENIZER + else + cat > conftest.$ac_ext < +@@ -106342,7 +107325,7 @@ + return pthread_create(&thd, NULL, thread_routine, &data); + } + EOF +-if { (eval echo configure:106346: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:107329: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + pthreads_working=yes +@@ -106362,7 +107345,7 @@ + CFLAGS=$save_CFLAGS --/* Define to the full name of this package. */ --#undef PACKAGE_NAME -+/* */ -+#undef HAVE_LIBEXPAT + echo $ac_n "checking for pthreads_cflags""... $ac_c" 1>&6 +-echo "configure:106366: checking for pthreads_cflags" >&5 ++echo "configure:107349: 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 +@@ -106384,7 +107367,7 @@ --/* Define to the full name and version of this package. */ --#undef PACKAGE_STRING -+/* */ -+#undef HAVE_WDDX + else + cat > conftest.$ac_ext < +@@ -106402,7 +107385,7 @@ + return pthread_create(&thd, NULL, thread_routine, &data); + } + EOF +-if { (eval echo configure:106406: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:107389: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + pthreads_working=yes +@@ -106432,7 +107415,7 @@ + echo "$ac_t""$ac_cv_pthreads_cflags" 1>&6 --/* Define to the version of this package. */ --#undef PACKAGE_VERSION -+/* */ -+#undef HAVE_LIBXML + echo $ac_n "checking for pthreads_lib""... $ac_c" 1>&6 +-echo "configure:106436: checking for pthreads_lib" >&5 ++echo "configure:107419: 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 +@@ -106454,7 +107437,7 @@ --/* */ --#undef PDO_MYSQL_UNIX_ADDR -+/* */ -+#undef HAVE_LIBEXPAT + else + cat > conftest.$ac_ext < +@@ -106472,7 +107455,7 @@ + return pthread_create(&thd, NULL, thread_routine, &data); + } + EOF +-if { (eval echo configure:106476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null ++if { (eval echo configure:107459: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null + then + + pthreads_working=yes +@@ -106523,7 +107506,7 @@ --/* */ --#undef PHAR_HASH_OK -+/* */ -+#undef HAVE_XML --/* */ --#undef PHAR_HAVE_OPENSSL -+/* */ -+#undef HAVE_LIBXML + echo $ac_n "checking for POSIX threads""... $ac_c" 1>&6 +-echo "configure:106527: checking for POSIX threads" >&5 ++echo "configure:107510: checking for POSIX threads" >&5 + echo "$ac_t""yes" 1>&6 + fi --/* */ --#undef PHP_APACHE_HAVE_CLIENT_FD -+/* */ -+#undef HAVE_XMLREADER +@@ -107157,7 +108140,7 @@ --/* Whether the system supports BlowFish salt */ --#undef PHP_BLOWFISH_CRYPT -+/* Whether to build xmlreader as dynamic module */ -+#undef COMPILE_DL_XMLREADER --/* PHP build date */ --#undef PHP_BUILD_DATE -+/* */ -+#undef HAVE_XMLRPC + echo $ac_n "checking build system type""... $ac_c" 1>&6 +-echo "configure:107161: checking build system type" >&5 ++echo "configure:108144: checking build system type" >&5 --/* Define if your system has fork/vfork/CreateProcess */ --#undef PHP_CAN_SUPPORT_PROC_OPEN -+/* */ -+#undef HAVE_LIBXML + build_alias=$build + case "$build_alias" in +@@ -107186,7 +108169,7 @@ + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 +-echo "configure:107190: checking for ld used by $CC" >&5 ++echo "configure:108173: checking for ld used by $CC" >&5 + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -107216,10 +108199,10 @@ + esac + elif test "$with_gnu_ld" = yes; then + echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 +-echo "configure:107220: checking for GNU ld" >&5 ++echo "configure:108203: checking for GNU ld" >&5 + else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +-echo "configure:107223: checking for non-GNU ld" >&5 ++echo "configure:108206: checking for non-GNU ld" >&5 + fi + if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -107258,7 +108241,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:107262: checking if the linker ($LD) is GNU ld" >&5 ++echo "configure:108245: checking if the linker ($LD) is GNU ld" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -107278,7 +108261,7 @@ --/* */ --#undef PHP_CURL_URL_WRAPPERS -+/* */ -+#undef HAVE_LIBEXPAT --/* Whether the system supports extended DES salt */ --#undef PHP_EXT_DES_CRYPT -+/* */ -+#undef HAVE_LIBICONV + echo $ac_n "checking for $LD option to reload object files""... $ac_c" 1>&6 +-echo "configure:107282: checking for $LD option to reload object files" >&5 ++echo "configure:108265: checking for $LD option to reload object files" >&5 + if eval "test \"`echo '$''{'lt_cv_ld_reload_flag'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -107303,7 +108286,7 @@ + esac --/* fpm group name */ --#undef PHP_FPM_GROUP -+/* */ -+#undef HAVE_GICONV_H + echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6 +-echo "configure:107307: checking for BSD-compatible nm" >&5 ++echo "configure:108290: checking for BSD-compatible nm" >&5 + if eval "test \"`echo '$''{'lt_cv_path_NM'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -107356,7 +108339,7 @@ + NM="$lt_cv_path_NM" --/* fpm user name */ --#undef PHP_FPM_USER -+/* */ -+#undef HAVE_LIBICONV + echo $ac_n "checking how to recognize dependent libraries""... $ac_c" 1>&6 +-echo "configure:107360: checking how to recognize dependent libraries" >&5 ++echo "configure:108343: checking how to recognize dependent libraries" >&5 + if eval "test \"`echo '$''{'lt_cv_deplibs_check_method'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -107548,13 +108531,13 @@ + test -z "$deplibs_check_method" && deplibs_check_method=unknown --/* Whether you have HP-UX 10.x */ --#undef PHP_HPUX_TIME_R -+/* iconv() is aliased to libiconv() in -liconv */ -+#undef ICONV_ALIASED_LIBICONV + echo $ac_n "checking for object suffix""... $ac_c" 1>&6 +-echo "configure:107552: checking for object suffix" >&5 ++echo "configure:108535: checking for object suffix" >&5 + if eval "test \"`echo '$''{'ac_cv_objext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else + rm -f conftest* + echo 'int i = 1;' > conftest.$ac_ext +-if { (eval echo configure:107558: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:108541: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + for ac_file in conftest.*; do + case $ac_file in + *.c) ;; +@@ -107574,7 +108557,7 @@ --/* Path to iconv.h */ --#undef PHP_ICONV_H_PATH -+/* */ -+#undef HAVE_ICONV --/* Which iconv implementation to use */ --#undef PHP_ICONV_IMPL -+/* */ -+#undef UNDEF_THREADS_HACK + echo $ac_n "checking for executable suffix""... $ac_c" 1>&6 +-echo "configure:107578: checking for executable suffix" >&5 ++echo "configure:108561: checking for executable suffix" >&5 + if eval "test \"`echo '$''{'ac_cv_exeext'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -107584,10 +108567,10 @@ + rm -f conftest* + echo 'int main () { return 0; }' > conftest.$ac_ext + ac_cv_exeext= +- if { (eval echo configure:107588: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then ++ if { (eval echo configure:108571: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }; then + for file in conftest.*; do + case $file in +- *.c | *.o | *.obj) ;; ++ *.$ac_ext | *.c | *.o | *.obj) ;; + *) ac_cv_exeext=`echo $file | sed -e s/conftest//` ;; + esac + done +@@ -107630,7 +108613,7 @@ + ia64-*-hpux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo configure:107634: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:108617: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case `/usr/bin/file conftest.$ac_objext` in + *ELF-32*) + HPUX_IA64_MODE="32" +@@ -107644,8 +108627,8 @@ + ;; + *-*-irix6*) + # Find out which ABI we are using. +- echo '#line 107648 "configure"' > conftest.$ac_ext +- if { (eval echo configure:107649: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ echo '#line 108631 "configure"' > conftest.$ac_ext ++ if { (eval echo configure:108632: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + if test "$lt_cv_prog_gnu_ld" = yes; then + case `/usr/bin/file conftest.$ac_objext` in + *32-bit*) +@@ -107679,7 +108662,7 @@ + s390*-*linux*|sparc*-*linux*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo configure:107683: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:108666: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case `/usr/bin/file conftest.o` in + *32-bit*) + case $host in +@@ -107729,7 +108712,7 @@ + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS -belf" + echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6 +-echo "configure:107733: checking whether the C compiler needs -belf" >&5 ++echo "configure:108716: 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 +@@ -107742,14 +108725,14 @@ + cross_compiling=$ac_cv_prog_cc_cross --/* Whether you have IRIX-style functions */ --#undef PHP_IRIX_TIME_R -+/* Whether to build xmlrpc as dynamic module */ -+#undef COMPILE_DL_XMLRPC + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:108736: \"$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 +@@ -107777,7 +108760,7 @@ + sparc*-*solaris*) + # Find out which ABI we are using. + echo 'int i;' > conftest.$ac_ext +- if { (eval echo configure:107781: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:108764: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + case `/usr/bin/file conftest.o` in + *64-bit*) + case $lt_cv_prog_gnu_ld in +@@ -107806,7 +108789,7 @@ + ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) || + (test "X$CXX" != "Xg++"))) ; then + echo $ac_n "checking how to run the C++ preprocessor""... $ac_c" 1>&6 +-echo "configure:107810: checking how to run the C++ preprocessor" >&5 ++echo "configure:108793: 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 +@@ -107819,12 +108802,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:107828: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } ++{ (eval echo configure:108811: \"$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 + : +@@ -107854,7 +108837,7 @@ + # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers! + # find the maximum length of command line arguments + echo $ac_n "checking the maximum length of command line arguments""... $ac_c" 1>&6 +-echo "configure:107858: checking the maximum length of command line arguments" >&5 ++echo "configure:108841: checking the maximum length of command line arguments" >&5 + if eval "test \"`echo '$''{'lt_cv_sys_max_cmd_len'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -107976,7 +108959,7 @@ --/* */ --#undef PHP_MYSQL_UNIX_SOCK_ADDR -+/* */ -+#undef HAVE_XMLWRITER + # Check for command to grab the raw symbol name followed by C symbol from nm. + echo $ac_n "checking command to parse $NM output from $compiler object""... $ac_c" 1>&6 +-echo "configure:107980: checking command to parse $NM output from $compiler object" >&5 ++echo "configure:108963: checking command to parse $NM output from $compiler object" >&5 + if eval "test \"`echo '$''{'lt_cv_sys_global_symbol_pipe'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108080,10 +109063,10 @@ + int main(){nm_test_var='a';nm_test_func();return(0);} + EOF --/* */ --#undef PHP_OCI8_DEF_DIR -+/* Whether to build xmlwriter as dynamic module */ -+#undef COMPILE_DL_XMLWRITER +- if { (eval echo configure:108084: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++ if { (eval echo configure:109067: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + # Now try to grab the symbols. + nlist=conftest.nm +- if { (eval echo configure:108087: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then ++ if { (eval echo configure:109070: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\") 1>&5; (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5; } && test -s "$nlist"; then + # Try sorting and uniquifying the output. + if sort "$nlist" | uniq > "$nlist"T; then + mv -f "$nlist"T "$nlist" +@@ -108134,7 +109117,7 @@ + lt_save_CFLAGS="$CFLAGS" + LIBS="conftstm.$ac_objext" + CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag" +- if { (eval echo configure:108138: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++ if { (eval echo configure:109121: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + pipe_works=yes + fi + LIBS="$lt_save_LIBS" +@@ -108174,7 +109157,7 @@ + fi --/* */ --#undef PHP_OCI8_DEF_SHARED_LIBADD -+/* */ -+#undef HAVE_XSL_EXSLT + echo $ac_n "checking for objdir""... $ac_c" 1>&6 +-echo "configure:108178: checking for objdir" >&5 ++echo "configure:109161: checking for objdir" >&5 + if eval "test \"`echo '$''{'lt_cv_objdir'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108240,7 +109223,7 @@ + # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args. + set dummy ${ac_tool_prefix}ar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:108244: checking for $ac_word" >&5 ++echo "configure:109227: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108272,7 +109255,7 @@ + # Extract the first word of "ar", so it can be a program name with args. + set dummy ar; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:108276: checking for $ac_word" >&5 ++echo "configure:109259: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108307,7 +109290,7 @@ + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. + set dummy ${ac_tool_prefix}ranlib; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:108311: checking for $ac_word" >&5 ++echo "configure:109294: 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 +@@ -108339,7 +109322,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:108343: checking for $ac_word" >&5 ++echo "configure:109326: 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 +@@ -108374,7 +109357,7 @@ + # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args. + set dummy ${ac_tool_prefix}strip; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:108378: checking for $ac_word" >&5 ++echo "configure:109361: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108406,7 +109389,7 @@ + # Extract the first word of "strip", so it can be a program name with args. + set dummy strip; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:108410: checking for $ac_word" >&5 ++echo "configure:109393: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_STRIP'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108493,7 +109476,7 @@ + file_magic*) + if test "$file_magic_cmd" = '$MAGIC_CMD'; then + echo $ac_n "checking for ${ac_tool_prefix}file""... $ac_c" 1>&6 +-echo "configure:108497: checking for ${ac_tool_prefix}file" >&5 ++echo "configure:109480: checking for ${ac_tool_prefix}file" >&5 + if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108553,7 +109536,7 @@ + if test -z "$lt_cv_path_MAGIC_CMD"; then + if test -n "$ac_tool_prefix"; then + echo $ac_n "checking for file""... $ac_c" 1>&6 +-echo "configure:108557: checking for file" >&5 ++echo "configure:109540: checking for file" >&5 + if eval "test \"`echo '$''{'lt_cv_path_MAGIC_CMD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108625,7 +109608,7 @@ + # Extract the first word of "${ac_tool_prefix}dsymutil", so it can be a program name with args. + set dummy ${ac_tool_prefix}dsymutil; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:108629: checking for $ac_word" >&5 ++echo "configure:109612: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108657,7 +109640,7 @@ + # Extract the first word of "dsymutil", so it can be a program name with args. + set dummy dsymutil; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:108661: checking for $ac_word" >&5 ++echo "configure:109644: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_DSYMUTIL'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108692,7 +109675,7 @@ + # Extract the first word of "${ac_tool_prefix}nmedit", so it can be a program name with args. + set dummy ${ac_tool_prefix}nmedit; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:108696: checking for $ac_word" >&5 ++echo "configure:109679: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108724,7 +109707,7 @@ + # Extract the first word of "nmedit", so it can be a program name with args. + set dummy nmedit; ac_word=$2 + echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +-echo "configure:108728: checking for $ac_word" >&5 ++echo "configure:109711: checking for $ac_word" >&5 + if eval "test \"`echo '$''{'ac_cv_prog_NMEDIT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108758,7 +109741,7 @@ --/* define to 1 if oniguruma has an invalid entry for KOI8 encoding */ --#undef PHP_ONIG_BAD_KOI8_ENTRY -+/* */ -+#undef HAVE_XSL --/* Define to 1 if the bundled oniguruma is used */ --#undef PHP_ONIG_BUNDLED -+/* Whether to build xsl as dynamic module */ -+#undef COMPILE_DL_XSL + echo $ac_n "checking for -single_module linker flag""... $ac_c" 1>&6 +-echo "configure:108762: checking for -single_module linker flag" >&5 ++echo "configure:109745: checking for -single_module linker flag" >&5 + if eval "test \"`echo '$''{'lt_cv_apple_cc_single_mod'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108781,7 +109764,7 @@ --/* uname output */ --#undef PHP_OS -+/* */ -+#undef HAVE_ZIP + echo "$ac_t""$lt_cv_apple_cc_single_mod" 1>&6 + echo $ac_n "checking for -exported_symbols_list linker flag""... $ac_c" 1>&6 +-echo "configure:108785: checking for -exported_symbols_list linker flag" >&5 ++echo "configure:109768: checking for -exported_symbols_list linker flag" >&5 + if eval "test \"`echo '$''{'lt_cv_ld_exported_symbols_list'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108791,12 +109774,12 @@ + LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym" + + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:109783: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + lt_cv_ld_exported_symbols_list=yes + rm -rf conftest* + else +@@ -108930,7 +109913,7 @@ --/* */ --#undef PHP_PDO_OCI_CLIENT_VERSION -+/* Whether to build zip as dynamic module */ -+#undef COMPILE_DL_ZIP + + echo $ac_n "checking if $compiler supports -fno-rtti -fno-exceptions""... $ac_c" 1>&6 +-echo "configure:108934: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 ++echo "configure:109917: checking if $compiler supports -fno-rtti -fno-exceptions" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_compiler_rtti_exceptions'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -108947,11 +109930,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"configure:108951: $lt_compile\"" >&5) ++ (eval echo "\"configure:109934: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "configure:108955: \$? = $ac_status" >&5 ++ echo "configure:109938: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -108980,7 +109963,7 @@ + lt_prog_compiler_static= --/* whether pread64 is default */ --#undef PHP_PREAD_64 -+/* */ -+#undef HTTP_SHARED_DEPS + echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 +-echo "configure:108984: checking for $compiler option to produce PIC" >&5 ++echo "configure:109967: checking for $compiler option to produce PIC" >&5 + + if test "$GCC" = yes; then + lt_prog_compiler_wl='-Wl,' +@@ -109227,7 +110210,7 @@ + if test -n "$lt_prog_compiler_pic"; then + + echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic works""... $ac_c" 1>&6 +-echo "configure:109231: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 ++echo "configure:110214: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -109244,11 +110227,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"configure:109248: $lt_compile\"" >&5) ++ (eval echo "\"configure:110231: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "configure:109252: \$? = $ac_status" >&5 ++ echo "configure:110235: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -109290,7 +110273,7 @@ + # + wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\" + echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 +-echo "configure:109294: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo "configure:110277: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -109328,7 +110311,7 @@ --/* whether pwrite64 is default */ --#undef PHP_PWRITE_64 -+/* */ -+#undef HTTP_SHARED_DEPS --/* */ --#undef PHP_SAFE_MODE -+/* */ -+#undef HAVE_GETHOSTNAME + echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 +-echo "configure:109332: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo "configure:110315: checking if $compiler supports -c -o file.$ac_objext" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -109348,11 +110331,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"configure:109352: $lt_compile\"" >&5) ++ (eval echo "\"configure:110335: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "configure:109356: \$? = $ac_status" >&5 ++ echo "configure:110339: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -109382,7 +110365,7 @@ + if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 +-echo "configure:109386: checking if we can lock with hard links" >&5 ++echo "configure:110369: checking if we can lock with hard links" >&5 + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no +@@ -109399,7 +110382,7 @@ + fi --/* */ --#undef PHP_SAFE_MODE_EXEC_DIR -+/* */ -+#undef HAVE_GETHOSTNAME + echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 +-echo "configure:109403: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo "configure:110386: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --/* Whether the system supports SHA256 salt */ --#undef PHP_SHA256_CRYPT -+/* */ -+#undef HAVE_LIBNSL + runpath_var= + allow_undefined_flag= +@@ -109810,12 +110793,12 @@ + # Determine the default libpath from the value encoded in an empty executable. + + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:110802: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -109848,12 +110831,12 @@ + # Determine the default libpath from the value encoded in an empty executable. + + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:110840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -110343,11 +111326,11 @@ + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 +-echo "configure:110347: checking whether -lc should be explicitly linked in" >&5 ++echo "configure:111330: checking whether -lc should be explicitly linked in" >&5 + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext --/* Whether the system supports SHA512 salt */ --#undef PHP_SHA512_CRYPT -+/* */ -+#undef HAVE_GETDOMAINNAME +- if { (eval echo configure:110351: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then ++ if { (eval echo configure:111334: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -110361,7 +111344,7 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag + allow_undefined_flag= +- if { (eval echo configure:110365: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } ++ if { (eval echo configure:111348: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + then + archive_cmds_need_lc=no + else +@@ -110380,7 +111363,7 @@ + esac --/* */ --#undef PHP_SIGCHILD -+/* */ -+#undef HAVE_GETDOMAINNAME + echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 +-echo "configure:110384: checking dynamic linker characteristics" >&5 ++echo "configure:111367: checking dynamic linker characteristics" >&5 + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -111005,7 +111988,7 @@ + fi --/* Have PDO */ --#undef PHP_SQLITE2_HAVE_PDO -+/* */ -+#undef HAVE_LIBNSL + echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 +-echo "configure:111009: checking how to hardcode library paths into programs" >&5 ++echo "configure:111992: checking how to hardcode library paths into programs" >&5 + hardcode_action= + if test -n "$hardcode_libdir_flag_spec" || \ + test -n "$runpath_var" || \ +@@ -111043,7 +112026,7 @@ + striplib= + old_striplib= + echo $ac_n "checking whether stripping libraries is possible""... $ac_c" 1>&6 +-echo "configure:111047: checking whether stripping libraries is possible" >&5 ++echo "configure:112030: checking whether stripping libraries is possible" >&5 + if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then + test -z "$old_striplib" && old_striplib="$STRIP --strip-debug" + test -z "$striplib" && striplib="$STRIP --strip-unneeded" +@@ -111094,7 +112077,7 @@ + darwin*) + # if libdl is installed we need to link against it + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:111098: checking for dlopen in -ldl" >&5 ++echo "configure:112081: 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 +@@ -111102,7 +112085,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:112100: \"$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 +@@ -111142,12 +112125,12 @@ --/* Whether the system supports standard DES salt */ --#undef PHP_STD_DES_CRYPT -+/* */ -+#undef HAVE_GETSERVBYPORT + *) + echo $ac_n "checking for shl_load""... $ac_c" 1>&6 +-echo "configure:111146: checking for shl_load" >&5 ++echo "configure:112129: checking for shl_load" >&5 + if eval "test \"`echo '$''{'ac_cv_func_shl_load'+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:112157: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + eval "ac_cv_func_shl_load=yes" + else +@@ -111188,7 +112171,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for shl_load in -ldld""... $ac_c" 1>&6 +-echo "configure:111192: checking for shl_load in -ldld" >&5 ++echo "configure:112175: checking for shl_load in -ldld" >&5 + ac_lib_var=`echo dld'_'shl_load | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -111196,7 +112179,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112194: \"$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 +@@ -111226,12 +112209,12 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen""... $ac_c" 1>&6 +-echo "configure:111230: checking for dlopen" >&5 ++echo "configure:112213: 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:112241: \"$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 +@@ -111272,7 +112255,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen in -ldl""... $ac_c" 1>&6 +-echo "configure:111276: checking for dlopen in -ldl" >&5 ++echo "configure:112259: 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 +@@ -111280,7 +112263,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:112278: \"$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 +@@ -111310,7 +112293,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dlopen in -lsvld""... $ac_c" 1>&6 +-echo "configure:111314: checking for dlopen in -lsvld" >&5 ++echo "configure:112297: checking for dlopen in -lsvld" >&5 + ac_lib_var=`echo svld'_'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 +@@ -111318,7 +112301,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-lsvld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112316: \"$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 +@@ -111348,7 +112331,7 @@ + else + echo "$ac_t""no" 1>&6 + echo $ac_n "checking for dld_link in -ldld""... $ac_c" 1>&6 +-echo "configure:111352: checking for dld_link in -ldld" >&5 ++echo "configure:112335: checking for dld_link in -ldld" >&5 + ac_lib_var=`echo dld'_'dld_link | sed 'y%./+-%__p_%'` + if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -111356,7 +112339,7 @@ + ac_save_LIBS="$LIBS" + LIBS="-ldld $LIBS" + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:112354: \"$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 +@@ -111423,7 +112406,7 @@ + LIBS="$lt_cv_dlopen_libs $LIBS" --/* whether write(2) works */ --#undef PHP_WRITE_STDOUT -+/* */ -+#undef HAVE_GETSERVBYNAME + echo $ac_n "checking whether a program can dlopen itself""... $ac_c" 1>&6 +-echo "configure:111427: checking whether a program can dlopen itself" >&5 ++echo "configure:112410: checking whether a program can dlopen itself" >&5 + if eval "test \"`echo '$''{'lt_cv_dlopen_self'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -111433,7 +112416,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:112483: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -111519,7 +112502,7 @@ + if test "x$lt_cv_dlopen_self" = xyes; then + wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\" + echo $ac_n "checking whether a statically linked program can dlopen itself""... $ac_c" 1>&6 +-echo "configure:111523: checking whether a statically linked program can dlopen itself" >&5 ++echo "configure:112506: checking whether a statically linked program can dlopen itself" >&5 + if eval "test \"`echo '$''{'lt_cv_dlopen_self_static'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -111529,7 +112512,7 @@ + lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 + lt_status=$lt_dlunknown + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then ++ if { (eval echo configure:112579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} 2>/dev/null; then + (./conftest; exit; ) >&5 2>/dev/null + lt_status=$? + case x$lt_status in +@@ -111633,11 +112616,11 @@ --/* */ --#undef QDBM_INCLUDE_FILE -+/* Have zlib support */ -+#undef HTTP_HAVE_ZLIB + # Report which library types will actually be built + echo $ac_n "checking if libtool supports shared libraries""... $ac_c" 1>&6 +-echo "configure:111637: checking if libtool supports shared libraries" >&5 ++echo "configure:112620: checking if libtool supports shared libraries" >&5 + echo "$ac_t""$can_build_shared" 1>&6 --/* */ --#undef REGEX -+/* */ -+#undef HTTP_HAVE_SSL + echo $ac_n "checking whether to build shared libraries""... $ac_c" 1>&6 +-echo "configure:111641: checking whether to build shared libraries" >&5 ++echo "configure:112624: checking whether to build shared libraries" >&5 + test "$can_build_shared" = "no" && enable_shared=no --/* Define as the return type of signal handlers (`int' or `void'). */ --#undef RETSIGTYPE -+/* */ -+#undef HTTP_HAVE_OPENSSL + # On AIX, shared libraries and static libraries use the same namespace, and +@@ -111660,7 +112643,7 @@ + echo "$ac_t""$enable_shared" 1>&6 --/* Whether to use Roxen in ZTS mode */ --#undef ROXEN_USE_ZTS -+/* */ -+#undef HTTP_HAVE_GNUTLS + echo $ac_n "checking whether to build static libraries""... $ac_c" 1>&6 +-echo "configure:111664: checking whether to build static libraries" >&5 ++echo "configure:112647: checking whether to build static libraries" >&5 + # Make sure either enable_shared or enable_static is yes. + test "$enable_shared" = yes || enable_static=yes + echo "$ac_t""$enable_static" 1>&6 +@@ -112346,7 +113329,7 @@ + if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + echo $ac_n "checking for ld used by $CC""... $ac_c" 1>&6 +-echo "configure:112350: checking for ld used by $CC" >&5 ++echo "configure:113333: checking for ld used by $CC" >&5 + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw +@@ -112376,10 +113359,10 @@ + esac + elif test "$with_gnu_ld" = yes; then + echo $ac_n "checking for GNU ld""... $ac_c" 1>&6 +-echo "configure:112380: checking for GNU ld" >&5 ++echo "configure:113363: checking for GNU ld" >&5 + else + echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6 +-echo "configure:112383: checking for non-GNU ld" >&5 ++echo "configure:113366: checking for non-GNU ld" >&5 + fi + if eval "test \"`echo '$''{'lt_cv_path_LD'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +@@ -112418,7 +113401,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:112422: checking if the linker ($LD) is GNU ld" >&5 ++echo "configure:113405: checking if the linker ($LD) is GNU ld" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_gnu_ld'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -112484,7 +113467,7 @@ --/* The size of `char', as computed by sizeof. */ --#undef SIZEOF_CHAR -+/* path to bundled SSL CA info */ -+#undef HTTP_CURL_CAINFO + # PORTME: fill in a description of your system's C++ link characteristics + echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 +-echo "configure:112488: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo "configure:113471: checking whether the $compiler linker ($LD) supports shared libraries" >&5 + ld_shlibs_CXX=yes + case $host_os in + aix3*) +@@ -112582,12 +113565,12 @@ + # Determine the default libpath from the value encoded in an empty executable. + + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:113574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -112621,12 +113604,12 @@ + # Determine the default libpath from the value encoded in an empty executable. + + cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ++if { (eval echo configure:113613: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + + lt_aix_libpath_sed=' + /Import File Strings/,/^$/ { +@@ -113393,7 +114376,7 @@ + }; + EOF --/* The size of `char *', as computed by sizeof. */ --#undef SIZEOF_CHAR_P -+/* Have cURL support */ -+#undef HTTP_HAVE_CURL +-if { (eval echo configure:113397: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then ++if { (eval echo configure:114380: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then + # Parse the compiler output and extract the necessary + # objects, libraries and library flags. --/* The size of `int', as computed by sizeof. */ --#undef SIZEOF_INT -+/* */ -+#undef HAVE_CURL_SHARE_STRERROR +@@ -113549,7 +114532,7 @@ + lt_prog_compiler_static_CXX= --/* Size of intmax_t */ --#undef SIZEOF_INTMAX_T -+/* */ -+#undef HAVE_CURL_MULTI_STRERROR + echo $ac_n "checking for $compiler option to produce PIC""... $ac_c" 1>&6 +-echo "configure:113553: checking for $compiler option to produce PIC" >&5 ++echo "configure:114536: checking for $compiler option to produce PIC" >&5 + + # C++ specific cases for pic, static, wl, etc. + if test "$GXX" = yes; then +@@ -113846,7 +114829,7 @@ + if test -n "$lt_prog_compiler_pic_CXX"; then + + echo $ac_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works""... $ac_c" 1>&6 +-echo "configure:113850: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 ++echo "configure:114833: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_compiler_pic_works_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -113863,11 +114846,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"configure:113867: $lt_compile\"" >&5) ++ (eval echo "\"configure:114850: $lt_compile\"" >&5) + (eval "$lt_compile" 2>conftest.err) + ac_status=$? + cat conftest.err >&5 +- echo "configure:113871: \$? = $ac_status" >&5 ++ echo "configure:114854: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s "$ac_outfile"; then + # The compiler can only warn and ignore the option if not recognized + # So say no if there are warnings other than the usual output. +@@ -113909,7 +114892,7 @@ + # + wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\" + echo $ac_n "checking if $compiler static flag $lt_tmp_static_flag works""... $ac_c" 1>&6 +-echo "configure:113913: checking if $compiler static flag $lt_tmp_static_flag works" >&5 ++echo "configure:114896: checking if $compiler static flag $lt_tmp_static_flag works" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_compiler_static_works_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -113947,7 +114930,7 @@ --/* The size of `long', as computed by sizeof. */ --#undef SIZEOF_LONG -+/* */ -+#undef HAVE_CURL_EASY_STRERROR --/* The size of `long int', as computed by sizeof. */ --#undef SIZEOF_LONG_INT -+/* */ -+#undef HAVE_CURL_EASY_RESET + echo $ac_n "checking if $compiler supports -c -o file.$ac_objext""... $ac_c" 1>&6 +-echo "configure:113951: checking if $compiler supports -c -o file.$ac_objext" >&5 ++echo "configure:114934: checking if $compiler supports -c -o file.$ac_objext" >&5 + if eval "test \"`echo '$''{'lt_cv_prog_compiler_c_o_CXX'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 + else +@@ -113967,11 +114950,11 @@ + -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ + -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ + -e 's:$: $lt_compiler_flag:'` +- (eval echo "\"configure:113971: $lt_compile\"" >&5) ++ (eval echo "\"configure:114954: $lt_compile\"" >&5) + (eval "$lt_compile" 2>out/conftest.err) + ac_status=$? + cat out/conftest.err >&5 +- echo "configure:113975: \$? = $ac_status" >&5 ++ echo "configure:114958: \$? = $ac_status" >&5 + if (exit $ac_status) && test -s out/conftest2.$ac_objext + then + # The compiler can only warn and ignore the option if not recognized +@@ -114001,7 +114984,7 @@ + if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then + # do not overwrite the value of need_locks provided by the user + echo $ac_n "checking if we can lock with hard links""... $ac_c" 1>&6 +-echo "configure:114005: checking if we can lock with hard links" >&5 ++echo "configure:114988: checking if we can lock with hard links" >&5 + hard_links=yes + $rm conftest* + ln conftest.a conftest.b 2>/dev/null && hard_links=no +@@ -114018,7 +115001,7 @@ + fi --/* The size of `long long', as computed by sizeof. */ --#undef SIZEOF_LONG_LONG -+/* */ -+#undef HAVE_CURL_FORMGET + echo $ac_n "checking whether the $compiler linker ($LD) supports shared libraries""... $ac_c" 1>&6 +-echo "configure:114022: checking whether the $compiler linker ($LD) supports shared libraries" >&5 ++echo "configure:115005: checking whether the $compiler linker ($LD) supports shared libraries" >&5 --/* The size of `long long int', as computed by sizeof. */ --#undef SIZEOF_LONG_LONG_INT -+/* */ -+#undef HAVE_CURL_MULTI_SETOPT + export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols' + case $host_os in +@@ -114064,11 +115047,11 @@ + # systems, -lgcc has to come before -lc. If gcc already passes -lc + # to ld, don't add -lc before -lgcc. + echo $ac_n "checking whether -lc should be explicitly linked in""... $ac_c" 1>&6 +-echo "configure:114068: checking whether -lc should be explicitly linked in" >&5 ++echo "configure:115051: checking whether -lc should be explicitly linked in" >&5 + $rm conftest* + echo "$lt_simple_compile_test_code" > conftest.$ac_ext --/* Size of ptrdiff_t */ --#undef SIZEOF_PTRDIFF_T -+/* */ -+#undef HAVE_CURL_MULTI_TIMEOUT +- if { (eval echo configure:114072: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then ++ if { (eval echo configure:115055: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; } 2>conftest.err; then + soname=conftest + lib=conftest + libobjs=conftest.$ac_objext +@@ -114082,7 +115065,7 @@ + libname=conftest + lt_save_allow_undefined_flag=$allow_undefined_flag_CXX + allow_undefined_flag_CXX= +- if { (eval echo configure:114086: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } ++ if { (eval echo configure:115069: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\") 1>&5; (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5; } + then + archive_cmds_need_lc_CXX=no + else +@@ -114101,7 +115084,7 @@ + esac --/* The size of `short', as computed by sizeof. */ --#undef SIZEOF_SHORT -+/* */ -+#undef HTTP_EVENT_VERSION + echo $ac_n "checking dynamic linker characteristics""... $ac_c" 1>&6 +-echo "configure:114105: checking dynamic linker characteristics" >&5 ++echo "configure:115088: checking dynamic linker characteristics" >&5 + library_names_spec= + libname_spec='lib$name' + soname_spec= +@@ -114674,7 +115657,7 @@ + fi --/* The size of `size_t', as computed by sizeof. */ --#undef SIZEOF_SIZE_T -+/* Have libevent support for cURL */ -+#undef HTTP_HAVE_EVENT + echo $ac_n "checking how to hardcode library paths into programs""... $ac_c" 1>&6 +-echo "configure:114678: checking how to hardcode library paths into programs" >&5 ++echo "configure:115661: checking how to hardcode library paths into programs" >&5 + hardcode_action_CXX= + if test -n "$hardcode_libdir_flag_spec_CXX" || \ + test -n "$runpath_var_CXX" || \ +--- a/generated_lists ++++ b/generated_lists +@@ -1,3 +1,3 @@ + makefile_am_files = Zend/Makefile.am TSRM/Makefile.am + config_h_files = Zend/acconfig.h TSRM/acconfig.h +-config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/recode/config9.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite/config.m4 ext/sqlite3/config0.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 ++config_m4_files = Zend/Zend.m4 TSRM/tsrm.m4 TSRM/threads.m4 Zend/acinclude.m4 ext/apc/config.m4 ext/bcmath/config.m4 ext/bz2/config.m4 ext/calendar/config.m4 ext/ctype/config.m4 ext/curl/config.m4 ext/date/config0.m4 ext/dba/config.m4 ext/dom/config.m4 ext/enchant/config.m4 ext/ereg/config0.m4 ext/exif/config.m4 ext/fileinfo/config.m4 ext/filter/config.m4 ext/ftp/config.m4 ext/gd/config.m4 ext/gettext/config.m4 ext/gmp/config.m4 ext/hash/config.m4 ext/iconv/config.m4 ext/imap/config.m4 ext/interbase/config.m4 ext/intl/config.m4 ext/json/config.m4 ext/ldap/config.m4 ext/libxml/config0.m4 ext/mbstring/config.m4 ext/mcrypt/config.m4 ext/mssql/config.m4 ext/mysql/config.m4 ext/mysqli/config.m4 ext/mysqlnd/config9.m4 ext/oci8/config.m4 ext/odbc/config.m4 ext/openssl/config0.m4 ext/pcntl/config.m4 ext/pcre/config0.m4 ext/pdo/config.m4 ext/pdo_dblib/config.m4 ext/pdo_firebird/config.m4 ext/pdo_mysql/config.m4 ext/pdo_oci/config.m4 ext/pdo_odbc/config.m4 ext/pdo_pgsql/config.m4 ext/pdo_sqlite/config.m4 ext/pgsql/config.m4 ext/phar/config.m4 ext/posix/config.m4 ext/pspell/config.m4 ext/readline/config.m4 ext/recode/config.m4 ext/recode/config9.m4 ext/reflection/config.m4 ext/session/config.m4 ext/shmop/config.m4 ext/simplexml/config.m4 ext/snmp/config.m4 ext/soap/config.m4 ext/sockets/config.m4 ext/spl/config.m4 ext/sqlite/config.m4 ext/sqlite3/config0.m4 ext/standard/config.m4 ext/sybase_ct/config.m4 ext/sysvmsg/config.m4 ext/sysvsem/config.m4 ext/sysvshm/config.m4 ext/tidy/config.m4 ext/tokenizer/config.m4 ext/wddx/config.m4 ext/xml/config.m4 ext/xmlreader/config.m4 ext/xmlrpc/config.m4 ext/xmlwriter/config.m4 ext/xsl/config.m4 ext/zip/config.m4 ext/zlib/config0.m4 sapi/aolserver/config.m4 sapi/apache/config.m4 sapi/apache2filter/config.m4 sapi/apache2handler/config.m4 sapi/apache_hooks/config.m4 sapi/caudium/config.m4 sapi/cli/config.m4 sapi/continuity/config.m4 sapi/embed/config.m4 sapi/fpm/config.m4 sapi/isapi/config.m4 sapi/litespeed/config.m4 sapi/milter/config.m4 sapi/nsapi/config.m4 sapi/phttpd/config.m4 sapi/pi3web/config.m4 sapi/roxen/config.m4 sapi/thttpd/config.m4 sapi/tux/config.m4 sapi/webjames/config.m4 +--- a/main/php_config.h.in ++++ b/main/php_config.h.in +@@ -1,4 +1,4 @@ +-/* main/php_config.h.in. Generated automatically from configure.in by autoheader. */ ++/* main/php_config.h.in. Generated automatically from configure.in by autoheader 2.13. */ + /* Leave this file alone */ + /* + +----------------------------------------------------------------------+ +@@ -1325,6 +1325,51 @@ + /* */ + #undef HAVE_ZLIB --/* Size of ssize_t */ --#undef SIZEOF_SSIZE_T +/* */ -+#undef HAVE_CURL_MULTI_SOCKET_ACTION - --/* */ --#undef SOLARIS ++#undef APC_MMAP ++ +/* */ -+#undef HTTP_EVENT_VERSION - --/* have sqlite3 with extension support */ --#undef SQLITE_OMIT_LOAD_EXTENSION -+/* Have libevent support for cURL */ -+#undef HTTP_HAVE_EVENT - --/* Size of a pointer */ --#undef SQLITE_PTR_SZ ++#undef APC_FILEHITS ++ +/* */ -+#undef HAVE_CURL_MULTI_SOCKET_ACTION - --/* */ --#undef SQLITE_UTF8 -+/* Have magic mime support */ -+#undef HTTP_HAVE_MAGIC - --/* Needed in sqlunix.h for wchar defs */ --#undef SS_FBX -+/* Have ext/hash support */ -+#undef HTTP_HAVE_PHP_HASH_H - --/* Needed in sqlunix.h */ --#undef SS_LINUX -+/* Have ext/hash support */ -+#undef HTTP_HAVE_PHP_HASH_H - --/* If using the C implementation of alloca, define if you know the -- direction of stack growth for your system; otherwise it will be -- automatically deduced at runtime. -- STACK_DIRECTION > 0 => grows toward higher addresses -- STACK_DIRECTION < 0 => grows toward lower addresses -- STACK_DIRECTION = 0 => direction of growth unknown */ --#undef STACK_DIRECTION -+/* Whether to build http as dynamic module */ -+#undef COMPILE_DL_HTTP - --/* Define to 1 if you have the ANSI C header files. */ --#undef STDC_HEADERS -+/* Have extended HTTP support */ -+#undef HAVE_HTTP - --/* Define to 1 if you can safely include both and . */ --#undef TIME_WITH_SYS_TIME -+/* Enable compressed protocol support */ -+#undef MYSQLND_COMPRESSION_WANTED - --/* Define to 1 if your declares `struct tm'. */ --#undef TM_IN_SYS_TIME -+/* Enable SSL support */ -+#undef MYSQLND_SSL_SUPPORTED - --/* */ --#undef TSRM_ST -+/* Whether to build mysqlnd as dynamic module */ -+#undef COMPILE_DL_MYSQLND - --/* */ --#undef UCD_SNMP_HACK -+/* Define if int32_t type is present. */ -+#undef HAVE_INT32_T - --/* */ --#undef UNDEF_THREADS_HACK -+/* Define if uint32_t type is present. */ -+#undef HAVE_UINT32_T - --/* */ --#undef UNIXWARE -+/* Whether sprintf is broken */ -+#undef ZEND_BROKEN_SPRINTF - --/* whether to check multibyte regex backtrack */ --#undef USE_COMBINATION_EXPLOSION_CHECK -+/* whether floatingpoint.h defines fp_except */ -+#undef HAVE_FP_EXCEPT - --/* */ --#undef USE_GD_IMGSTRTTF -+/* whether _FPU_SETCW is present and usable */ -+#undef HAVE__FPU_SETCW - --/* */ --#undef USE_GD_JISX0208 -+/* whether fpsetprec is present and usable */ -+#undef HAVE_FPSETPREC - --/* Define if cross-process locking is required by accept() */ --#undef USE_LOCKING -+/* whether _controlfp is present usable */ -+#undef HAVE__CONTROLFP - --/* Enable extensions on AIX 3, Interix. */ --#ifndef _ALL_SOURCE --# undef _ALL_SOURCE --#endif --/* Enable GNU extensions on systems that have them. */ --#ifndef _GNU_SOURCE --# undef _GNU_SOURCE --#endif --/* Enable threading extensions on Solaris. */ --#ifndef _POSIX_PTHREAD_SEMANTICS --# undef _POSIX_PTHREAD_SEMANTICS --#endif --/* Enable extensions on HP NonStop. */ --#ifndef _TANDEM_SOURCE --# undef _TANDEM_SOURCE --#endif --/* Enable general extensions on Solaris. */ --#ifndef __EXTENSIONS__ --# undef __EXTENSIONS__ --#endif -+/* whether _controlfp_s is present and usable */ -+#undef HAVE__CONTROLFP_S - -+/* whether FPU control word can be manipulated by inline assembler */ -+#undef HAVE_FPU_INLINE_ASM_X86 - --/* */ --#undef USE_TRANSFER_TABLES -+/* Define if double cast to long preserves least significant bits */ -+#undef ZEND_DVAL_TO_LVAL_CAST_OK - --/* whether you want Pi3Web support */ --#undef WITH_PI3WEB -+/* Define if dlsym() requires a leading underscore in symbol names. */ -+#undef DLSYM_NEEDS_UNDERSCORE - --/* */ --#undef WITH_ZEUS -+/* virtual machine dispatch method */ -+#undef ZEND_VM_KIND - --/* Define if processor uses big-endian word */ --#undef WORDS_BIGENDIAN -+/* virtual machine dispatch method */ -+#undef ZEND_VM_KIND - --/* Whether sprintf is broken */ --#undef ZEND_BROKEN_SPRINTF -+/* virtual machine dispatch method */ -+#undef ZEND_VM_KIND - --/* */ ++#undef __DEBUG_APC__ ++ +/* */ - #undef ZEND_DEBUG - --/* Define if double cast to long preserves least significant bits */ --#undef ZEND_DVAL_TO_LVAL_CAST_OK ++#undef APC_SEM_LOCKS ++ +/* */ -+#undef ZEND_DEBUG ++#undef APC_SPIN_LOCKS + +/* */ -+#undef ZTS ++#undef APC_PTHREADMUTEX_LOCKS + +/* */ -+#undef ZEND_MULTIBYTE ++#undef APC_FCNTL_LOCKS ++ ++/* shm/mmap memory protection */ ++#undef APC_MEMPROTECT + -+/* Define if the target system is darwin */ -+#undef DARWIN - --/* */ +/* */ - #undef ZEND_MM_ALIGNMENT - --/* */ ++#undef APC_HAVE_LOOKUP_HOOKS ++ +/* */ - #undef ZEND_MM_ALIGNMENT_LOG2 - --/* */ --#undef ZEND_MULTIBYTE -+/* Define if the target system has support for memory allocation using mmap(MAP_ANON) */ -+#undef HAVE_MEM_MMAP_ANON - --/* virtual machine dispatch method */ --#undef ZEND_VM_KIND -+/* Define if the target system has support for memory allocation using mmap(/dev/zero) */ -+#undef HAVE_MEM_MMAP_ZERO - --/* */ ++#undef APC_HAVE_LOOKUP_HOOKS ++ +/* */ - #undef ZTS - --/* Define to 1 if on MINIX. */ --#undef _MINIX -+/* Whether you use GNU Pth */ -+#undef GNUPTH - --/* Define to 2 if the system does not provide POSIX.1 features except with -- this defined. */ --#undef _POSIX_1_SOURCE ++#undef HAVE_SEMUN ++ +/* */ -+#undef TSRM_ST - --/* Define to 1 if you need to in order for `stat' and other things to work. */ --#undef _POSIX_SOURCE -+/* Whether to use native BeOS threads */ -+#undef BETHREADS - --/* Define to empty if `const' does not conform to ANSI C. */ --#undef const -+/* Whether to use Pthreads */ -+#undef PTHREADS - --/* Define to `int' if doesn't define. */ --#undef gid_t -+/* PHP build date */ -+#undef PHP_BUILD_DATE - --/* */ --#undef in_addr_t -+/* hardcode for each of the cross compiler host */ -+#undef PHP_OS - --/* Define to `__inline__' or `__inline' if that's what the C compiler -- calls it, or to nothing if 'inline' is not supported under any name. */ --#ifndef __cplusplus --#undef inline --#endif -+/* hardcode for each of the cross compiler host */ -+#undef PHP_UNAME - --/* Define to `unsigned int' if does not define. */ --#undef size_t -+/* uname -a output */ -+#undef PHP_UNAME - --/* Define to `int' if doesn't define. */ --#undef uid_t -+/* uname output */ -+#undef PHP_OS - --/* Define to `unsigned int ' if does not define. */ --#undef uint ++#undef HAVE_SEMUN ++ ++/* enable valgrind memchecks */ ++#undef HAVE_VALGRIND_MEMCHECK_H ++ ++/* Whether to build apc as dynamic module */ ++#undef COMPILE_DL_APC ++ +/* */ -+#undef HAVE_BUILD_DEFS_H - --/* Define to `unsigned long ' if does not define. */ --#undef ulong - - #ifndef ZEND_ACCONFIG_H_NO_C_PROTOS ++#undef HAVE_APC ++ + /* Whether to build bcmath as dynamic module */ + #undef COMPILE_DL_BCMATH diff --git a/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch b/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch index 8ace5f29e6..81de7f8070 100644 --- a/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch +++ b/lang/php5/patches/950-Fix-dl-cross-compiling-issue.patch @@ -1,6 +1,6 @@ --- a/configure +++ b/configure -@@ -16357,7 +16357,7 @@ fi +@@ -15979,7 +15979,7 @@ ac_libs=$LIBS LIBS="$LIBS -ldl" if test "$cross_compiling" = yes; then @@ -8,4 +8,4 @@ + found=$found else cat > conftest.$ac_ext < - DEPENDS:=php5 -endef - -define Build/Configure - ( cd $(PKG_BUILD_DIR); $(STAGING_DIR_HOST)/usr/bin/phpize ) - $(Build/Configure/Default) -endef - -define PECLPackage - - define Package/php5-pecl-$(1) - $(call Package/php5-pecl/Default) - TITLE:=$(2) - - ifneq ($(3),) - DEPENDS+=$(3) - endif - endef - - define Package/php5-pecl-$(1)/install - $(INSTALL_DIR) $$(1)/usr/lib/php - $(INSTALL_BIN) $(PKG_BUILD_DIR)/modules/$(subst -,_,$(1)).so $$(1)/usr/lib/php/ - $(INSTALL_DIR) $$(1)/etc/php5 - echo "extension=$(subst -,_,$(1)).so" > $$(1)/etc/php5/$(subst -,_,$(1)).ini - endef - -endef diff --git a/lang/pycairo/Makefile b/lang/pycairo/Makefile new file mode 100644 index 0000000000..d09b6fe55c --- /dev/null +++ b/lang/pycairo/Makefile @@ -0,0 +1,57 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=pycairo +PKG_VERSION:=1.8.0 +PKG_RELEASE:=3 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://www.cairographics.org/releases/ +PKG_MD5SUM:=847f5377c32228a656819f5bd18eb6b4 +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python-package.mk) + +PKG_INSTALL=1 + +CONFIGURE_ARGS += --enable-static + +define Package/pycairo + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=Cairo bindings to python + URL:=http://www.cairographics.org/pycairo/ + DEPENDS:=+python-mini +cairo +endef + +define Package/pycairo/description + Cairo bindings for python +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/pycairo + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/pycairo/* \ + $(1)/usr/include/pycairo + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ +endef + +define Package/pycairo/install + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/cairo/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/cairo/*.{py,so,a} \ + $(1)$(PYTHON_PKG_DIR)/cairo/ +endef + +$(eval $(call BuildPackage,pycairo)) diff --git a/lang/pyclips/Makefile b/lang/pyclips/Makefile deleted file mode 100644 index 4fff1a0cb9..0000000000 --- a/lang/pyclips/Makefile +++ /dev/null @@ -1,48 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pyclips -PKG_VERSION:=1.0.7.348 -PKG_RELEASE:=1 - -PKG_SOURCE:=pyclips-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/pyclips -PKG_MD5SUM:=c548d62ec951bf9f98c86c70815ed27c - -PKG_BUILD_DIR:=$(BUILD_DIR)/pyclips -PKG_BUILD_DEPENDS:=python - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python-package.mk) - -define Package/pyclips - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=pyclips - URL:=http://sourceforge.net/projects/pyclips/ - DEPENDS:=+python -endef - -define Package/pyclips/description - Python module to interface the CLIPS expert system shell library. -endef - -define Build/Compile - $(call Build/Compile/PyMod,,install --prefix="$(PKG_INSTALL_DIR)/usr") -endef - -define Package/pyclips/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) -endef - -$(eval $(call BuildPackage,pyclips)) diff --git a/lang/pygtk/Makefile b/lang/pygtk/Makefile new file mode 100644 index 0000000000..961818224e --- /dev/null +++ b/lang/pygtk/Makefile @@ -0,0 +1,85 @@ +# +# Copyright (C) 2008-2011 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=pygtk +PKG_VERSION:=2.12.1 +PKG_RELEASE:=3 + +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.12/ +PKG_MD5SUM:=a816346d750d61e3fa67a200e4292694 +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +$(call include_mk, python-package.mk) + +define Package/python-gtk + SUBMENU:=Python + SECTION:=lang + CATEGORY:=Languages + TITLE:=GTK bindings for python + URL:=http://www.pygtk.org/ + DEPENDS:=+python-mini +python-gobject +gtk2 +pycairo @!LINUX_2_4 +endef + +define Package/python-gtk/description + API to GTK and glade library from python. +endef + +define Build/Compile + $(MAKE) -C $(PKG_BUILD_DIR) \ + SUBDIRS="codegen . gtk" \ + all install DESTDIR="$(PKG_INSTALL_DIR)" +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/include/pygtk-2.0/pygtk + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/pygtk-2.0/pygtk/* \ + $(1)/usr/include/pygtk-2.0/pygtk + + $(INSTALL_DIR) $(1)/usr/share/pygtk/2.0/codegen + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/codegen/*.py \ + $(1)/usr/share/pygtk/2.0/codegen/ + + $(INSTALL_DIR) $(1)/usr/share/pygtk/2.0/defs/ + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/defs/* \ + $(1)/usr/share/pygtk/2.0/defs + + $(INSTALL_DIR) $(2)/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(2)/bin + + $(SED) 's,^\(datadir\|prefix\)=,\1=$(STAGING_DIR),g' $(2)/bin/pygtk-codegen-2.0 + + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig + + $(SED) 's,^datadir=,datadir=$(STAGING_DIR),g' $(1)/usr/lib/pkgconfig/pygtk-2.0.pc +endef + +define Package/python-gtk/install + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0 + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.so \ + $(1)$(PYTHON_PKG_DIR)/gtk-2.0 + + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0/gtk + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/gtk/*{.py,.so}* \ + $(1)$(PYTHON_PKG_DIR)/gtk-2.0/gtk +endef + +$(eval $(call BuildPackage,python-gtk)) diff --git a/lang/pygtk/patches/001-automake-compat.patch b/lang/pygtk/patches/001-automake-compat.patch new file mode 100644 index 0000000000..d141cd68c5 --- /dev/null +++ b/lang/pygtk/patches/001-automake-compat.patch @@ -0,0 +1,8 @@ +--- a/Makefile.am ++++ b/Makefile.am +@@ -1,4 +1,5 @@ + AUTOMAKE_OPTIONS = 1.7 ++ACLOCAL_AMFLAGS = -I m4 + + if BUILD_GTK + GTK_SUBDIR = gtk diff --git a/lang/pyqt4/Makefile b/lang/pyqt4/Makefile new file mode 100644 index 0000000000..2763d0ed35 --- /dev/null +++ b/lang/pyqt4/Makefile @@ -0,0 +1,154 @@ +# +# Copyright (C) 2010 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=pyqt4 +PKG_VERSION:=4.8.3 +PKG_RELEASE:=1 + +PKG_SOURCE:=PyQt-x11-gpl-$(PKG_VERSION).tar.gz +PKG_SOURCE_URL:=http://bu3sch.de/pyqt4/ +PKG_MD5SUM:=d54fd1c37a74864faf42709c8102f254 +PKG_BUILD_DIR:=$(BUILD_DIR)/PyQt-x11-gpl-$(PKG_VERSION) +PKG_INSTALL:=1 +PKG_BUILD_PARALLEL:=1 + +PKG_BUILD_DEPENDS:=python-sip/host + +include $(INCLUDE_DIR)/package.mk +$(call include_mk, python-package.mk) +$(call include_mk, python-sip-package.mk) + +define Package/pyqt4 + SECTION:=language-python + CATEGORY:=Languages + SUBMENU:=Python + TITLE:=Python QT4 + MAINTAINER:=Michael Buesch + URL:=http://www.riverbankcomputing.co.uk/software/pyqt/download + DEPENDS:=+qt4 +qt4-gui +dbus-python +python +python-sip @FEATURE_drawing-backend_libX11 +endef + +define Package/pyqt4/Description + Python QT4 framework bindings. +endef + +TARGET_INCDIRS+=$(STAGING_DIR)/include \ + $(STAGING_DIR)/usr/include \ + $(STAGING_DIR)/usr/include/Qt \ + $(STAGING_DIR)/usr/include/Qt3Support \ + $(STAGING_DIR)/usr/include/QtCore \ + $(STAGING_DIR)/usr/include/QtDBus \ + $(STAGING_DIR)/usr/include/QtGui \ + $(STAGING_DIR)/usr/include/QtNetwork \ + $(STAGING_DIR)/usr/include/QtSql \ + $(STAGING_DIR)/usr/include/QtSvg \ + $(STAGING_DIR)/usr/include/QtTest \ + $(STAGING_DIR)/usr/include/QtXml \ + $(STAGING_DIR)/usr/include/python$(PYTHON_VERSION) \ + $(STAGING_DIR)/usr/lib/dbus-1.0/include \ + $(TOOLCHAIN_DIR)/include \ + $(TOOLCHAIN_DIR)/usr/include + +TARGET_LIBDIRS+=$(STAGING_DIR)/lib \ + $(STAGING_DIR)/usr/lib \ + $(TOOLCHAIN_DIR)/lib \ + $(TOOLCHAIN_DIR)/usr/lib + +EXTRA_CFLAGS:= +EXTRA_LDFLAGS:=-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ + -Wl,-rpath=/usr/lib/ + +QTDIRSFILE:=$(PKG_BUILD_DIR)/qtdirs.out +SIPCFGFILE:=$(PKG_BUILD_DIR)/sipconfig.macros + +QT_VERSION:=./files/qt_versioning.sh version "$(STAGING_DIR)/usr/include" "$(PKG_BUILD_DIR)/qtver.tmp" +QT_EDITION:=./files/qt_versioning.sh edition "$(STAGING_DIR)/usr/include" "$(PKG_BUILD_DIR)/qtver.tmp" + +# Welcome to cross compilation hell. Dinner is served! + +define Build/Configure + echo "$(STAGING_DIR)/usr" > $(QTDIRSFILE) + echo "$(STAGING_DIR)/usr/include" >> $(QTDIRSFILE) + echo "$(STAGING_DIR)/usr/lib" >> $(QTDIRSFILE) + echo "$(STAGING_DIR)/usr/bin" >> $(QTDIRSFILE) + echo "$(STAGING_DIR)/usr/share" >> $(QTDIRSFILE) + echo "$(STAGING_DIR)/usr/lib/Qt/plugins" >> $(QTDIRSFILE) + $(QT_VERSION) >> $(QTDIRSFILE) + $(QT_EDITION) >> $(QTDIRSFILE) + echo "Open Source" >> $(QTDIRSFILE) + echo "shared" >> $(QTDIRSFILE) + + $(CP) "$(PYTHON_SIP_CONFIG_TEMPLATE)" "$(SIPCFGFILE)" + echo "INCDIR_QT $(STAGING_DIR)/usr/include" >> $(SIPCFGFILE) + echo "LIBDIR_QT $(STAGING_DIR)/usr/lib" >> $(SIPCFGFILE) + echo "MOC $(STAGING_DIR_HOST)/bin/moc" >> $(SIPCFGFILE) + echo "QT_INSTALL_BINS $(STAGING_DIR)/usr/bin" >> $(SIPCFGFILE) + echo "QT_INSTALL_HEADERS $(STAGING_DIR)/usr/include" >> $(SIPCFGFILE) + echo "QT_INSTALL_LIBS $(STAGING_DIR)/usr/lib" >> $(SIPCFGFILE) + echo "INCDIR $(TARGET_INCDIRS)" >> $(SIPCFGFILE) + echo "INCDIR_OPENGL $(TARGET_INCDIRS)" >> $(SIPCFGFILE) + echo "INCDIR_X11 $(TARGET_INCDIRS)" >> $(SIPCFGFILE) + echo "LIBDIR $(TARGET_LIBDIRS)" >> $(SIPCFGFILE) + echo "LIBDIR_OPENGL $(TARGET_LIBDIRS)" >> $(SIPCFGFILE) + echo "LIBDIR_X11 $(TARGET_LIBDIRS)" >> $(SIPCFGFILE) + + $(call HostPython, \ + cd "$(PKG_BUILD_DIR)"; \ + , \ + ./configure.py \ + --use-arch="$(ARCH)" \ + --qmake="$(STAGING_DIR_HOST)/bin/qmake" \ + --qmake-spec="$(STAGING_DIR)/usr/share/mkspecs/linux-openwrt-g++" \ + --qmake-prefix='TARGET_CC="$(TARGET_CROSS)gcc"' \ + --qmake-prefix='TARGET_CXX="$(TARGET_CROSS)g++"' \ + --qmake-prefix='TARGET_AR="$(TARGET_CROSS)ar cqs"' \ + --qmake-prefix='TARGET_OBJCOPY="$(TARGET_CROSS)objcopy"' \ + --qmake-prefix='TARGET_RANLIB="$(TARGET_CROSS)ranlib"' \ + --qmake-prefix='TARGET_CFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)"' \ + --qmake-prefix='TARGET_CXXFLAGS="$(TARGET_CFLAGS) $(EXTRA_CFLAGS)"' \ + --qmake-prefix='TARGET_LDFLAGS="$(TARGET_LDFLAGS) $(EXTRA_LDFLAGS)"' \ + --qmake-prefix='TARGET_INCDIRS="$(TARGET_INCDIRS)"' \ + --qmake-prefix='TARGET_LIBDIRS="$(TARGET_LIBDIRS)"' \ + --qmake-prefix='STAGING_DIR_HOST="$(STAGING_DIR)/../host"' \ + --qtdirs-file="$(QTDIRSFILE)" \ + --host-sip-bin="$(STAGING_DIR_HOST)/usr/bin/sip" \ + --sipconfig-macros="$(SIPCFGFILE)" \ + --dbus="$(STAGING_DIR)/usr/include/dbus-1.0" \ + --bindir="$(PKG_INSTALL_DIR)/usr/bin" \ + --destdir="$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)" \ + --plugin-destdir="$(PKG_INSTALL_DIR)/usr/lib/Qt/plugins" \ + --pydbus-installdir="$(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)" \ + --sipdir="$(PKG_INSTALL_DIR)/usr/share/sip" \ + --protected-is-public \ + --crosscompile \ + --no-designer-plugin \ + --no-qsci-api \ + --confirm-license \ + --verbose \ + ) + ./files/fixup.sh "$(PKG_BUILD_DIR)" +endef + +define Build/Compile + $(MAKE_VARS) $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) +endef + +define Build/Install + $(MAKE_VARS) DESTDIR="" $(MAKE) -C $(PKG_BUILD_DIR) install +endef + +define Package/pyqt4/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_DIR) $(1)/$(PYTHON_PKG_DIR)/PyQt4 + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/{pylupdate4,pyrcc4,pyuic4} $(1)/usr/bin + $(INSTALL_DATA) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)/qt.so $(1)/$(PYTHON_PKG_DIR) + $(CP) $(PKG_INSTALL_DIR)/$(PYTHON_PKG_DIR)/PyQt4 $(1)/$(PYTHON_PKG_DIR) +endef + +$(eval $(call BuildPackage,pyqt4)) diff --git a/lang/pyqt4/files/fixup.sh b/lang/pyqt4/files/fixup.sh new file mode 100755 index 0000000000..c4203a06c7 --- /dev/null +++ b/lang/pyqt4/files/fixup.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e +PKG_BUILD_DIR="$1" + +# SIP uses PyLong_FromUnsignedLong to convert from void * to +# PyLong. This results in a compilation error for the implicit cast +# on C++ compilers. Make an explicit cast. +sed -i -e 's/PyLong_FromUnsignedLong(/PyLong_FromUnsignedLong((unsigned long)/g' $PKG_BUILD_DIR/QtCore/sipQtCoreQThread.cpp + diff --git a/lang/pyqt4/files/qt_versioning.sh b/lang/pyqt4/files/qt_versioning.sh new file mode 100755 index 0000000000..ec4fe94808 --- /dev/null +++ b/lang/pyqt4/files/qt_versioning.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +die() +{ + echo "PyQt qt_versioning.sh: $*" >&2 + exit 1 +} + +[ $# -eq 3 ] || die "Invalid arguments" + +action="$1" +qtincdir="$2" +tmpfile="$3" + +cp -f "$qtincdir/QtCore/qglobal.h" "$tmpfile" || die "cp failed" +echo "int QT_VERSION_IS = QT_VERSION;" >> "$tmpfile" || die "patching failed (1)" +echo "int QT_EDITION_IS = QT_EDITION;" >> "$tmpfile" || die "patching failed (2)" +# First resolve all preprocessor macros +cpp -x c++ -traditional-cpp "-I$qtincdir" "$tmpfile" > "$tmpfile.processed" || die "CPP failed" + +if [ "$action" = "version" ]; then + raw="$(grep -e 'QT_VERSION_IS' "$tmpfile.processed" | cut -d'=' -f2 | cut -d';' -f1)" +elif [ "$action" = "edition" ]; then + raw="$(grep -e 'QT_EDITION_IS' "$tmpfile.processed" | cut -d'=' -f2 | cut -d';' -f1)" +else + die "Invalid action" +fi +# We use python to evaluate the arithmetic C++ expression. Languages are similar +# enough in that area for this to succeed. +python -c "print \"%d\" % ($raw)" || die "C++ evaluation failed" + +exit 0 diff --git a/lang/pyqt4/patches/100-cross-compile.patch b/lang/pyqt4/patches/100-cross-compile.patch new file mode 100644 index 0000000000..6d8cbe4e6c --- /dev/null +++ b/lang/pyqt4/patches/100-cross-compile.patch @@ -0,0 +1,376 @@ +Index: PyQt-x11-gpl-4.8.3/configure.py +=================================================================== +--- PyQt-x11-gpl-4.8.3.orig/configure.py 2011-01-23 11:08:20.000000000 +0100 ++++ PyQt-x11-gpl-4.8.3/configure.py 2011-03-13 15:03:08.279673485 +0100 +@@ -33,6 +33,7 @@ import os + import glob + import optparse + import shutil ++import re + + import sipconfig + +@@ -184,25 +185,17 @@ def create_optparser(): + "in the header comments of generated code [default: include " + "timestamps]") + +- if sys.platform != 'win32': +- if sys.platform in ('linux2', 'darwin'): +- pip_default = True +- pip_default_str = "enabled" +- else: +- pip_default = False +- pip_default_str = "disabled" +- +- g.add_option("--protected-is-public", action="store_true", +- default=pip_default, dest="prot_is_public", +- help="enable building with 'protected' redefined as 'public' " +- "[default: %s]" % pip_default_str) +- g.add_option("--protected-not-public", action="store_false", +- dest="prot_is_public", +- help="disable building with 'protected' redefined as 'public'") +- g.add_option("-q", "--qmake", action="callback", metavar="FILE", +- default=qmake, dest="qmake", callback=store_abspath_file, +- type="string", +- help="the pathname of qmake [default: %s]" % (qmake or "none")) ++ g.add_option("--protected-is-public", action="store_true", ++ default=True, dest="prot_is_public", ++ help="enable building with 'protected' redefined as 'public' " ++ "[default: True]") ++ g.add_option("--protected-not-public", action="store_false", ++ dest="prot_is_public", ++ help="disable building with 'protected' redefined as 'public'") ++ g.add_option("-q", "--qmake", action="callback", metavar="FILE", ++ default=qmake, dest="qmake", callback=store_abspath_file, ++ type="string", ++ help="the pathname of qmake [default: %s]" % (qmake or "none")) + + g.add_option("-s", "--dbus", action="callback", metavar="DIR", + dest="pydbusincdir", callback=store_abspath_dir, type="string", +@@ -210,13 +203,13 @@ def create_optparser(): + "[default: supplied by pkg-config]") + p.add_option_group(g) + +- if sys.platform == 'darwin': +- g = optparse.OptionGroup(p, title="MacOS X Configuration") +- g.add_option("--use-arch", action="store", metavar="ARCH", +- dest="use_arch", choices=["i386", "x86_64", "ppc"], +- help="the architecture to use when running pyuic4 " +- "[default: system default]") +- p.add_option_group(g) ++ g = optparse.OptionGroup(p, title="Arch Configuration") ++ g.add_option("--use-arch", action="store", metavar="ARCH", ++ dest="use_arch", choices=["", "i386", "x86_64", "ppc", "arm"], ++ default="", ++ help="the architecture to use when running pyuic4 " ++ "[default: system default]") ++ p.add_option_group(g) + + # Installation. + g = optparse.OptionGroup(p, title="Installation") +@@ -275,12 +268,42 @@ def create_optparser(): + "QTDIR/qsci]") + p.add_option_group(g) + ++ # Crosscompilation ++ g = optparse.OptionGroup(p, title="Crosscompilation") ++ g.add_option("--crosscompile", action="store_true", ++ default=False, dest="crosscompile", ++ help="Set, if cross-compiling") ++ g.add_option("--host-sip-bin", action="callback", metavar="FILE", ++ default=None, dest="host_sip_bin", type="string", ++ callback=store_abspath_file, ++ help="Path to the host SIP binary") ++ g.add_option("--sipconfig-macros", action="callback", metavar="FILE", ++ default=None, dest="sipconfig_macros", type="string", ++ callback=store_abspath_file, ++ help="Path to a file containing sipconfig macros") ++ g.add_option("--qmake-prefix", action="append", ++ default=[], dest="qmake_prefixes", type="string", ++ help="Commandline prefix to qmake") ++ g.add_option("--qmake-spec", action="callback", metavar="FILE", ++ default=None, dest="qmake_spec", callback=store_abspath, ++ type="string", ++ help="the pathname to qmake spec file") ++ g.add_option("--qtdirs-file", action="callback", metavar="FILE", ++ default=None, dest="qtdirs_file", callback=store_abspath_file, ++ type="string", ++ help="Path to a predefined qtdirs file") ++ g.add_option("--pydbus-installdir", action="callback", metavar="DIR", ++ default=None, dest="pydbus_installdir", callback=store_abspath, ++ type="string", ++ help="Install dir for pydbus module") ++ p.add_option_group(g) ++ + return p + + + class pyrccMakefile(sipconfig.ProgramMakefile): + """This class implements the Makefile for pyrcc. This is specialised so +- that pyrcc is automatically run against the examples. ++ that pyrcc is automatically run against the examples, if not crosscompiling. + """ + + def __init__(self): +@@ -294,6 +317,8 @@ class pyrccMakefile(sipconfig.ProgramMak + def generate_target_default(self, mfile): + """Generate the default target.""" + sipconfig.ProgramMakefile.generate_target_default(self, mfile) ++ if opts.crosscompile: ++ return + + # The correct call to pyrcc depends on the Python version. + if sys.hexversion >= 0x03000000: +@@ -807,7 +832,7 @@ include(%s) + + f.close() + +- run_command("%s %s %s" % (opts.qmake, qmake_args, wrapped_pro)) ++ run_qmake("%s %s" % (qmake_args, wrapped_pro)) + os.chdir(cwd) + + sipconfig.inform("Creating QPy support libraries Makefile...") +@@ -861,12 +886,16 @@ include(%s) + # not on Windows (so that normal console use will work). + sipconfig.inform("Creating pyuic4 wrapper...") + +- if sys.platform == 'darwin': +- gui = True ++ if opts.use_arch: ++ gui = False#FIXME + use_arch = opts.use_arch + else: +- gui = False +- use_arch = '' ++ if sys.platform == 'darwin': ++ gui = True ++ use_arch = opts.use_arch ++ else: ++ gui = False ++ use_arch = '' + + # The pyuic directory may not exist if we are building away from the + # source directory. +@@ -926,6 +955,7 @@ include(%s) + + abi = getattr(sys, 'abiflags', '') + ++ print "FIXME CROSSCOMPILE" #FIXME: Crosscompile + if sys.platform == 'win32': + # Use abiflags in case it is supported in a future version. + lib_dir_flag = quote("-L%s" % sipcfg.py_lib_dir) +@@ -988,7 +1018,7 @@ include(%s) + fout.write(prj) + fout.close() + +- run_command("%s %s" % (opts.qmake, qmake_args)) ++ run_qmake(qmake_args) + os.chdir(cwd) + + tool.append("designer") +@@ -1106,6 +1136,14 @@ def create_config(module, template, macr + sipconfig.create_config_module(module, template, content, macros) + + ++def run_qmake(args): ++ pfx = " ".join(opts.qmake_prefixes) ++ if opts.qmake_spec: ++ spec = "-spec \"" + opts.qmake_spec + "\"" ++ else: ++ spec = "" ++ run_command(pfx + " " + opts.qmake + " " + spec + " " + args) ++ + def run_command(cmd, envvars=None): + """Run a command and display the output if verbose mode is enabled. + +@@ -1334,30 +1372,38 @@ def check_dbus(): + """ + sipconfig.inform("Checking to see if the dbus support module should be built...") + +- sout = get_command_stdout("pkg-config --cflags-only-I --libs dbus-1") +- iflags = sout.read().strip() ++ if opts.crosscompile and not opts.pydbusincdir: ++ sipconfig.inform("Crosscompiling but no dbus incdir specified. Disabling dbus.") ++ return ++ ++ if not opts.crosscompile: ++ sout = get_command_stdout("pkg-config --cflags-only-I --libs dbus-1") ++ iflags = sout.read().strip() ++ ++ if not iflags: ++ sipconfig.inform("DBus v1 does not seem to be installed.") ++ return ++ ++ # Using str() means it will work with both Python v2 and v3. ++ for f in str(iflags).split(): ++ if f.startswith("-I"): ++ dbusincdirs.append(f[2:]) ++ elif f.startswith("-L"): ++ dbuslibdirs.append(f[2:]) ++ elif f.startswith("-l"): ++ dbuslibs.append(f[2:]) + +- if not iflags: +- sipconfig.inform("DBus v1 does not seem to be installed.") +- return +- +- # Using str() means it will work with both Python v2 and v3. +- for f in str(iflags).split(): +- if f.startswith("-I"): +- dbusincdirs.append(f[2:]) +- elif f.startswith("-L"): +- dbuslibdirs.append(f[2:]) +- elif f.startswith("-l"): +- dbuslibs.append(f[2:]) +- +- try: +- import dbus.mainloop +- except: +- sipconfig.inform("The Python dbus module doesn't seem to be installed.") +- return ++ try: ++ import dbus.mainloop ++ except: ++ sipconfig.inform("The Python dbus module doesn't seem to be installed.") ++ return + + global pydbusmoddir +- pydbusmoddir = dbus.mainloop.__path__[0] ++ if opts.pydbus_installdir: ++ pydbusmoddir = opts.pydbus_installdir ++ else: ++ pydbusmoddir = dbus.mainloop.__path__[0] + + # Try and find dbus-python.h. We don't use pkg-config because it is broken + # for dbus-python (at least for versions up to and including v0.81.0). +@@ -1443,6 +1489,7 @@ def set_sip_flags(pyqt): + + pyqt is the configuration instance. + """ ++ #FIXME: Needs some crosscompile fixes. + # If we don't check for signed interpreters, we exclude the 'VendorID' + # feature + if not opts.vendorcheck: +@@ -1588,7 +1635,10 @@ def generate_code(mname, extra_include_d + needed_qt_libs(mname, qt_libs) + + # Build the SIP command line. +- argv = ['"' + sipcfg.sip_bin + '"', '-w'] ++ sip_bin = sipcfg.sip_bin ++ if opts.host_sip_bin: ++ sip_bin = opts.host_sip_bin ++ argv = ['"' + sip_bin + '"', '-w'] + + if opts.no_timestamp: + argv.append("-T") +@@ -1890,6 +1940,8 @@ def check_qt_installation(macros): + def fix_qmake_args(args=""): + """Make any platform specific adjustments to the arguments passed to qmake. + """ ++ if opts.crosscompile: ++ return args + if sys.platform == "darwin": + # The Qt binary installer has macx-xcode as the default. + args = "-spec %s %s" % (sipcfg.platform, args) +@@ -2041,7 +2093,7 @@ int main(int, char **) + + # Create the makefile, first making sure it doesn't already exist. + remove_file(make_file) +- run_command("%s %s %s" % (opts.qmake, qmake_args, pro_file)) ++ run_qmake("%s %s" % (qmake_args, pro_file)) + + if not os.access(make_file, os.F_OK): + sipconfig.error("%s failed to create a makefile. %s" % (opts.qmake, MSG_CHECK_QMAKE)) +@@ -2063,15 +2115,30 @@ int main(int, char **) + if not os.access(exe_file, os.X_OK): + sipconfig.error("Failed to determine the layout of your Qt installation. Try again using the --verbose flag to see more detail about the problem.") + +- # Create the output file, first making sure it doesn't exist. +- remove_file(out_file) +- run_command(exe_file) ++ if opts.qtdirs_file: ++ # The user supplied a partial qtdirs.out file. We're probably crosscompiling. ++ # Do _not_ try to execute our qtdirs exe. Take the supplied qtdirs.out files ++ # instead and add the PyQt_... flags by grepping through the executable. ++ # This assumes the executable is not compiled with -O0. ++ read_qtdirs_file(opts.qtdirs_file) ++ global qt_xfeatures ++ print("Got %d features from qtdirs.out file: %s" % (len(qt_xfeatures), str(qt_xfeatures))) ++ found = re.findall(r'PyQt_[\w]+', file(exe_file, "r").read()) ++ print("Grepped %d features from qtdirs.exe file: %s" % (len(found), str(found))) ++ qt_xfeatures.extend(found) ++ else: ++ # Create the output file, first making sure it doesn't exist. ++ remove_file(out_file) ++ run_command(exe_file) ++ ++ if not os.access(out_file, os.F_OK): ++ sipconfig.error("%s failed to create %s. Make sure your Qt v4 installation is correct." % (exe_file, out_file)) + +- if not os.access(out_file, os.F_OK): +- sipconfig.error("%s failed to create %s. Make sure your Qt v4 installation is correct." % (exe_file, out_file)) ++ # Read the directories. ++ read_qtdirs_file(out_file) + +- # Read the directories. +- f = open(out_file, "r") ++def read_qtdirs_file(filename): ++ f = open(filename, "r") + lines = f.read().strip().split("\n") + f.close() + +@@ -2136,6 +2203,24 @@ int main(int, char **) + sipconfig.error("Qt has been built as static libraries so either the -g or -k argument should be used.") + + ++def load_sipconfig_macros(filename): ++ macros = {} ++ fd = file(filename, "r") ++ for line in fd.readlines(): ++ line = line.split() ++ try: ++ key = line[0] ++ except IndexError: ++ sipconfig.error("Invalid sipconfig macros file format") ++ value = "" ++ try: ++ value = " ".join(line[1:]) ++ except IndexError: ++ pass ++ macros[key] = value ++ return macros ++ ++ + def main(): + """Create the configuration module module. + """ +@@ -2154,7 +2239,7 @@ def main(): + opts.no_timestamp = False + + # Provide defaults for platform-specific options. +- if sys.platform == 'win32': ++ if sys.platform == 'win32' and not opts.crosscompile: + opts.qmake = find_default_qmake() + opts.prot_is_public = False + +@@ -2187,12 +2272,14 @@ def main(): + # Install the API file if the default directory exists. + opts.api = os.path.isdir(opts.qscidir) + +- # Replace the existing build macros with the ones from the Qt installation. +- macros = get_build_macros(args) +- +- if macros is None: +- p.print_help() +- sys.exit(2) ++ if opts.sipconfig_macros: ++ macros = load_sipconfig_macros(opts.sipconfig_macros) ++ else: ++ # Replace the existing build macros with the ones from the Qt installation. ++ macros = get_build_macros(args) ++ if macros is None: ++ p.print_help() ++ sys.exit(2) + + sipcfg.set_build_macros(macros) + diff --git a/lang/pyrrd/Makefile b/lang/pyrrd/Makefile deleted file mode 100644 index a5a3c96c21..0000000000 --- a/lang/pyrrd/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=pyrrd -PKG_VERSION:=0.1.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=PyRRD-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://pypi.python.org/packages/source/P/PyRRD/ -PKG_MD5SUM:=c33a0760b42a23e45e423b8b9f2cd0b0 - -PKG_BUILD_DEPENDS:=python -PKG_BUILD_DIR:=$(BUILD_DIR)/PyRRD-$(PKG_VERSION) - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python-package.mk) - -define Package/pyrrd - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=PyRRD - An Object-Oriented Python Interface for RRDTool - URL:=http://code.google.com/p/pyrrd/ - DEPENDS:=+python +distribute -endef - -define Package/pyrrd/description - An Object-Oriented Python Interface for RRDTool -endef - -define Build/Compile - $(call Build/Compile/PyMod,., \ - install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" \ - ) -endef - -define Package/pyrrd/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR)/ -endef - -$(eval $(call BuildPackage,pyrrd)) diff --git a/lang/pyrrd/patches/101-cross.patch b/lang/pyrrd/patches/101-cross.patch deleted file mode 100644 index 978e5a8789..0000000000 --- a/lang/pyrrd/patches/101-cross.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -1,4 +1,6 @@ --from setuptools import setup -+#!/usr/bin/env python -+ -+from distutils.core import setup - - from pyrrd import meta - from pyrrd.util import dist diff --git a/lang/python-django/Makefile b/lang/python-django/Makefile deleted file mode 100644 index efd0e9c9e4..0000000000 --- a/lang/python-django/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=python-django -PKG_VERSION:=1.3.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=Django-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://media.djangoproject.com/releases/1.3/ -PKG_MD5SUM:=62d8642fd06b9a0bf8544178f8500767 - -PKG_BUILD_DIR:=$(BUILD_DIR)/Django-$(PKG_VERSION) -PKG_BUILD_DEPENDS:=python - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python-package.mk) - -define Package/python-django - SECTION:=language-python - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=Django Web framework - URL:=https://www.djangoproject.com/ - DEPENDS:=+python -endef - -define Package/python-django/description - Django is a high-level Python Web framework that encourages rapid - development and clean, pragmatic design. -endef - -define Build/Compile - $(call Build/Compile/PyMod,., \ - install --prefix="/usr" --root="$(PKG_INSTALL_DIR)" \ - ) -endef - -define Package/python-django/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR)/ -endef - -$(eval $(call BuildPackage,python-django)) diff --git a/lang/python-eeml/Makefile b/lang/python-eeml/Makefile deleted file mode 100644 index 6fef33a3a9..0000000000 --- a/lang/python-eeml/Makefile +++ /dev/null @@ -1,52 +0,0 @@ -# -# Copyright (C) 2008-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=python-eeml -PKG_VERSION:=20111202 -PKG_RELEASE:=1 -PKG_REV:=9f0173e56a0b2a0ae7d3a2c76eb5428381912ac6 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=git://github.com/petervizi/python-eeml.git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_PROTO:=git - -PKG_BUILD_DEPENDS:=python - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python-package.mk) - -define Package/python-eeml - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=python-eeml - URL:=http://petervizi.github.com/python-eeml/ - DEPENDS:=+python +distribute -endef - -define Package/python-eeml/description - A python package for generating eeml documents. -endef - -define Build/Compile - $(call Build/Compile/PyMod,., \ - install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \ - ) -endef - -define Package/python-eeml/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR)/ -endef - -$(eval $(call BuildPackage,python-eeml)) diff --git a/lang/python-eeml/patches/101-cross.patch b/lang/python-eeml/patches/101-cross.patch deleted file mode 100644 index fd80751856..0000000000 --- a/lang/python-eeml/patches/101-cross.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -1,5 +1,6 @@ --from setuptools import setup --from setuptools import find_packages -+#!/usr/bin/env python -+ -+from distutils.core import setup - - setup(name="Python EEML", - version="0.1", - diff --git a/lang/python-gnome-desktop2/Makefile b/lang/python-gnome-desktop2/Makefile new file mode 100644 index 0000000000..cc971a5de0 --- /dev/null +++ b/lang/python-gnome-desktop2/Makefile @@ -0,0 +1,88 @@ +# +# Copyright (C) 2008 OpenWrt.org +# +# This is free software, licensed under the GNU General Public License v2. +# See /LICENSE for more information. +# + +include $(TOPDIR)/rules.mk + +PKG_NAME:=gnome-python-desktop +PKG_VERSION:=2.22.0 +PKG_RELEASE:=1 +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/$(PKG_NAME)/2.22 +PKG_MD5SUM:=504877a973f6abc0788283232cd703cb +PKG_FIXUP:=libtool + +# AM_PATH_GTK_2_0 +PKG_BUILD_DEPENDS:=gtk2 + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk +$(call include_mk, python-package.mk) + +PKG_INSTALL=1 + +EXTRA_CFLAGS += -I$(ICONV_PREFIX) -I$(INTL_PREFIX) +EXTRA_LDFLAGS += -L$(ICONV_PREFIX) -L$(INTL_PREFIX) + +STAMP_CONFIGURED:=$(STAMP_CONFIGURED)_$(call confvar,CONFIG_PACKAGE_python-rsvg CONFIG_PACKAGE_python-wnck) + +define Package/python-gnome-desktop/Default + SECTION:=lang + SUBMENU:=Python + CATEGORY:=Languages + TITLE:=$(1) python bindings + URL:=http://ftp.gnome.org/ + DEPENDS:=+python-mini python-gtk $(2) +endef + +define Package/python-rsvg + $(call Package/python-gnome-desktop/Default,librsvg,+librsvg +pycairo) +endef + +define Package/python-wnck + $(call Package/python-gnome-desktop/Default,libwnck,+PACKAGE_python-wnck:libwnck) +endef + +define Build/Configure + $(call Build/Configure/Default, \ + $(if $(CONFIG_PACKAGE_python-rsvg), --enable-rsvg, --disable-rsvg) \ + $(if $(CONFIG_PACKAGE_python-wnck), --enable-wnck, --disable-wnck) \ + ) +endef + +MAKE_INSTALL_FLAGS += \ + PYGTK_DEFSDIR="$(PKG_INSTALL_DIR)/usr/share/pygtk/2.0/defs" + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/lib/pkgconfig + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/*.pc \ + $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0 + $(CP) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/*.{a,la,so} \ + $(1)$(PYTHON_PKG_DIR)/gtk-2.0/ +endef + +define Package/python-gnome-desktop/install/Default + $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR)/gtk-2.0 + $(CP) \ + $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/gtk-2.0/$(2).so \ + $(1)$(PYTHON_PKG_DIR)/gtk-2.0/ +endef + +define Package/python-rsvg/install + $(call Package/python-gnome-desktop/install/Default,$(1),rsvg) +endef + +define Package/python-wnck/install + $(call Package/python-gnome-desktop/install/Default,$(1),wnck) +endef + +$(eval $(call BuildPackage,python-rsvg)) +$(eval $(call BuildPackage,python-wnck)) + diff --git a/lang/python-imaging-library/Makefile b/lang/python-imaging-library/Makefile deleted file mode 100644 index 128327cfe9..0000000000 --- a/lang/python-imaging-library/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=python-imaging-library -PKG_VERSION:=1.1.7 -PKG_RELEASE:=2 - -PKG_SOURCE:=Imaging-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://effbot.org/downloads -PKG_MD5SUM:=fc14a54e1ce02a0225be8854bfba478e - -PKG_BUILD_DIR:=$(BUILD_DIR)/Imaging-$(PKG_VERSION) -PKG_BUILD_DEPENDS:=python - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python-package.mk) - -define Package/python-imaging-library - SECTION:=language-python - CATEGORY:=Languages - SUBMENU:=Python - TITLE:=Python Imaging Library (PIL) - URL:=http://www.pythonware.com/products/pil/ - DEPENDS:=+python +libfreetype +libjpeg +zlib -endef - -define Package/python-imaging-library/description - The Python Imaging Library adds image processing capabilities to your - Python interpreter. - . - This library provides extensive file format support, an efficient - internal representation, and fairly powerful image processing - capabilities. - . - The core image library is designed for fast access to data stored in a - few basic pixel formats. It should provide a solid foundation for a - general image processing tool. -endef - -define Build/Compile - $(call Build/Compile/PyMod,., \ - install --prefix="/usr" --root="$(PKG_INSTALL_DIR)", \ - ) -endef - -define Package/python-imaging-library/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR)/ -endef - -$(eval $(call BuildPackage,python-imaging-library)) diff --git a/lang/python-imaging-library/patches/101-cross_compile.patch b/lang/python-imaging-library/patches/101-cross_compile.patch deleted file mode 100644 index fee0e82494..0000000000 --- a/lang/python-imaging-library/patches/101-cross_compile.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/setup.py 2011-11-15 01:06:00.000000000 +0100 -+++ b/setup.py 2011-11-15 01:07:32.000000000 +0100 -@@ -147,7 +147,6 @@ - add_directory(library_dirs, "/opt/local/lib") - add_directory(include_dirs, "/opt/local/include") - -- add_directory(library_dirs, "/usr/local/lib") - # FIXME: check /opt/stuff directories here? - - prefix = sysconfig.get_config_var("prefix") -@@ -199,22 +198,6 @@ - add_directory(include_dirs, include_root) - - # -- # add standard directories -- -- # look for tcl specific subdirectory (e.g debian) -- if _tkinter: -- tcl_dir = "/usr/include/tcl" + TCL_VERSION -- if os.path.isfile(os.path.join(tcl_dir, "tk.h")): -- add_directory(include_dirs, tcl_dir) -- -- # standard locations -- add_directory(library_dirs, "/usr/local/lib") -- add_directory(include_dirs, "/usr/local/include") -- -- add_directory(library_dirs, "/usr/lib") -- add_directory(include_dirs, "/usr/include") -- -- # - # insert new dirs *before* default libs, to avoid conflicts - # between Python PYD stub libs and real libraries - diff --git a/lang/python/Makefile b/lang/python/Makefile index 68d6b6f048..dd8d883f0d 100644 --- a/lang/python/Makefile +++ b/lang/python/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=python PKG_VERSION:=2.6.4 -PKG_RELEASE:=4 +PKG_RELEASE:=3 PKG_SOURCE:=Python-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://www.python.org/ftp/python/$(PKG_VERSION)/ @@ -75,12 +75,6 @@ $(call Package/python/Default) DEPENDS+=+python-mini endef -define Package/python-bzip2 -$(call Package/python/Default) - TITLE:=Python support for Bzip2 - DEPENDS+=+python-mini +libbz2 -endef - define Package/python-expat $(call Package/python/Default) TITLE:=Python support for expat @@ -201,7 +195,6 @@ define PyPackage/python/filespec -|/usr/lib/python$(PYTHON_VERSION)/test -|/usr/lib/python$(PYTHON_VERSION)/lib2to3 -|/usr/lib/python$(PYTHON_VERSION)/lib-old --|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/bz2.so -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/gdbm.so -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_sqlite3.so -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_ssl.so @@ -246,6 +239,7 @@ define PyPackage/python/filespec -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/syslog.so -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/time.so -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/unicodedata.so +-|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/zlib.so -|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_weakref.so -|/usr/lib/python$(PYTHON_VERSION)/linecache.py -|/usr/lib/python$(PYTHON_VERSION)/md5.py @@ -324,6 +318,7 @@ define PyPackage/python-mini/filespec +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/syslog.so +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/time.so +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/unicodedata.so ++|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/zlib.so +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/_weakref.so +|/usr/lib/python$(PYTHON_VERSION)/linecache.py +|/usr/lib/python$(PYTHON_VERSION)/md5.py @@ -374,10 +369,6 @@ define PyPackage/python-doc/filespec +|/usr/lib/python$(PYTHON_VERSION)/pydoc.py endef -define PyPackage/python-bzip2/filespec -+|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/bz2.so -endef - define PyPackage/python-expat/filespec +|/usr/lib/python$(PYTHON_VERSION)/lib-dynload/pyexpat.so endef @@ -436,7 +427,6 @@ $(eval $(call HostBuild)) $(eval $(call PyPackage,python)) $(eval $(call PyPackage,python-mini)) $(eval $(call PyPackage,python-doc)) -$(eval $(call PyPackage,python-bzip2)) $(eval $(call PyPackage,python-expat)) $(eval $(call PyPackage,python-gzip)) $(eval $(call PyPackage,python-openssl)) @@ -447,7 +437,6 @@ $(eval $(call PyPackage,python-gdbm)) $(eval $(call BuildPackage,python)) $(eval $(call BuildPackage,python-mini)) $(eval $(call BuildPackage,python-doc)) -$(eval $(call BuildPackage,python-bzip2)) $(eval $(call BuildPackage,python-expat)) $(eval $(call BuildPackage,python-gzip)) $(eval $(call BuildPackage,python-openssl)) diff --git a/lang/python/patches/000-cross-compile.patch b/lang/python/patches/000-cross-compile.patch index efbe07023c..dc2e166977 100644 --- a/lang/python/patches/000-cross-compile.patch +++ b/lang/python/patches/000-cross-compile.patch @@ -2,8 +2,8 @@ Makefile.pre.in | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) ---- a/Makefile.pre.in -+++ b/Makefile.pre.in +--- Python-2.6.4.orig/Makefile.pre.in ++++ Python-2.6.4/Makefile.pre.in @@ -175,6 +175,7 @@ UNICODE_OBJS= @UNICODE_OBJS@ PYTHON= python$(EXE) diff --git a/lang/python/patches/010-cannot-run-test-programm.patch b/lang/python/patches/010-cannot-run-test-programm.patch index c981b462fc..471f008948 100644 --- a/lang/python/patches/010-cannot-run-test-programm.patch +++ b/lang/python/patches/010-cannot-run-test-programm.patch @@ -2,8 +2,8 @@ configure.in | 46 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 34 insertions(+), 12 deletions(-) ---- a/configure.in -+++ b/configure.in +--- Python-2.6.4.orig/configure.in ++++ Python-2.6.4/configure.in @@ -2653,6 +2653,7 @@ AC_CHECK_LIB(c, inet_aton, [$ac_cv_prog_ # On Tru64, chflags seems to be present, but calling it will # exit Python diff --git a/lang/python/patches/011-linux-3.x-compat.patch b/lang/python/patches/011-linux-3.x-compat.patch deleted file mode 100644 index 088618d39c..0000000000 --- a/lang/python/patches/011-linux-3.x-compat.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/configure -+++ b/configure -@@ -2070,6 +2070,7 @@ then - MACHDEP="$ac_md_system$ac_md_release" - - case $MACHDEP in -+ linux3) MACHDEP="linux2";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; - atheos*) MACHDEP="atheos";; ---- a/configure.in -+++ b/configure.in -@@ -240,6 +240,7 @@ then - MACHDEP="$ac_md_system$ac_md_release" - - case $MACHDEP in -+ linux3) MACHDEP="linux2";; - cygwin*) MACHDEP="cygwin";; - darwin*) MACHDEP="darwin";; - atheos*) MACHDEP="atheos";; diff --git a/lang/python/patches/020-dont-compile-python-files.patch b/lang/python/patches/020-dont-compile-python-files.patch index d9c092b52d..b3dd89d5e2 100644 --- a/lang/python/patches/020-dont-compile-python-files.patch +++ b/lang/python/patches/020-dont-compile-python-files.patch @@ -2,8 +2,8 @@ Makefile.pre.in | 16 ---------------- 1 file changed, 16 deletions(-) ---- a/Makefile.pre.in -+++ b/Makefile.pre.in +--- Python-2.6.4.orig/Makefile.pre.in ++++ Python-2.6.4/Makefile.pre.in @@ -887,22 +887,6 @@ libinstall: build_all $(srcdir)/Lib/$(PL done; \ done diff --git a/lang/python/patches/030-fixup-include-dirs.patch b/lang/python/patches/030-fixup-include-dirs.patch index 409b3e69a7..ad009562e5 100644 --- a/lang/python/patches/030-fixup-include-dirs.patch +++ b/lang/python/patches/030-fixup-include-dirs.patch @@ -2,8 +2,8 @@ setup.py | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) ---- a/setup.py -+++ b/setup.py +--- Python-2.6.4.orig/setup.py ++++ Python-2.6.4/setup.py @@ -309,9 +309,6 @@ class PyBuildExt(build_ext): return sys.platform diff --git a/lang/python/patches/040-dont-import-cross-compiled-modules.patch b/lang/python/patches/040-dont-import-cross-compiled-modules.patch index 5c99598e96..85e1e7e8aa 100644 --- a/lang/python/patches/040-dont-import-cross-compiled-modules.patch +++ b/lang/python/patches/040-dont-import-cross-compiled-modules.patch @@ -2,8 +2,8 @@ setup.py | 30 ------------------------------ 1 file changed, 30 deletions(-) ---- a/setup.py -+++ b/setup.py +--- Python-2.6.4.orig/setup.py ++++ Python-2.6.4/setup.py @@ -270,36 +270,6 @@ class PyBuildExt(build_ext): ext_filename = os.path.join( self.build_lib, diff --git a/lang/python/patches/070-dont-clean-ipkg-install.patch b/lang/python/patches/070-dont-clean-ipkg-install.patch index 593bcff83c..0eee56bb9b 100644 --- a/lang/python/patches/070-dont-clean-ipkg-install.patch +++ b/lang/python/patches/070-dont-clean-ipkg-install.patch @@ -2,8 +2,8 @@ Makefile.pre.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---- a/Makefile.pre.in -+++ b/Makefile.pre.in +--- Python-2.6.4.orig/Makefile.pre.in ++++ Python-2.6.4/Makefile.pre.in @@ -1118,11 +1118,11 @@ TAGS:: # Sanitation targets -- clean leaves libraries, executables and tags # files, which clobber removes as well diff --git a/lang/python/patches/080-distutils-dont_adjust_files.patch b/lang/python/patches/080-distutils-dont_adjust_files.patch index a32e034a75..c4798e50bf 100644 --- a/lang/python/patches/080-distutils-dont_adjust_files.patch +++ b/lang/python/patches/080-distutils-dont_adjust_files.patch @@ -2,8 +2,8 @@ Lib/distutils/command/build_scripts.py | 43 +++------------------------------ 1 file changed, 4 insertions(+), 39 deletions(-) ---- a/Lib/distutils/command/build_scripts.py -+++ b/Lib/distutils/command/build_scripts.py +--- Python-2.6.4.orig/Lib/distutils/command/build_scripts.py ++++ Python-2.6.4/Lib/distutils/command/build_scripts.py @@ -54,10 +54,7 @@ class build_scripts (Command): diff --git a/lang/python/patches/090-fix-ctypes.patch b/lang/python/patches/090-fix-ctypes.patch index 6e93182664..616e76d46b 100644 --- a/lang/python/patches/090-fix-ctypes.patch +++ b/lang/python/patches/090-fix-ctypes.patch @@ -2,9 +2,9 @@ Lib/ctypes/__init__.py | 6 ------ 1 file changed, 6 deletions(-) ---- a/Lib/ctypes/__init__.py -+++ b/Lib/ctypes/__init__.py -@@ -538,9 +538,3 @@ for kind in [c_ushort, c_uint, c_ulong, +--- Python-2.6.4.orig/Lib/ctypes/__init__.py ++++ Python-2.6.4/Lib/ctypes/__init__.py +@@ -538,9 +538,3 @@ for kind in [c_ushort, c_uint, c_ulong, elif sizeof(kind) == 4: c_uint32 = kind elif sizeof(kind) == 8: c_uint64 = kind del(kind) diff --git a/lang/python/patches/110-enable-zlib.patch b/lang/python/patches/110-enable-zlib.patch index cdc70733c7..ac2e05147f 100644 --- a/lang/python/patches/110-enable-zlib.patch +++ b/lang/python/patches/110-enable-zlib.patch @@ -2,8 +2,8 @@ Modules/Setup.dist | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---- a/Modules/Setup.dist -+++ b/Modules/Setup.dist +--- Python-2.6.4.orig/Modules/Setup.dist ++++ Python-2.6.4/Modules/Setup.dist @@ -460,7 +460,7 @@ GLHACK=-Dclear=__GLclear # Andrew Kuchling's zlib module. # This require zlib 1.1.3 (or later). diff --git a/lang/python/patches/120-force-internal-modules-for-hashlib.patch b/lang/python/patches/120-force-internal-modules-for-hashlib.patch index ca29aa651a..f0bdeef0c9 100644 --- a/lang/python/patches/120-force-internal-modules-for-hashlib.patch +++ b/lang/python/patches/120-force-internal-modules-for-hashlib.patch @@ -2,8 +2,8 @@ setup.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) ---- a/setup.py -+++ b/setup.py +--- Python-2.6.4.orig/setup.py ++++ Python-2.6.4/setup.py @@ -622,9 +622,10 @@ class PyBuildExt(build_ext): #print 'openssl_ver = 0x%08x' % openssl_ver diff --git a/lang/ruby/Makefile b/lang/ruby/Makefile index 788d136ce9..04c8a16975 100644 --- a/lang/ruby/Makefile +++ b/lang/ruby/Makefile @@ -63,7 +63,7 @@ $(call Package/ruby/Default) SECTION:=libs CATEGORY:=Libraries TITLE+= (shared library) - DEPENDS+= +libpthread +librt + DEPENDS+= +libpthread endef # Ongoing work to break up ruby's standard library into coherent pieces diff --git a/lang/simplejson/Makefile b/lang/simplejson/Makefile deleted file mode 100644 index f10ec977f1..0000000000 --- a/lang/simplejson/Makefile +++ /dev/null @@ -1,46 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=simplejson -PKG_VERSION:=2.2.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://pypi.python.org/packages/source/s/simplejson/ -PKG_MD5SUM:=070c6467462bd63306f1756b01df6d70 -PKG_BUILD_DEPENDS:=python - -include $(INCLUDE_DIR)/package.mk -$(call include_mk, python-package.mk) - -define Package/simplejson - SUBMENU:=Python - SECTION:=lang - CATEGORY:=Languages - TITLE:=Simple, fast, extensible JSON encoder/decoder for Python - URL:=http://simplejson.readthedocs.org/ - DEPENDS:=+python +distribute -endef - -define Package/simplejson/description - Simple, fast, extensible JSON encoder/decoder for Python -endef - -define Build/Compile - $(call Build/Compile/PyMod,,install --prefix=/usr --root=$(PKG_INSTALL_DIR)) -endef - -define Package/simplejson/install - $(INSTALL_DIR) $(1)$(PYTHON_PKG_DIR) - $(CP) \ - $(PKG_INSTALL_DIR)$(PYTHON_PKG_DIR)/* \ - $(1)$(PYTHON_PKG_DIR) -endef - -$(eval $(call BuildPackage,simplejson)) diff --git a/lang/twisted/Makefile b/lang/twisted/Makefile index b34091906b..cabb8cb956 100644 --- a/lang/twisted/Makefile +++ b/lang/twisted/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_URL:=http://tmrc.mit.edu/mirror/twisted/Twisted/2.5 PKG_MD5SUM:=56df2ae66db57932515a491c03bf514f PKG_BUILD_DIR:=$(BUILD_DIR)/Twisted-$(PKG_VERSION) -PKG_BUILD_DEPENDS:=python USE_UCLIBC:librpc +PKG_BUILD_DEPENDS:=python include $(INCLUDE_DIR)/package.mk $(call include_mk, python-package.mk) diff --git a/libs/avahi/Makefile b/libs/avahi/Makefile index bf00e773ec..5372492a36 100644 --- a/libs/avahi/Makefile +++ b/libs/avahi/Makefile @@ -7,23 +7,17 @@ include $(TOPDIR)/rules.mk -ifeq ($(BUILD_VARIANT),dbus) -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-dbus/$(PKG_NAME)-$(PKG_VERSION) -else -PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-nodbus/$(PKG_NAME)-$(PKG_VERSION) -endif - - PKG_NAME:=avahi PKG_VERSION:=0.6.30 -PKG_RELEASE:=3 - +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://avahi.org/download/ PKG_MD5SUM:=e4db89a2a403ff4c47d66ac66fad1f43 -PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread dbus +PKG_BUILD_DIR=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) + +PKG_BUILD_DEPENDS:=libexpat libdaemon libgdbm intltool/host libpthread PKG_FIXUP:=autoreconf PKG_REMOVE_FILES:=autogen.sh @@ -31,26 +25,22 @@ PKG_REMOVE_FILES:=autogen.sh PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 - - include $(INCLUDE_DIR)/package.mk define Package/avahi/Default SECTION:=net CATEGORY:=Network - TITLE:=An mDNS/DNS-SD implementation + TITLE:=mDNS/DNS-SD URL:=http://www.avahi.org/ endef define Package/avahi/Default/description - Avahi is an mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) - implementation (library). It facilitates - service discovery on a local network -- this means that - you can plug your laptop or computer into a network and - instantly be able to view other people who you can chat with, - find printers to print to or find files being shared. - This kind of technology is already found in MacOS X - (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') + An mDNS/DNS-SD (aka RendezVous/Bonjour/ZeroConf) implementation (library). + Avahi is a system which facilitates service discovery on a local network -- + this means that you can plug your laptop or computer into a network and + instantly be able to view other people who you can chat with, find printers + to print to or find files being shared. This kind of technology is already + found in MacOS X (branded 'Rendezvous', 'Bonjour' and sometimes 'ZeroConf') and is very convenient. endef @@ -60,25 +50,49 @@ define Package/libavahi CATEGORY:=Libraries DEPENDS:=+libdaemon +libpthread +libgdbm TITLE+= (library) + VARIANT:=nodbus +endef + +define Package/libavahi-dbus + $(call Package/avahi/Default) + SECTION:=libs + CATEGORY:=Libraries + DEPENDS:=+libdaemon +libpthread +libgdbm +dbus @!LINUX_2_4 + TITLE+= (library) (dbus) + VARIANT:=dbus endef define Package/libavahi/description $(call Package/avahi/Default/description) . - The libavahi package contains the mDNS/DNS-SD shared libraries, - used by other programs. Specifically, it provides - libavahi-core and libavahi-common libraries. - By default, it is compiled without D-Bus support, - i.e. the --disable-dbus compilation flag is set. - To enable D-Bus support, select the package - libavahi-dbus-support. + This package contains the mDNS/DNS-SD shared libraries, used by other programs. + Specifically, it provides libavahi-core and libavahi-common libraries. + This version is compiled without D-Bus support, i.e. the --disable-dbus + compilation flag is set. +endef + +define Package/libavahi-dbus/description +$(call Package/avahi/Default/description) + . + This package contains the mDNS/DNS-SD shared libraries, used by other programs. + Specifically, it provides libavahi-core and libavahi-common libraries. + This version is compiled with D-Bus support endef define Package/avahi-autoipd $(call Package/avahi/Default) SUBMENU:=IP Addresses and Names DEPENDS:=+libdaemon - TITLE:=IPv4LL network address configuration daemon + TITLE:=IPv4LL address conf daemon + VARIANT:=nodbus +endef + +define Package/avahi-autoipd-dbus + $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names + DEPENDS:=+libdaemon + TITLE:=IPv4LL address conf daemon (dbus) + VARIANT:=dbus endef define Package/avahi-autoipd/description @@ -89,6 +103,20 @@ $(call Package/avahi/Default/description) from the link-local 169.254.0.0/16 range without the need for a central server. It is primarily intended to be used in ad-hoc networks which lack a DHCP server. + . + This verison is compile along with non-D-Bus version of libavahi. +endef + +define Package/avahi-autoipd-dbus/description +$(call Package/avahi/Default/description) + . + This package implements IPv4LL, "Dynamic Configuration of IPv4 Link-Local + Addresses" (IETF RFC3927), a protocol for automatic IP address configuration + from the link-local 169.254.0.0/16 range without the need for a central + server. It is primarily intended to be used in ad-hoc networks which lack a + DHCP server. + . + This version is compiled along with the D-Bus version of libavahi. endef define Package/avahi-daemon @@ -96,6 +124,15 @@ define Package/avahi-daemon SUBMENU:=IP Addresses and Names DEPENDS:=+libavahi +libexpat TITLE+= (daemon) + VARIANT:=nodbus +endef + +define Package/avahi-daemon-dbus + $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names + DEPENDS:=+libavahi-dbus +libexpat + TITLE+= (daemon) (dbus) + VARIANT:=dbus endef define Package/avahi-daemon/description @@ -104,17 +141,38 @@ $(call Package/avahi/Default/description) This package contains an mDNS/DNS-SD daemon. endef +define Package/avahi-daemon-dbus/description +$(call Package/avahi/Default/description) + . + This package contains an mDNS/DNS-SD daemon with dbus support. +endef + define Package/avahi-daemon/conffiles /etc/avahi/avahi-daemon.conf /etc/avahi/services/http.service /etc/avahi/services/ssh.service endef +define Package/avahi-daemon-dbus/conffiles +/etc/avahi/avahi-daemon.conf +/etc/avahi/services/http.service +/etc/avahi/services/ssh.service +endef + define Package/avahi-dnsconfd $(call Package/avahi/Default) SUBMENU:=IP Addresses and Names DEPENDS:=+libavahi TITLE:=A Unicast DNS server from mDNS/DNS-SD configuration daemon + VARIANT:=nodbus +endef + +define Package/avahi-dnsconfd-dbus + $(call Package/avahi/Default) + SUBMENU:=IP Addresses and Names + DEPENDS:=+libavahi-dbus + TITLE:=A Unicast DNS server from mDNS/DNS-SD configuration daemon with dbus support + VARIANT:=dbus endef define Package/avahi-dnsconfd/description @@ -123,46 +181,36 @@ $(call Package/avahi/Default/description) This package contains a Unicast DNS server from mDNS/DNS-SD configuration daemon, which may be used to configure conventional DNS servers using mDNS in a DHCP-like fashion. Especially useful on IPv6. + . + This version does not have D-Bus support. endef -define Package/libavahi-dbus-support - $(call Package/avahi/Default) - SECTION:=libs - CATEGORY:=Libraries - VARIANT:=dbus - DEPENDS:=+dbus +libavahi - TITLE+= (D-Bus support) -endef - -define Package/libavahi-dbus-support/description -$(call Package/libavahi/description) +define Package/avahi-dnsconfd-dbus/description +$(call Package/avahi/Default/description) + . + This package contains a Unicast DNS server from mDNS/DNS-SD configuration + daemon, which may be used to configure conventional DNS servers using mDNS + in a DHCP-like fashion. Especially useful on IPv6. . - The libavahi-dbus-support package enables - D-Bus support in libavahi, needed to support - the libavahi-client library and avahi-utils. - Selecting this package modifies the contents of the - libavahi package by setting the --enable-dbus compilation flag; - it does not generate a separate binary of its own. - It also automatically adds the D-Bus package to the build. - libavahi-dbus-support is selected automatically if you select - libavahi-client or avahi-utils. + This version has D-Bus support. endef define Package/libavahi-client $(call Package/avahi/Default) SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libavahi-dbus-support +avahi-daemon + DEPENDS:=+libavahi-dbus TITLE+= (libavahi-client library) + VARIANT:=dbus endef define Package/libavahi-client/description $(call Package/avahi/Default/description) . This packages adds the libavahi-client library. - It also automatically adds the required - libavahi-dbus-support and the avahi-daemon packages. For more information please see the avahi documentation. + . + Requires D-Bus support. endef define Package/avahi-utils @@ -170,6 +218,7 @@ define Package/avahi-utils SUBMENU:=IP Addresses and Names DEPENDS:=+libavahi-client TITLE+= (utilities) + VARIANT:=dbus endef define Package/avahi-utils/description @@ -177,8 +226,9 @@ $(call Package/avahi/Default/description) . This packages installs the following avahi utility programs: avahi-browse, avahi-publish, avahi-resolve, avahi-set-host-name. - It also automatically adds the required libavahi-client package. For more information please see the avahi documentation. + . + Requires D-Bus support. endef TARGET_CFLAGS += $(FPIC) -DGETTEXT_PACKAGE @@ -226,7 +276,8 @@ endif ifeq ($(BUILD_VARIANT),dbus) CONFIGURE_ARGS += \ --enable-dbus -else +endif +ifeq ($(BUILD_VARIANT),nodbus) CONFIGURE_ARGS += \ --disable-dbus endif @@ -243,17 +294,16 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ endef -define Package/libavahi-dbus-support/install +define Package/libavahi-dbus/install $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/ + $(INSTALL_DIR) $(1)/etc/dbus-1/system.d + $(CP) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/* $(1)/etc/dbus-1/system.d endef define Package/libavahi/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libavahi-{common,core}.so.* $(1)/usr/lib/ -ifeq ($(BUILD_VARIANT),dbus) - $(INSTALL_DIR) $(1)/etc/dbus-1/system.d - $(CP) $(PKG_INSTALL_DIR)/etc/dbus-1/system.d/* $(1)/etc/dbus-1/system.d -endif endef define Package/libavahi-client/install @@ -285,6 +335,18 @@ define Package/avahi-daemon/install $(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon endef +define Package/avahi-daemon-dbus/install + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-daemon $(1)/usr/sbin/ + $(INSTALL_DIR) $(1)/etc/avahi + $(INSTALL_DATA) ./files/avahi-daemon.conf $(1)/etc/avahi/ + $(INSTALL_DIR) $(1)/etc/avahi/services + $(INSTALL_DATA) ./files/service-http $(1)/etc/avahi/services/http.service + $(INSTALL_DATA) ./files/service-ssh $(1)/etc/avahi/services/ssh.service + $(INSTALL_DIR) $(1)/etc/init.d + $(INSTALL_BIN) ./files/avahi-daemon.init $(1)/etc/init.d/avahi-daemon +endef + define Package/avahi-dnsconfd/install $(INSTALL_DIR) $(1)/etc/avahi $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/ @@ -292,11 +354,21 @@ define Package/avahi-dnsconfd/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ endef +define Package/avahi-dnsconfd-dbus/install + $(INSTALL_DIR) $(1)/etc/avahi + $(CP) $(PKG_INSTALL_DIR)/etc/avahi/avahi-dnsconfd.action $(1)/etc/avahi/ + $(INSTALL_DIR) $(1)/usr/sbin + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/avahi-dnsconfd $(1)/usr/sbin/ +endef + $(eval $(call BuildPackage,libavahi-client)) $(eval $(call BuildPackage,avahi-utils)) -$(eval $(call BuildPackage,libavahi-dbus-support)) +$(eval $(call BuildPackage,libavahi-dbus)) $(eval $(call BuildPackage,libavahi)) $(eval $(call BuildPackage,avahi-autoipd)) +$(eval $(call BuildPackage,avahi-autoipd-dbus)) $(eval $(call BuildPackage,avahi-daemon)) +$(eval $(call BuildPackage,avahi-daemon-dbus)) $(eval $(call BuildPackage,avahi-dnsconfd)) +$(eval $(call BuildPackage,avahi-dnsconfd-dbus)) diff --git a/libs/axtls/Makefile b/libs/axtls/Makefile index f1f3610b8b..d719a9b366 100644 --- a/libs/axtls/Makefile +++ b/libs/axtls/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=axtls -PKG_VERSION:=1.4.3 +PKG_VERSION:=1.2.4 PKG_RELEASE:=1 PKG_SOURCE:=axTLS-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/axtls -PKG_MD5SUM:=f0e50d11fec81714b40ae21cca23b827 +PKG_MD5SUM:=4b7a6dafbe45357f63813410dae676fd include $(INCLUDE_DIR)/package.mk diff --git a/libs/axtls/files/config b/libs/axtls/files/config index 0e33fefb4c..3a189ca890 100644 --- a/libs/axtls/files/config +++ b/libs/axtls/files/config @@ -14,10 +14,8 @@ PREFIX="/usr" CONFIG_STRIP_UNWANTED_SECTIONS=y # CONFIG_VISUAL_STUDIO_7_0 is not set # CONFIG_VISUAL_STUDIO_8_0 is not set -# CONFIG_VISUAL_STUDIO_10_0 is not set CONFIG_VISUAL_STUDIO_7_0_BASE="" CONFIG_VISUAL_STUDIO_8_0_BASE="" -CONFIG_VISUAL_STUDIO_10_0_BASE="" CONFIG_EXTRA_CFLAGS_OPTIONS="" CONFIG_EXTRA_LDFLAGS_OPTIONS="" @@ -40,12 +38,12 @@ CONFIG_SSL_X509_CERT_LOCATION="" CONFIG_SSL_X509_COMMON_NAME="" CONFIG_SSL_X509_ORGANIZATION_NAME="" CONFIG_SSL_X509_ORGANIZATION_UNIT_NAME="" -# CONFIG_SSL_ENABLE_V23_HANDSHAKE is not set +CONFIG_SSL_ENABLE_V23_HANDSHAKE=y CONFIG_SSL_HAS_PEM=y CONFIG_SSL_USE_PKCS12=y CONFIG_SSL_EXPIRY_TIME=24 -CONFIG_X509_MAX_CA_CERTS=150 -CONFIG_SSL_MAX_CERTS=3 +CONFIG_X509_MAX_CA_CERTS=4 +CONFIG_SSL_MAX_CERTS=2 # CONFIG_SSL_CTX_MUTEXING is not set CONFIG_USE_DEV_URANDOM=y # CONFIG_WIN32_USE_CRYPTO_LIB is not set @@ -59,11 +57,11 @@ CONFIG_AXTLSWRAP=y # Axhttpd Configuration # # CONFIG_HTTP_STATIC_BUILD is not set -CONFIG_HTTP_PORT=80 +CONFIG_HTTP_PORT=0 CONFIG_HTTP_HTTPS_PORT=443 CONFIG_HTTP_SESSION_CACHE_SIZE=5 CONFIG_HTTP_WEBROOT="" -CONFIG_HTTP_TIMEOUT=300 +CONFIG_HTTP_TIMEOUT=0 # # CGI @@ -121,6 +119,3 @@ SQU_KARATSUBA_THRESH=0 CONFIG_BIGINT_SLIDING_WINDOW=y CONFIG_BIGINT_SQUARE=y # CONFIG_BIGINT_CHECK_ON is not set -CONFIG_INTEGER_32BIT=y -# CONFIG_INTEGER_16BIT is not set -# CONFIG_INTEGER_8BIT is not set diff --git a/libs/boost/Makefile b/libs/boost/Makefile index d9c5e27137..1d6c2fbb89 100644 --- a/libs/boost/Makefile +++ b/libs/boost/Makefile @@ -10,16 +10,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=boost -PKG_VERSION:=1_46_0 +PKG_VERSION:=1_38_0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/boost PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)_$(PKG_VERSION) -HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)_$(PKG_VERSION) -PKG_MD5SUM:=820393d5746553c192db7b81ba0e53fe +PKG_MD5SUM:=a4fc691c4e7c49b3b9b54a667d8f5529 -PKG_BUILD_DEPENDS:=boost/host +PKG_BUILD_DEPENDS:=boost-jam/host PKG_BUILD_PARALLEL:=1 PKG_CONFIG_DEPENDS := \ @@ -39,14 +38,13 @@ PKG_CONFIG_DEPENDS := \ CONFIG_PACKAGE_boost-wave \ include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/host-build.mk define Package/boost/Default SECTION:=libs CATEGORY:=Libraries TITLE:=Boost C++ source libraries URL:=http://www.boost.org - DEPENDS:=+libstdcpp + DEPENDS:=+libstdcpp @!LINUX_2_4 endef define Package/boost/Default/description @@ -63,6 +61,12 @@ define Package/boost-filesystem TITLE+= (filesystem) endef +define Package/boost-function_types + $(call Package/boost/Default) + TITLE+= (function_types) + BUILD_ONLY:=1 +endef + define Package/boost-graph $(call Package/boost/Default) TITLE+= (graph) @@ -139,17 +143,10 @@ endef define Build/Configure endef -define Host/Compile - # bjam does not provide a configure-script nor a Makefile - ( cd $(HOST_BUILD_DIR)/tools/build/v2/engine/src ; ./build.sh gcc ) -endef - CONFIGURE_PREFIX:=$(PKG_INSTALL_DIR) -TARGET_LDFLAGS += -pthreads -lrt - define Build/Compile ( cd $(PKG_BUILD_DIR) ; \ - echo "using gcc : : $(GNU_TARGET_NAME)-gcc : \"$(TARGET_CFLAGS)\" \"$(TARGET_CXXFLAGS)\" \"$(TARGET_LDFLAGS)\" ;" > tools/build/v2/site-config.jam ; \ + echo "using gcc : : $(GNU_TARGET_NAME)-gcc : $(TARGET_CFLAGS) $(TARGET_CXXFLAGS) $(TARGET_LDFLAGS) ;" > tools/build/v2/site-config.jam ; \ $(if $(CONFIG_PACKAGE_boost-python), \ echo "using python : : $(STAGING_DIR_ROOT)/usr/bin/python : $(STAGING_DIR)/usr/include/python2.6/ ;" >> \ tools/build/v2/site-config.jam; \ @@ -162,6 +159,7 @@ define Build/Compile $(CONFIGURE_ARGS) \ $(if $(CONFIG_PACKAGE_boost-date_time),--with-date_time) \ $(if $(CONFIG_PACKAGE_boost-filesystem),--with-filesystem) \ + $(if $(CONFIG_PACKAGE_boost-function_types),--with-function_types) \ $(if $(CONFIG_PACKAGE_boost-graph),--with-graph) \ $(if $(CONFIG_PACKAGE_boost-iostreams),--with-iostreams) \ $(if $(CONFIG_PACKAGE_boost-math),--with-math) \ @@ -193,11 +191,6 @@ define Build/InstallDev fi endef -define Host/Install - $(INSTALL_DIR) $(STAGING_DIR_HOST)/bin - $(CP) $(HOST_BUILD_DIR)/tools/build/v2/engine/src/bin.*/bjam $(STAGING_DIR_HOST)/bin/ -endef - define Package/boost/Default/install $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/lib/libboost_$(2)*.so* $(1)/usr/lib/ @@ -265,10 +258,10 @@ define Package/boost-wave/install $(call Package/boost/Default/install,$(1),wave) endef -$(eval $(call HostBuild)) $(eval $(call BuildPackage,boost)) $(eval $(call BuildPackage,boost-date_time)) $(eval $(call BuildPackage,boost-filesystem)) +$(eval $(call BuildPackage,boost-function_types)) $(eval $(call BuildPackage,boost-graph)) $(eval $(call BuildPackage,boost-iostreams)) $(eval $(call BuildPackage,boost-math)) diff --git a/libs/boost/patches/010-one-cpu.patch b/libs/boost/patches/010-one-cpu.patch new file mode 100644 index 0000000000..baed048f5a --- /dev/null +++ b/libs/boost/patches/010-one-cpu.patch @@ -0,0 +1,12 @@ +diff -Naur boost_1_35_0.orig/libs/thread/src/pthread/thread.cpp boost_1_35_0/libs/thread/src/pthread/thread.cpp +--- boost_1_35_0.orig/libs/thread/src/pthread/thread.cpp 2008-05-08 06:18:57.000000000 -0400 ++++ boost_1_35_0/libs/thread/src/pthread/thread.cpp 2008-05-08 06:20:15.000000000 -0400 +@@ -419,7 +419,7 @@ + #if defined(PTW32_VERSION) || defined(__hpux) + return pthread_num_processors_np(); + #elif defined(__linux__) +- return get_nprocs(); ++ return 1; + #elif defined(__APPLE__) || defined(__FreeBSD__) + int count; + size_t size=sizeof(count); diff --git a/libs/boost/patches/020-buildin-offsetof.patch b/libs/boost/patches/020-buildin-offsetof.patch new file mode 100644 index 0000000000..8ad06e2f2a --- /dev/null +++ b/libs/boost/patches/020-buildin-offsetof.patch @@ -0,0 +1,11 @@ +--- boost_1_38_0/boost/python/detail/config.hpp 2007-11-25 19:07:19.000000000 +0100 ++++ boost_1_38_0/boost/python/detail/config.hpp 2010-02-26 02:06:26.000000000 +0100 +@@ -111,7 +111,7 @@ + # define BOOST_PYTHON_OFFSETOF(s_name, s_member) \ + ((size_t)__INTADDR__(&(((s_name *)0)->s_member))) + #else +-# define BOOST_PYTHON_OFFSETOF offsetof ++# define BOOST_PYTHON_OFFSETOF __builtin_offsetof + #endif + + // enable automatic library variant selection ------------------------------// diff --git a/libs/boost/patches/100-do-not-use-librt.patch b/libs/boost/patches/100-do-not-use-librt.patch deleted file mode 100644 index b8e62a56ca..0000000000 --- a/libs/boost/patches/100-do-not-use-librt.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- a/tools/build/v2/tools/gcc.jam -+++ b/tools/build/v2/tools/gcc.jam -@@ -1018,8 +1018,7 @@ rule setup-threading ( targets * : sourc - } - case * : - { -- option = -pthread ; -- libs = rt ; -+ # pass appropriate options via OpenWrt - } - } - ---- a/tools/build/v2/tools/gcc.py -+++ b/tools/build/v2/tools/gcc.py -@@ -685,8 +685,8 @@ elif bjam.variable('UNIX'): - # Darwin has no threading options, don't set anything here. - pass - else: -- flags('gcc', 'OPTIONS', ['multi'], ['-pthread']) -- flags('gcc', 'FINDLIBS-SA', [], ['rt']) -+ # pass appropriate options via OpenWrt -+ pass - - def cpu_flags(toolset, variable, architecture, instruction_set, values, default=None): - #FIXME: for some reason this fails. Probably out of date feature code diff --git a/libs/classpath/Makefile b/libs/classpath/Makefile index cf46c66f38..084fbdeeb3 100644 --- a/libs/classpath/Makefile +++ b/libs/classpath/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=classpath PKG_VERSION:=0.98 -PKG_RELEASE:=4 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/classpath @@ -26,6 +26,7 @@ define Package/classpath TITLE:=GNU Classpath URL:=http://www.gnu.org/software/classpath/ MAINTAINER:=Roberto Riggio + DEPENDS:=@BROKEN endef define Package/classpath/Description @@ -34,37 +35,21 @@ define Package/classpath/Description machines and compilers for the java programming language. endef -define Download/antlr - URL:=http://www.antlr.org/download - FILE:=antlr-3.4-complete.jar - MD5SUM:=1b91dea1c7d480b3223f7c8a9aa0e172 +define Build/Configure + $(call Build/Configure/Default, \ + --with-javac \ + --enable-jni \ + --disable-gtk-peer \ + --disable-gconf-peer \ + --disable-plugin \ + ) endef -$(eval $(call Download,antlr)) - -CONFIGURE_ARGS += \ - --without-x \ - --disable-gtk-peer \ - --disable-qt-peer \ - --disable-dssi \ - --disable-plugin \ - --disable-gconf-peer \ - --disable-gjdoc \ - --with-antlr-jar=$(DL_DIR)/antlr-3.4-complete.jar define Package/classpath/install - $(INSTALL_DIR) \ - $(1)/usr/lib/classpath \ - $(1)/usr/share/classpath - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/security \ - $(PKG_INSTALL_DIR)/usr/lib/logging.properties \ - $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/classpath/*.so* $(1)/usr/lib/classpath/ + $(INSTALL_DIR) $(1)/usr/share/classpath + $(INSTALL_DIR) $(1)/usr/lib/classpath $(CP) $(PKG_INSTALL_DIR)/usr/share/classpath/glibj.zip $(1)/usr/share/classpath/ -endef - -define Build/InstallDev - $(CP) $(PKG_INSTALL_DIR)/* $(1)/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/classpath/* $(1)/usr/lib/classpath/ endef $(eval $(call BuildPackage,classpath)) diff --git a/libs/clearsilver/Config.in b/libs/clearsilver/Config.in index 9289591635..9aa5c32c5c 100644 --- a/libs/clearsilver/Config.in +++ b/libs/clearsilver/Config.in @@ -1,6 +1,7 @@ config CLEARSILVER_ENABLE_COMPRESSION bool "HTML compression support" default y if PACKAGE_zlib + select PACKAGE_zlib config CLEARSILVER_ENABLE_REMOTE_DEBUGGER bool "Remote X CGI debugging" diff --git a/libs/curl/Makefile b/libs/curl/Makefile index ea1dcdec20..806192d0fd 100644 --- a/libs/curl/Makefile +++ b/libs/curl/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=curl -PKG_VERSION:=7.23.1 +PKG_VERSION:=7.21.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 @@ -19,7 +19,7 @@ PKG_SOURCE_URL:=http://curl.haxx.se/download/ \ ftp://ftp.planetmirror.com/pub/curl/ \ http://www.mirrormonster.com/curl/download/ \ http://curl.mirrors.cyberservers.net/download/ -PKG_MD5SUM:=0296d3196b4bf82c896a869b38dbc5f2 +PKG_MD5SUM:=5f6d50c4d4ee38c57fe37e3cff75adbd PKG_FIXUP:=libtool PKG_BUILD_PARALLEL:=1 @@ -98,7 +98,7 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/libcurl.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_BUILD_DIR)/libcurl.pc $(1)/usr/lib/pkgconfig/ $(SED) 's,-L$$$${exec_prefix}/lib,,g' $(1)/usr/bin/curl-config - [ -n "$(TARGET_LDFLAGS)" ] && $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc || true + $(SED) 's#$(TARGET_LDFLAGS)##g' $(1)/usr/lib/pkgconfig/libcurl.pc ln -sf $(STAGING_DIR)/usr/bin/curl-config $(2)/bin/ endef diff --git a/libs/curl/patches/100-cross-compile.patch b/libs/curl/patches/100-cross-compile.patch index 9dd39e4f6d..91109409e0 100644 --- a/libs/curl/patches/100-cross-compile.patch +++ b/libs/curl/patches/100-cross-compile.patch @@ -1,6 +1,8 @@ ---- a/configure.ac -+++ b/configure.ac -@@ -1542,15 +1542,6 @@ if test X"$OPT_SSL" != Xno; then +Index: curl-7.21.7/configure.ac +=================================================================== +--- curl-7.21.7.orig/configure.ac ++++ curl-7.21.7/configure.ac +@@ -1522,15 +1522,6 @@ if test X"$OPT_SSL" != Xno; then fi if test "$OPENSSL_ENABLED" = "1"; then @@ -16,7 +18,7 @@ CURL_CHECK_OPENSSL_API fi -@@ -1779,17 +1770,6 @@ if test "$OPENSSL_ENABLED" != "1"; then +@@ -1759,17 +1750,6 @@ if test "$OPENSSL_ENABLED" != "1"; then if test "x$USE_GNUTLS" = "xyes"; then AC_MSG_NOTICE([detected GnuTLS version $version]) @@ -34,7 +36,7 @@ fi fi -@@ -1889,18 +1869,6 @@ if test "$OPENSSL_ENABLED" != "1"; then +@@ -1869,18 +1849,6 @@ if test "$OPENSSL_ENABLED" != "1"; then CURL_LIBS="$CURL_LIBS -lpolarssl" LIBS="$LIBS -lpolarssl" @@ -53,7 +55,7 @@ fi fi dnl PolarSSL not disabled -@@ -1978,18 +1946,6 @@ if test "$OPENSSL_ENABLED" != "1"; then +@@ -1958,18 +1926,6 @@ if test "$OPENSSL_ENABLED" != "1"; then CURL_LIBS="$CURL_LIBS -lcyassl -lm" LIBS="$LIBS -lcyassl -lm" @@ -72,7 +74,7 @@ fi fi dnl CyaSSL not disabled -@@ -2073,19 +2029,6 @@ if test "$OPENSSL_ENABLED" != "1" -a "$G +@@ -2053,19 +2009,6 @@ if test "$OPENSSL_ENABLED" != "1" -a "$G CPPFLAGS="$CLEANCPPFLAGS" ]) @@ -92,7 +94,7 @@ fi fi dnl NSS not disabled -@@ -2134,11 +2077,6 @@ if test "$curl_ssl_msg" = "$init_ssl_msg +@@ -2114,11 +2057,6 @@ if test "$curl_ssl_msg" = "$init_ssl_msg AXTLS_ENABLED=1 USE_AXTLS="yes" curl_ssl_msg="enabled (axTLS)" @@ -104,7 +106,7 @@ ],[ LDFLAGS="$CLEANLDFLAGS" CPPFLAGS="$CLEANCPPFLAGS" -@@ -2240,10 +2178,6 @@ if test X"$OPT_LIBSSH2" != Xno; then +@@ -2220,10 +2158,6 @@ if test X"$OPT_LIBSSH2" != Xno; then dnl libssh2_session_handshake was added in 1.2.8 AC_CHECK_FUNCS( libssh2_version libssh2_init libssh2_exit \ libssh2_scp_send64 libssh2_session_handshake) diff --git a/libs/curl/patches/510-no_sslv2.patch b/libs/curl/patches/510-no_sslv2.patch new file mode 100644 index 0000000000..4866b37c6c --- /dev/null +++ b/libs/curl/patches/510-no_sslv2.patch @@ -0,0 +1,25 @@ +--- a/src/main.c ++++ b/src/main.c +@@ -936,7 +936,9 @@ static void help(void) + "Time needed to trig speed-limit abort. Defaults to 30", + " --ssl Try SSL/TLS (FTP, IMAP, POP3, SMTP)", + " --ssl-reqd Require SSL/TLS (FTP, IMAP, POP3, SMTP)", ++#ifndef OPENSSL_NO_SSL2 + " -2/--sslv2 Use SSLv2 (SSL)", ++#endif + " -3/--sslv3 Use SSLv3 (SSL)", + " --stderr Where to redirect stderr. - means stdout", + " --tcp-nodelay Use the TCP_NODELAY option", +@@ -2535,10 +2537,12 @@ static ParameterError getparameter(char + /* TLS version 1 */ + config->ssl_version = CURL_SSLVERSION_TLSv1; + break; ++#ifndef OPENSSL_NO_SSL2 + case '2': + /* SSL version 2 */ + config->ssl_version = CURL_SSLVERSION_SSLv2; + break; ++#endif + case '3': + /* SSL version 3 */ + config->ssl_version = CURL_SSLVERSION_SSLv3; diff --git a/libs/cyrus-sasl/Makefile b/libs/cyrus-sasl/Makefile index ca78de83e3..1452520305 100644 --- a/libs/cyrus-sasl/Makefile +++ b/libs/cyrus-sasl/Makefile @@ -19,7 +19,7 @@ PKG_BUILD_DEPENDS:=libopenssl PKG_FIXUP:=autoreconf PKG_MACRO_PATHS:=cmulocal config ../cmulocal ../config -PKG_AUTOMAKE_PATHS:=. saslauthd sasldb +PKG_AUTOMAKE_PATHS:=. saslauthd PKG_REMOVE_FILES:=aclocal.m4 saslauthd/aclocal.m4 include $(INCLUDE_DIR)/package.mk diff --git a/libs/elfutils/Makefile b/libs/elfutils/Makefile index 4f64575337..069854db48 100644 --- a/libs/elfutils/Makefile +++ b/libs/elfutils/Makefile @@ -32,11 +32,6 @@ define Package/libdw TITLE+= (libdw) endef -define Package/libelf1 - $(call Package/elfutils/Default) - TITLE+= (libelf) -endef - ifdef CONFIG_USE_UCLIBC CONFIGURE_VARS += \ LIBS="-largp" @@ -47,7 +42,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_BUILD_DIR)/libdw/libdw.{a,so*} $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/libelf/libelf.{a,so*} $(1)/usr/lib/ endef define Package/libdw/install @@ -55,10 +49,4 @@ define Package/libdw/install $(CP) $(PKG_BUILD_DIR)/libdw/libdw.so* $(1)/usr/lib/ endef -define Package/libelf1/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/libelf/libelf.so* $(1)/usr/lib/ -endef - $(eval $(call BuildPackage,libdw)) -$(eval $(call BuildPackage,libelf1)) diff --git a/libs/fcgi/Makefile b/libs/fcgi/Makefile index 330c0d2095..fcb1f64178 100644 --- a/libs/fcgi/Makefile +++ b/libs/fcgi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -21,28 +21,17 @@ PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -define Package/fcgi/Default +define Package/fcgi SECTION:=libs CATEGORY:=Libraries - URL:=http://www.fastcgi.com/ -endef - -define Package/fcgi - $(call Package/fcgi/Default) - MENU:=1 - DEPENDS:= +libpthread TITLE:=Shared library of FastCGI -endef - -define Package/fcgixx - $(call Package/fcgi/Default) - DEPENDS:=fcgi +USE_UCLIBC:uclibcxx - TITLE:=Shared library of FastCGI++ + DEPENDS:=+uclibcxx + URL:=http://www.fastcgi.com/ endef define Package/fcgi/description - FastCGI is a language independent, scalable, open extension to - CGI that provides high performance without the limitations of + FastCGI is a language independent, scalable, open extension to + CGI that provides high performance without the limitations of server specific APIs. endef @@ -53,7 +42,7 @@ CONFIGURE_ARGS += \ --enable-static \ CONFIGURE_VARS += \ - CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClibc++" \ + CPPFLAGS="$$$$CPPFLAGS -I$(STAGING_DIR)/usr/include/uClic++" \ CXXFLAGS="$$$$CXXFLAGS -fno-builtin -fno-rtti -nostdinc++" \ LIBS="-nodefaultlibs -luClibc++ -lm" \ @@ -62,7 +51,7 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/include/fastcgi.h $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/fcgi{app,_config,misc,o,os,_stdio}.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi{,++}.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi.{a,so*} $(1)/usr/lib/ endef define Package/fcgi/install @@ -72,10 +61,4 @@ define Package/fcgi/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi.so.* $(1)/usr/lib/ endef -define Package/fcgixx/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libfcgi++.so.* $(1)/usr/lib/ -endef - $(eval $(call BuildPackage,fcgi)) -$(eval $(call BuildPackage,fcgixx)) diff --git a/libs/ftplib/Makefile b/libs/ftplib/Makefile deleted file mode 100644 index f7199ad72a..0000000000 --- a/libs/ftplib/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=ftplib -PKG_VERSION:=3.1-1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://nbpfaus.net/~pfau/ftplib/ -PKG_MD5SUM:=763be9c7e7b110776f88521a558dbc55 - -include $(INCLUDE_DIR)/package.mk - -MAKE_PATH:=src - -define Package/ftplib - SECTION:=libs - CATEGORY:=Libraries - TITLE:=ftplib - URL:=http://nbpfaus.net/~pfau/ftplib/ -endef - -define Package/ftplib/description -ftplib is a set of routines that implement the FTP protocol. They allow -applications to create and access remote files through function calls instead -of needing to fork and exec an interactive ftp client program. -endef - -define Build/Compile - $(call Build/Compile/Default,all) -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/ - $(INSTALL_DATA) $(PKG_BUILD_DIR)/src/ftplib.h $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/src/libftp.{so*,a} $(1)/usr/lib/ -endef - -define Package/ftplib/install - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_BUILD_DIR)/src/libftp.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,ftplib)) diff --git a/libs/ftplib/patches/001-fix_ascii_read_without_eol.patch b/libs/ftplib/patches/001-fix_ascii_read_without_eol.patch deleted file mode 100644 index a1b56c7197..0000000000 --- a/libs/ftplib/patches/001-fix_ascii_read_without_eol.patch +++ /dev/null @@ -1,38 +0,0 @@ -Description: Fix reading FTP data is ASCII mode - In ASCII mode, if you don't have a line in the next block that you're - trying to read, then ftplib would set the first character to '\0'. - . - Upstream probably intented to return an empty string when requesting - to read only 1 character since that doesn't make much sense when the - EOL delimiter is 2 characters already (\r\n). However, due to the - way data is read, max can be set to 1 just after having read max-1 - legitimate bytes and we should not be overwriting the first byte. - . - Patch is not submitted upstream since upstream is not actively - maintaining it. -Origin: vendor, see Author -Author: Raphaël Hertzog -Last-Update: 2009-11-24 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Forwarded: -Reviewed-By: -Last-Update: - ---- a/src/ftplib.c -+++ b/src/ftplib.c -@@ -220,7 +220,6 @@ static int readline(char *buf,int max,ne - } - if (max == 1) - { -- *buf = '\0'; - break; - } - if (ctl->cput == ctl->cget) diff --git a/libs/ftplib/patches/002-check_getserv_by_name.patch b/libs/ftplib/patches/002-check_getserv_by_name.patch deleted file mode 100644 index 59ab73d90a..0000000000 --- a/libs/ftplib/patches/002-check_getserv_by_name.patch +++ /dev/null @@ -1,28 +0,0 @@ -Description: Verify value returned by getservbyname - getservbyname() can return a NULL pointer and dereferencing it - would lead to a segfault. - . - The patch is not forwarded upstream but there's no real maintainance - upstream any more. -Origin: vendor, see changelog entry 3.1-1-2 -Author: Richard Braakman -Last-Update: 2009-10-29 -Forwarded: no - -diff --git a/linux/ftplib.c b/linux/ftplib.c -index 9089a5b..c4a5873 100644 ---- a/src/ftplib.c -+++ b/src/ftplib.c -@@ -416,7 +416,11 @@ GLOBALDEF int FtpConnect(const char *host, netbuf **nControl) - sin.sin_port = htons(atoi(pnum)); - else - { -- pse = getservbyname(pnum,"tcp"); -+ if ((pse = getservbyname(pnum,"tcp")) == NULL) -+ { -+ perror("getservbyname"); -+ return 0; -+ } - sin.sin_port = pse->s_port; - } - } diff --git a/libs/gconf2/Makefile b/libs/gconf2/Makefile new file mode 100644 index 0000000000..86b764def3 --- /dev/null +++ b/libs/gconf2/Makefile @@ -0,0 +1,109 @@ +include $(TOPDIR)/rules.mk + +PKG_NAME:=gconf2 +PKG_VERSION:=2.24.0 +PKG_RELEASE:=1 + +PKG_BUILD_DIR:=$(BUILD_DIR)/GConf-$(PKG_VERSION) +PKG_SOURCE:=GConf-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=@GNOME/GConf/2.24 +PKG_MD5SUM:=4971d96f5ba94fe4a69396267bd5afe8 + +PKG_FIXUP:=libtool + +include $(INCLUDE_DIR)/package.mk +include $(INCLUDE_DIR)/nls.mk + +PKG_BUILD_DEPENDS:=orbit2/host intltool/host + +PKG_INSTALL=1 + +TARGET_LDFLAGS+= \ + -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + +define Package/libgconf2 + SECTION:=libs + CATEGORY:=Libraries + TITLE:=GConf2 library + URL:=http://www.gnome.org/projects/gconf/ + DEPENDS:=+orbit2 +glib2 +dbus +libdbus-glib +libxml2 +endef + +define Package/libgconf2/description +GConf is a configuration database system for storing application preferences. +endef + +define Package/gconf2 + SECTION:=utils + CATEGORY:=Utilities + TITLE:=GConf2 command line utils + URL:=http://www.gnome.org/projects/gconf/ + DEPENDS:=+libgconf2 +endef + +define Package/gconf2/description +GConf is a configuration database system for storing application preferences. +endef + +define Build/Configure + $(call Build/Configure/Default, \ + --disable-gtk \ + ) + find $(PKG_BUILD_DIR) -name Makefile -exec sed -i 's,ORBIT_IDL.*orbit-idl-2,ORBIT_IDL = $(STAGING_DIR_HOST)/bin/orbit-idl-2,g' {} \; # tell gconf2 to use the host-built idl-compiler +endef + +define Build/InstallDev + $(INSTALL_DIR) $(1)/usr/{include/gconf/2/gconf,lib/pkgconfig,share/aclocal} + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/include/gconf/2/gconf/* \ + $(1)/usr/include/gconf/2/gconf/ + + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libgconf-2.{so*,la,a} \ + $(1)/usr/lib/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* \ + $(1)/usr/lib/pkgconfig/ + + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/aclocal/* \ + $(1)/usr/share/aclocal/ +endef + +define Package/libgconf2/install + $(INSTALL_DIR) $(1)/etc/gconf + $(CP) \ + $(PKG_INSTALL_DIR)/etc/gconf/* \ + $(1)/etc/gconf/ + + $(INSTALL_DIR) $(1)/usr/lib + $(CP) \ + $(PKG_INSTALL_DIR)/usr/lib/libgconf-2.so* \ + $(1)/usr/lib/ + + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/lib/gconfd-2 \ + $(1)/usr/lib/ + + $(INSTALL_DIR) $(1)/usr/lib/GConf/2 + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/lib/GConf/2/libgconfbackend-xml.so \ + $(1)/usr/lib/GConf/2/ + + $(INSTALL_DIR) $(1)/usr/share/dbus-1/services + $(INSTALL_DATA) \ + $(PKG_INSTALL_DIR)/usr/share/dbus-1/services/* \ + $(1)/usr/share/dbus-1/services/ +endef + +define Package/gconf2/install + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) \ + $(PKG_INSTALL_DIR)/usr/bin/* \ + $(1)/usr/bin/ +endef + +$(eval $(call BuildPackage,libgconf2)) +$(eval $(call BuildPackage,gconf2)) diff --git a/libs/gconf2/patches/010-do-not-use-GTK_DOC-macro.patch b/libs/gconf2/patches/010-do-not-use-GTK_DOC-macro.patch new file mode 100644 index 0000000000..170524c968 --- /dev/null +++ b/libs/gconf2/patches/010-do-not-use-GTK_DOC-macro.patch @@ -0,0 +1,11 @@ +--- GConf-2.24.0.orig/configure.in 2008-09-22 19:51:00.000000000 +0200 ++++ GConf-2.24.0/configure.in 2010-12-10 15:50:41.515380606 +0100 +@@ -127,7 +127,7 @@ + fi + fi + +-GTK_DOC_CHECK([1.0]) ++#GTK_DOC_CHECK([1.0]) + + AC_ARG_ENABLE(gtk, [ --enable-gtk Enable GTK+ support (for gconf-sanity-check) [default=auto]], enable_gtk="$enableval", enable_gtk=auto) + diff --git a/libs/gconf2/patches/020-do-not-build-examples_docs_pos_tests.patch b/libs/gconf2/patches/020-do-not-build-examples_docs_pos_tests.patch new file mode 100644 index 0000000000..70cc993061 --- /dev/null +++ b/libs/gconf2/patches/020-do-not-build-examples_docs_pos_tests.patch @@ -0,0 +1,23 @@ +--- GConf-2.24.0.orig/Makefile.in 2008-09-22 20:03:56.000000000 +0200 ++++ GConf-2.24.0/Makefile.in 2010-12-10 13:52:16.027379891 +0100 +@@ -267,8 +267,8 @@ + top_build_prefix = @top_build_prefix@ + top_builddir = @top_builddir@ + top_srcdir = @top_srcdir@ +-SUBDIRS = gconf backends po doc examples $(am__append_1) +-DIST_SUBDIRS = tests $(SUBDIRS) ++SUBDIRS = gconf backends $(am__append_1) ++DIST_SUBDIRS = $(SUBDIRS) + EXTRA_DIST = \ + TODO \ + gtk-doc.make \ +diff -ruN GConf-2.24.0.orig//Makefile.am GConf-2.24.0//Makefile.am +--- GConf-2.24.0.orig//Makefile.am 2008-08-19 11:41:58.000000000 +0200 ++++ GConf-2.24.0//Makefile.am 2010-12-10 18:49:14.591378059 +0100 +@@ -1,5 +1,5 @@ + +-SUBDIRS = gconf backends po doc examples ++SUBDIRS = gconf backends + + if ENABLE_DEFAULTS_SERVICE + SUBDIRS += defaults diff --git a/libs/gd/patches/101-gdlib-config.patch b/libs/gd/patches/101-gdlib-config.patch index 29f052da0c..217f01e8d6 100644 --- a/libs/gd/patches/101-gdlib-config.patch +++ b/libs/gd/patches/101-gdlib-config.patch @@ -14,7 +14,7 @@ echo "cflags: -I@includedir@" echo "ldflags: @LDFLAGS@" - echo "libs: @LIBS@ @LIBICONV@" -+ echo "libs: @LIBS@" ++ echo "libs: @LIBS@ echo "libdir: $libdir" echo "features: @FEATURES@" ;; diff --git a/libs/gdbm/Makefile b/libs/gdbm/Makefile index 32716d297f..9d9c58cc01 100644 --- a/libs/gdbm/Makefile +++ b/libs/gdbm/Makefile @@ -8,15 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gdbm -PKG_VERSION:=1.9.1 -PKG_RELEASE:=2 +PKG_VERSION:=1.8.3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/gdbm -PKG_MD5SUM:=59f6e4c4193cb875964ffbe8aa384b58 +PKG_MD5SUM:=1d1b1d5c0245b1c00aff92da751e9aa1 PKG_FIXUP:=libtool -PKG_BUILD_PARALLEL:=0 +PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -37,7 +37,7 @@ define Build/Compile $(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ BINOWN=`id -u` \ BINGRP=`id -g` \ - DESTDIR="$(PKG_INSTALL_DIR)" \ + INSTALL_ROOT="$(PKG_INSTALL_DIR)" \ all install endef diff --git a/libs/gdbm/patches/100-fix-build-with-libtool2.patch b/libs/gdbm/patches/100-fix-build-with-libtool2.patch new file mode 100644 index 0000000000..8501971300 --- /dev/null +++ b/libs/gdbm/patches/100-fix-build-with-libtool2.patch @@ -0,0 +1,29 @@ +--- a/Makefile.in ++++ b/Makefile.in +@@ -55,7 +55,7 @@ manext = 3 + .c.lo: + $(LIBTOOL) --mode=compile $(CC) -c $(CPPFLAGS) $(DEFS) -I. -I$(srcdir) $(CFLAGS) $< + +-SHELL = /bin/sh ++SHELL = @SHELL@ + + PROGS = libgdbm.la testgdbm testdbm testndbm tndbm tdbm conv2gdbm + +@@ -130,7 +130,7 @@ install: libgdbm.la gdbm.h gdbm.info + $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ + $(INSTALL_ROOT)$(includedir) $(INSTALL_ROOT)$(man3dir) \ + $(INSTALL_ROOT)$(infodir) +- $(LIBTOOL) $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm.la $(INSTALL_ROOT)$(libdir)/libgdbm.la + $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) gdbm.h \ + $(INSTALL_ROOT)$(includedir)/gdbm.h + $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/gdbm.3 \ +@@ -141,7 +141,7 @@ install: libgdbm.la gdbm.h gdbm.info + install-compat: + $(srcdir)/mkinstalldirs $(INSTALL_ROOT)$(libdir) \ + $(INSTALL_ROOT)$(includedir) +- $(LIBTOOL) $(INSTALL) -c libgdbm_compat.la \ ++ $(LIBTOOL) --mode=install $(INSTALL) -c libgdbm_compat.la \ + $(INSTALL_ROOT)$(libdir)/libgdbm_compat.la + $(INSTALL_DATA) -o $(BINOWN) -g $(BINGRP) $(srcdir)/dbm.h \ + $(INSTALL_ROOT)$(includedir)/dbm.h diff --git a/libs/gpgme/Makefile b/libs/gpgme/Makefile deleted file mode 100644 index 4b78697986..0000000000 --- a/libs/gpgme/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gpgme -PKG_VERSION:=1.3.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/gpgme/ -PKG_MD5SUM:=90afa8436ce2b2683c001c824bd22601 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libgpgme - SECTION:=libs - CATEGORY:=Libraries - TITLE:=GnuPG Made Easy library - URL:=http://www.gnupg.org/ - DEPENDS:=+gnupg +libassuan +libpthread -endef - -define Package/libgpgme/description - GPGME (GnuPG Made Easy) is a C language library that allows to add - support for cryptography to a program. It is designed to make access to - public key crypto engines like GnuPG or GpgSM easier for applications. - GPGME provides a high-level crypto API for encryption, decryption, - signing, signature verification and key management. -endef - -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --with-gpg=/"usr/bin/gpg" \ - --with-gpg-error-prefix="$(STAGING_DIR)/usr" \ - --with-libassuan-prefix="$(STAGING_DIR)/usr" \ - --without-g13 \ - --without-gpgconf \ - --without-gpgsm \ - --without-pth \ - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/gpgme.h $(1)/usr/include/ - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpgme{,-pthread}.{a,so*} $(1)/usr/lib/ -endef - -define Package/libgpgme/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgpgme{,-pthread}.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libgpgme)) diff --git a/libs/gsl/Makefile b/libs/gsl/Makefile index 62eaaaeefe..c9c5e1918a 100644 --- a/libs/gsl/Makefile +++ b/libs/gsl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -43,11 +43,10 @@ define Package/libgsl/install endef define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/gsl $(1)/usr/lib $(1)/usr/lib/pkgconfig + $(INSTALL_DIR) $(1)/usr/include/gsl $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/include/gsl/*.h $(1)/usr/include/gsl $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgsl.* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libgslcblas.* $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/gsl.pc $(1)/usr/lib/pkgconfig/ endef $(eval $(call BuildPackage,libgsl)) diff --git a/libs/howl/Makefile b/libs/howl/Makefile index c21b7a8ffa..459f83834f 100644 --- a/libs/howl/Makefile +++ b/libs/howl/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=howl PKG_VERSION:=1.0.0 -PKG_RELEASE:=4 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.porchdogsoft.com/download/ @@ -117,7 +117,7 @@ define Package/howl-autoipd/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/autoipd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/autoipd.init $(1)/etc/init.d/autoipd + $(INSTALL_DATA) ./files/autoipd.init $(1)/etc/init.d/autoipd endef define Package/howl-mdnsresponder/install @@ -133,7 +133,7 @@ define Package/howl-nifd/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nifd $(1)/usr/sbin/ $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/nifd.init $(1)/etc/init.d/nifd + $(INSTALL_DATA) ./files/nifd.init $(1)/etc/init.d/nifd endef define Package/howl-utils/install diff --git a/libs/howl/files/autoipd.init b/libs/howl/files/autoipd.init index 4a8ec07d46..e68ee776c4 100644 --- a/libs/howl/files/autoipd.init +++ b/libs/howl/files/autoipd.init @@ -1,15 +1,18 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -# XXX: pid-file is /var/run/autoipd-.pid -SERVICE_USE_PID= +DEFAULT=/etc/default/autopid +RUN_D=/var/run +PID_F=$RUN_D/autoipd.pid start() { - service_start /usr/sbin/autoipd + [ -f $DEFAULT ] && . $DEFAULT + [ -d $RUN_D ] || mkdir -p $RUN_D + autoipd $OPTIONS } + stop() { - service_stop /usr/sbin/autoipd + [ -f $PID_F ] && kill $(cat $PID_F) } diff --git a/libs/howl/files/mDNSResponder.init b/libs/howl/files/mDNSResponder.init index d43fdb5d79..a1f65084f5 100644 --- a/libs/howl/files/mDNSResponder.init +++ b/libs/howl/files/mDNSResponder.init @@ -1,14 +1,17 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -SERVICE_USE_PID=1 +DEFAULT=/etc/default/mDNSResponder +RUN_D=/var/run +PID_F=$RUN_D/mDNSResponder.pid start() { - service_start /usr/sbin/mDNSResponder + [ -f $DEFAULT ] && . $DEFAULT + [ -d $RUN_D ] || mkdir -p $RUN_D + mDNSResponder $OPTIONS } stop() { - service_stop /usr/sbin/mDNSResponder + [ -f $PID_F ] && kill $(cat $PID_F) } diff --git a/libs/howl/files/nifd.init b/libs/howl/files/nifd.init index 376eaaf7f2..d650648e54 100644 --- a/libs/howl/files/nifd.init +++ b/libs/howl/files/nifd.init @@ -1,14 +1,17 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 -SERVICE_USE_PID=1 +DEFAULT=/etc/default/nifd +RUN_D=/var/run +PID_F=$RUN_D/nifd.pid start() { - service_start /usr/sbin/nifd + [ -f $DEFAULT ] && . $DEFAULT + [ -d $RUN_D ] || mkdir -p $RUN_D + nifd $OPTIONS } stop() { - service_stop /usr/sbin/nifd + [ -f $PID_F ] && kill $(cat $PID_F) } diff --git a/libs/jansson/Makefile b/libs/jansson/Makefile deleted file mode 100644 index bce1994ccc..0000000000 --- a/libs/jansson/Makefile +++ /dev/null @@ -1,43 +0,0 @@ -# -# Copyright (C) 2011-2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - - -include $(TOPDIR)/rules.mk - -PKG_NAME:=jansson -PKG_VERSION:=2.2.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.digip.org/jansson/releases/ -PKG_MD5SUM:=ebf4ebc7af47de27f7b9d79ad5853176 - -PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/jansson - SECTION:=libs - CATEGORY:=Libraries - TITLE:=JSON library -endef - -TARGET_CFLAGS += $(FPIC) - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/{lib,include} - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson* $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ -endef - -define Package/jansson/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libjansson*so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,jansson)) diff --git a/libs/jansson/patches/01-jansson-add-jason_object_deep_update.patch b/libs/jansson/patches/01-jansson-add-jason_object_deep_update.patch deleted file mode 100644 index e9c389decb..0000000000 --- a/libs/jansson/patches/01-jansson-add-jason_object_deep_update.patch +++ /dev/null @@ -1,50 +0,0 @@ -This patch adds a function which can be used to update -json key values on all levels, not just one, automagically -adding new keys to objects which do not exist in old object. - -Signed-off-by: Roman Yeryomin - ---- a/src/value.c 2011-04-21 13:15:58.000000000 +0300 -+++ b/src/value.c 2011-07-01 00:23:05.105103308 +0300 -@@ -215,6 +215,41 @@ - return 0; - } - -+int json_object_deep_update(json_t *object, json_t *other) -+{ -+ void *iter; -+ -+ if(!json_is_object(object) || !json_is_object(other)) -+ return -1; -+ -+ iter = json_object_iter(other); -+ while(iter) { -+ const char *key; -+ json_t *value; -+ -+ key = json_object_iter_key(iter); -+ value = json_object_iter_value(iter); -+ -+ if (!json_is_object(value)) { -+ if ( json_object_set_nocheck( object, key, value ) ) -+ return -1; -+ } else { -+ json_t *subobj = json_object_get(object, key); -+ if (!subobj) { -+ json_object_set_nocheck( object, key, value ); -+ iter = json_object_iter_next(other, iter); -+ continue; -+ } -+ if (json_object_deep_update( subobj, value ) == -1) -+ return -1; -+ } -+ -+ iter = json_object_iter_next(other, iter); -+ } -+ -+ return 0; -+} -+ - void *json_object_iter(json_t *json) - { - json_object_t *object; diff --git a/libs/jansson/patches/100-add-jason_object_deep_update.patch b/libs/jansson/patches/100-add-jason_object_deep_update.patch deleted file mode 100644 index d7c94ba9ce..0000000000 --- a/libs/jansson/patches/100-add-jason_object_deep_update.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/jansson.h -+++ b/src/jansson.h -@@ -126,6 +126,7 @@ int json_object_set_new_nocheck(json_t * - int json_object_del(json_t *object, const char *key); - int json_object_clear(json_t *object); - int json_object_update(json_t *object, json_t *other); -+int json_object_deep_update(json_t *object, json_t *other); - void *json_object_iter(json_t *object); - void *json_object_iter_at(json_t *object, const char *key); - void *json_object_iter_next(json_t *object, void *iter); diff --git a/libs/keynote/Makefile b/libs/keynote/Makefile index fdca388194..e25f002273 100644 --- a/libs/keynote/Makefile +++ b/libs/keynote/Makefile @@ -22,7 +22,7 @@ include $(INCLUDE_DIR)/package.mk define Package/keynote SECTION:=net CATEGORY:=Network - DEPENDS:=+libopenssl + DEPENDS:=@!LINUX_2_4 +libopenssl TITLE:=Simple and flexible trust-management system URL:=http://www1.cs.columbia.edu/~angelos/keynote.html endef diff --git a/libs/ldns/Makefile b/libs/ldns/Makefile index dabd0678ee..c60903bed9 100644 --- a/libs/ldns/Makefile +++ b/libs/ldns/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2011-2012 OpenWrt.org +# Copyright (C) 2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,54 +8,28 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ldns -PKG_VERSION:=1.6.12 +PKG_VERSION:=1.6.11 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.nlnetlabs.nl/downloads/ldns -PKG_MD5SUM:=e7428ed0d19baed02459e2c55660c9b3 +PKG_MD5SUM:=c55b592a679672281712c457fbb41eb5 PKG_FIXUP:=libtool PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk -define Package/libldns/Default - URL:=http://www.nlnetlabs.nl/projects/ldns/ - DEPENDS:=+libopenssl -endef - define Package/libldns - $(call Package/libldns/Default) SECTION:=libs CATEGORY:=Libraries TITLE:=A library to simplify DNS programming -endef - -define Package/libldns/description - The goal of ldns is to simplify DNS programming, it supports recent RFCs like - the DNSSEC documents, and allows developers to easily create software - conforming to current RFCs, and experimental software for current Internet - Drafts. -endef - -define Package/drill - $(call Package/libldns/Default) - SECTION:=net - CATEGORY:=Network - SUBMENU:=IP Addresses and Names - TITLE:=DNS(SEC) information tool - DEPENDS+= +libldns -endef - -define Package/drill/description - drill is a tool to designed to get all sorts of information out of the DNS. It - is specificly designed to be used with DNSSEC. + URL:=http://www.nlnetlabs.nl/projects/ldns/ + DEPENDS:=+libopenssl endef CONFIGURE_ARGS += \ --disable-gost \ - --with-drill \ --with-ssl="$(STAGING_DIR)/usr" define Build/InstallDev @@ -70,10 +44,4 @@ define Package/libldns/install $(CP) $(PKG_INSTALL_DIR)/usr/lib/libldns.so.* $(1)/usr/lib/ endef -define Package/drill/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/drill $(1)/usr/bin/ -endef - $(eval $(call BuildPackage,libldns)) -$(eval $(call BuildPackage,drill)) diff --git a/libs/leptonica/Makefile b/libs/leptonica/Makefile deleted file mode 100644 index fa217f6d1d..0000000000 --- a/libs/leptonica/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=leptonica -PKG_VERSION:=1.68 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://leptonica.googlecode.com/files/ -PKG_MD5SUM:=5cd7092f9ff2ca7e3f3e73bfcd556403 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libleptonica - SECTION:=libs - CATEGORY:=Libraries - TITLE:=A library for efficient image processing and image analysis operations - URL:=http://leptonica.googlecode.com/ - DEPENDS:=+giflib +libjpeg +libpng +libtiff +zlib -endef - -TARGET_CFLAGS += $(FPIC) -TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/leptonica $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblept.{a,so*} $(1)/usr/lib/ -endef - -define Package/libleptonica/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/liblept.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libleptonica)) - diff --git a/libs/libaio/Makefile b/libs/libaio/Makefile index dc467eaddf..147db8e4bc 100644 --- a/libs/libaio/Makefile +++ b/libs/libaio/Makefile @@ -20,6 +20,7 @@ include $(INCLUDE_DIR)/package.mk define Package/libaio SECTION:=libs CATEGORY:=Libraries + DEPENDS:=@!LINUX_2_4 TITLE:=Linux kernel AIO interface access library URL:=http://lse.sourceforge.net/io/aio.html endef diff --git a/libs/libassuan/Makefile b/libs/libassuan/Makefile deleted file mode 100644 index 5b79126c32..0000000000 --- a/libs/libassuan/Makefile +++ /dev/null @@ -1,64 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libassuan -PKG_VERSION:=2.0.2 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libassuan/ -PKG_MD5SUM:=3e7d00fd2ee8a0b9c51ac7616ef3f1ec - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libassuan - SECTION:=libs - CATEGORY:=Libraries - TITLE:=GnuPG IPC library - URL:=http://www.gnupg.org/ - DEPENDS:=+libgpg-error -endef - -define Package/libassuan/description - The Libassuan package contains an IPC library used by some of the other - GnuPG related packages. Libassuan's primary use is to allow a client to - interact with a non-persistent server. Libassuan is not, however, - limited to use with GnuPG servers and clients. It was designed to be - flexible enough to meet the demands of many transaction based - environments with non-persistent servers. -endef - -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --with-gpg-error-prefix="$(STAGING_DIR)/usr" \ - --without-pth-test \ - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/assuan.h $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libassuan.{a,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/share/aclocal - $(CP) $(PKG_INSTALL_DIR)/usr/share/aclocal/libassuan.m4 $(1)/usr/share/aclocal/ - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/libassuan-config $(1)/usr/bin/ - $(INSTALL_DIR) $(2)/bin - $(LN) -nsf ../../usr/bin/libassuan-config $(2)/bin/ -endef - -define Package/libassuan/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libassuan*.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libassuan)) diff --git a/libs/libcap/Makefile b/libs/libcap/Makefile deleted file mode 100644 index ecace1ac73..0000000000 --- a/libs/libcap/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libcap -PKG_VERSION:=2.22 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://distfiles.gentoo.org/distfiles/ -PKG_MD5SUM:=ce64058bdb3f086ddbfca8ce6c919845 - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/kernel.mk - -define Package/libcap - TITLE:=Linux capabilities library - SECTION:=libs - CATEGORY:=Libraries - URL:=http://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/ -endef - -MAKE_FLAGS += \ - CFLAGS="$(TARGET_CFLAGS)" \ - BUILD_CC="$(CC)" \ - BUILD_CFLAGS="$(FPIC) -I$(PKG_BUILD_DIR)/libcap/include" \ - CFLAGS="$(TARGET_CFLAGS)" \ - LD="$(TARGET_CC)" \ - LDFLAGS="$(TARGET_LDFLAGS) -shared" \ - INDENT="| true" \ - PAM_CAP="no" \ - LIBATTR="no" \ - DYNAMIC="yes" \ - lib="lib" - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/sys - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/lib/* $(1)/usr/lib/ -endef - -define Package/libcap/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/lib/libcap.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libcap)) diff --git a/libs/libdbi/Makefile b/libs/libdbi/Makefile index 8bb5159b0e..82511e82d3 100644 --- a/libs/libdbi/Makefile +++ b/libs/libdbi/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2011 OpenWrt.org +# Copyright (C) 2009-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -29,7 +29,9 @@ define Package/libdbi endef define Package/libdbi/description - libdbi implements a database-independent abstraction layer in C. + SQLite is a small C library that implements a self-contained, embeddable, + zero-configuration SQL database engine. This package contains the SQLite + (v3.x) shared library, used by other programs. endef define Build/InstallDev diff --git a/libs/libdlna/Makefile b/libs/libdlna/Makefile index cad68f8e05..496f22c524 100644 --- a/libs/libdlna/Makefile +++ b/libs/libdlna/Makefile @@ -25,7 +25,7 @@ define Package/libdlna CATEGORY:=Libraries TITLE:= Reference DLNA implementation URL:=http://libdlna.geexbox.org/ - DEPENDS:=+libffmpeg + DEPENDS:=+libffmpeg +@FFMPEG_LIBDLNA_SUPPORT endef define Package/libdlna/description diff --git a/libs/libdlna/patches/300-ffmpeg_compat.patch b/libs/libdlna/patches/300-ffmpeg_compat.patch deleted file mode 100644 index 04011ebd11..0000000000 --- a/libs/libdlna/patches/300-ffmpeg_compat.patch +++ /dev/null @@ -1,39 +0,0 @@ -Index: libdlna-0.2.3/src/profiles.c -=================================================================== ---- libdlna-0.2.3.orig/src/profiles.c 2011-10-10 13:00:12.000000000 +0200 -+++ libdlna-0.2.3/src/profiles.c 2011-10-10 13:05:52.000000000 +0200 -@@ -205,13 +205,13 @@ - for (i = 0; i < ctx->nb_streams; i++) - { - if (audio_stream == -1 && -- ctx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) -+ ctx->streams[i]->codec->codec_type == LIBDLNA_CODEC_TYPE_AUDIO) - { - audio_stream = i; - continue; - } - else if (video_stream == -1 && -- ctx->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO) -+ ctx->streams[i]->codec->codec_type == LIBDLNA_CODEC_TYPE_VIDEO) - { - video_stream = i; - continue; -Index: libdlna-0.2.3/src/profiles.h -=================================================================== ---- libdlna-0.2.3.orig/src/profiles.h 2011-10-10 13:00:26.000000000 +0200 -+++ libdlna-0.2.3/src/profiles.h 2011-10-10 13:05:27.000000000 +0200 -@@ -25,6 +25,14 @@ - #include - #include - -+#if (LIBAVCODEC_VERSION_MAJOR > 52) -+# define LIBDLNA_CODEC_TYPE_AUDIO (AVMEDIA_TYPE_AUDIO) -+# define LIBDLNA_CODEC_TYPE_VIDEO (AVMEDIA_TYPE_VIDEO) -+#else -+# define LIBDLNA_CODEC_TYPE_AUDIO (CODEC_TYPE_AUDIO) -+# define LIBDLNA_CODEC_TYPE_VIDEO (CODEC_TYPE_VIDEO) -+#endif -+ - #include "dlna_internals.h" - #include "containers.h" - diff --git a/libs/libdmapsharing/Makefile b/libs/libdmapsharing/Makefile index 7b5f123737..6edc986d6e 100644 --- a/libs/libdmapsharing/Makefile +++ b/libs/libdmapsharing/Makefile @@ -10,12 +10,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libdmapsharing -PKG_VERSION:=2.9.13 +PKG_VERSION:=2.9.12 PKG_RELEASE:=1 PKG_SOURCE:=libdmapsharing-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.flyn.org/projects/libdmapsharing/ -PKG_MD5SUM:=05aa705af3550107e7801b58735777ae +PKG_MD5SUM:=ec34948df21e9ba0656c917b10fed1c3 PKG_BUILD_DIR:=$(BUILD_DIR)/libdmapsharing-$(PKG_VERSION) @@ -30,7 +30,7 @@ TARGET_LDFLAGS+= \ define Package/libdmapsharing SECTION:=libs - CATEGORY:=Libraries + CATAGORY:=Libraries DEPENDS:=+libsoup +mdnsresponder +gstreamer +gst-plugins-base TITLE:=libdmapsharing URL:=http://www.flyn.org/projects/libdmapsharing/ diff --git a/libs/libevent/Makefile b/libs/libevent/Makefile index 45a6d3e914..ba8aec26f5 100644 --- a/libs/libevent/Makefile +++ b/libs/libevent/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libevent PKG_VERSION:=1.4.14b -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)-stable PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-stable.tar.gz @@ -54,12 +54,13 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.{a,so} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent.{la,a,so} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-1.4.so* $(1)/usr/lib/ endef define Package/libevent/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/*.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libevent-1.4.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libevent)) diff --git a/libs/libevent2/Makefile b/libs/libevent2/Makefile index e6207ccaa7..74693f68a1 100644 --- a/libs/libevent2/Makefile +++ b/libs/libevent2/Makefile @@ -8,14 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libevent2 -PKG_VERSION:=2.0.16 +PKG_VERSION:=2.0.12 PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/libevent-$(PKG_VERSION)-stable PKG_SOURCE:=libevent-$(PKG_VERSION)-stable.tar.gz -PKG_SOURCE_URL:=http://www.monkey.org/~provos/ \ - @SF/levent -PKG_MD5SUM:=899efcffccdb3d5111419df76e7dc8df +PKG_SOURCE_URL:=http://www.monkey.org/~provos/ +PKG_MD5SUM:=42986228baf95e325778ed328a93e070 PKG_FIXUP:=libtool PKG_INSTALL:=1 @@ -44,7 +43,7 @@ endef define Package/libevent2 $(call Package/libevent2/Default) - TITLE+= library (version 2.0) + TITLE+= library (version 2.0) endef define Package/libevent2/description diff --git a/libs/libftdi/Makefile b/libs/libftdi/Makefile index 4e817fa2b5..17a8e60891 100644 --- a/libs/libftdi/Makefile +++ b/libs/libftdi/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libftdi -PKG_VERSION:=0.19 +PKG_VERSION:=0.18 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.intra2net.com/en/developer/libftdi/download/ -PKG_MD5SUM:=e6e25f33b4327b1b7aa1156947da45f3 +PKG_MD5SUM:=916f65fa68d154621fc0cf1f405f2726 PKG_INSTALL:=1 @@ -22,7 +22,6 @@ include $(INCLUDE_DIR)/package.mk define Package/libftdi SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libusb TITLE:=library to talk to FTDI chips URL:=http://www.intra2net.com/en/developer/libftdi/ endef diff --git a/libs/libgcrypt/Makefile b/libs/libgcrypt/Makefile index ae4899a957..34f705192d 100644 --- a/libs/libgcrypt/Makefile +++ b/libs/libgcrypt/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2005-2011 OpenWrt.org +# Copyright (C) 2005-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgcrypt -PKG_VERSION:=1.5.0 +PKG_VERSION:=1.4.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt -PKG_MD5SUM:=693f9c64d50c908bc4d6e01da3ff76d8 +PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgcrypt/ +PKG_MD5SUM:=cc2017ad09b4543f8b3b5e9a53cfd89d PKG_FIXUP:=libtool no-autoreconf PKG_INSTALL:=1 @@ -30,13 +30,13 @@ define Package/libgcrypt endef define Package/libgcrypt/description - This is a general purpose cryptographic library based on the code from - GnuPG. It provides functions for all cryptograhic building blocks: - symmetric ciphers (AES, DES, Arcfour, CAST5), hash algorithms (MD5, SHA-1, + This is a general purpose cryptographic library based on the code from + GnuPG. It provides functions for all cryptograhic building blocks: + symmetric ciphers (AES, DES, Arcfour), hash algorithms (MD5, SHA-1, RIPE-MD160, SHA-224/256, SHA-384/512), MACs (HMAC for all hash algorithms), public key algorithms (RSA, DSA), large integer functions, random numbers and a lot of supporting functions. Some algorithms have - been disabled to reduce size (Blowfish, Twofish, Serpent, + been disabled to reduce size (Blowfish, CAST5, Twofish, Serpent, RC2, SEED, Camellia, CRC, MD4, TIGER-192, Whirlpool, ElGamal, ECC). endef @@ -46,8 +46,8 @@ CONFIGURE_ARGS += \ --disable-asm \ --with-gpg-error-prefix="$(STAGING_DIR)/usr" \ --enable-digests="md5 rmd160 sha1 sha256 sha512" \ - --enable-ciphers="arcfour des aes cast5" \ - --enable-pubkey-ciphers="rsa dsa" + --enable-ciphers="arcfour des aes" \ + --enable-pubkey-ciphers="rsa dsa" \ TARGET_CFLAGS += $(FPIC) diff --git a/libs/libgcrypt/patches/001-mips-h-constraint.patch b/libs/libgcrypt/patches/001-mips-h-constraint.patch new file mode 100644 index 0000000000..b84cce61c2 --- /dev/null +++ b/libs/libgcrypt/patches/001-mips-h-constraint.patch @@ -0,0 +1,70 @@ +The MIPS port for GCC-4.4 no longer recognizes the h asm constraint. +Patch from: https://forum.openwrt.org/viewtopic.php?id=20520 + +--- a/mpi/longlong.h ++++ b/mpi/longlong.h +@@ -710,18 +710,35 @@ extern USItype __udiv_qrnnd (); + #endif /* __m88110__ */ + #endif /* __m88000__ */ + ++/* Test for gcc >= maj.min, as per __GNUC_PREREQ in glibc */ ++#if defined (__GNUC__) && defined (__GNUC_MINOR__) ++#define __GNUC_PREREQ(maj, min) \ ++ ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) ++#else ++#define __GNUC_PREREQ(maj, min) 0 ++#endif ++ + /*************************************** + ************** MIPS ***************** + ***************************************/ + #if defined (__mips__) && W_TYPE_SIZE == 32 +-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 ++#if __GNUC_PREREQ (4,4) ++#define umul_ppmm(w1, w0, u, v) \ ++ do { \ ++ UDItype __ll = (UDItype)(u) * (v); \ ++ w1 = __ll >> 32; \ ++ w0 = __ll; \ ++ } while (0) ++#endif ++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("multu %2,%3" \ + : "=l" ((USItype)(w0)), \ + "=h" ((USItype)(w1)) \ + : "d" ((USItype)(u)), \ + "d" ((USItype)(v))) +-#else ++#endif ++#if !defined (umul_ppmm) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("multu %2,%3 \n" \ + "mflo %0 \n" \ +@@ -739,14 +756,24 @@ extern USItype __udiv_qrnnd (); + ************** MIPS/64 ************** + ***************************************/ + #if (defined (__mips) && __mips >= 3) && W_TYPE_SIZE == 64 +-#if __GNUC__ > 2 || __GNUC_MINOR__ >= 7 ++#if __GNUC_PREREQ (4,4) ++#define umul_ppmm(w1, w0, u, v) \ ++ do { \ ++ typedef unsigned int __ll_UTItype __attribute__((mode(TI))); \ ++ __ll_UTItype __ll = (__ll_UTItype)(u) * (v); \ ++ w1 = __ll >> 64; \ ++ w0 = __ll; \ ++ } while (0) ++#endif ++#if !defined (umul_ppmm) && __GNUC_PREREQ (2,7) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3" \ + : "=l" ((UDItype)(w0)), \ + "=h" ((UDItype)(w1)) \ + : "d" ((UDItype)(u)), \ + "d" ((UDItype)(v))) +-#else ++#endif ++#if !defined (umul_ppmm) + #define umul_ppmm(w1, w0, u, v) \ + __asm__ ("dmultu %2,%3 \n" \ + "mflo %0 \n" \ diff --git a/libs/libgcrypt/patches/001-no_docs_tests.patch b/libs/libgcrypt/patches/002-no_docs_tests.patch similarity index 52% rename from libs/libgcrypt/patches/001-no_docs_tests.patch rename to libs/libgcrypt/patches/002-no_docs_tests.patch index cc184e441e..0132c08809 100644 --- a/libs/libgcrypt/patches/001-no_docs_tests.patch +++ b/libs/libgcrypt/patches/002-no_docs_tests.patch @@ -4,23 +4,23 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia --DIST_SUBDIRS = m4 compat mpi cipher random src doc tests --SUBDIRS = compat mpi cipher random src doc tests -+DIST_SUBDIRS = m4 compat mpi cipher random src -+SUBDIRS = compat mpi cipher random src +-DIST_SUBDIRS = m4 mpi cipher random src doc tests +-SUBDIRS = mpi cipher random src doc tests ++DIST_SUBDIRS = m4 mpi cipher random src ++SUBDIRS = mpi cipher random src EXTRA_DIST = autogen.sh README.SVN - DISTCLEANFILES = + DISTCLEANFILES = --- a/Makefile.in +++ b/Makefile.in -@@ -281,8 +281,8 @@ AUTOMAKE_OPTIONS = dist-bzip2 +@@ -239,8 +239,8 @@ AUTOMAKE_OPTIONS = dist-bzip2 DISTCHECK_CONFIGURE_FLAGS = --enable-random-daemon \ --enable-ciphers=arcfour:blowfish:cast5:des:aes:twofish:serpent:rfc2268:seed:camellia --DIST_SUBDIRS = m4 compat mpi cipher random src doc tests --SUBDIRS = compat mpi cipher random src doc tests -+DIST_SUBDIRS = m4 compat mpi cipher random src -+SUBDIRS = compat mpi cipher random src +-DIST_SUBDIRS = m4 mpi cipher random src doc tests +-SUBDIRS = mpi cipher random src doc tests ++DIST_SUBDIRS = m4 mpi cipher random src ++SUBDIRS = mpi cipher random src EXTRA_DIST = autogen.sh README.SVN DISTCLEANFILES = all: config.h diff --git a/libs/libgpg-error/Makefile b/libs/libgpg-error/Makefile index f60a9721a3..77f8835fb8 100644 --- a/libs/libgpg-error/Makefile +++ b/libs/libgpg-error/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2005-2011 OpenWrt.org +# Copyright (C) 2005-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,19 +8,22 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libgpg-error -PKG_VERSION:=1.9 +PKG_VERSION:=1.7 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error -PKG_MD5SUM:=521b98aa9395e7eaf0ef2236233a0796 +PKG_SOURCE_URL:=ftp://ftp.gnupg.org/gcrypt/libgpg-error/ \ + http://mirrors.rootmode.com/ftp.gnupg.org/libgpg-error/ \ + http://gulus.usherbrooke.ca/pub/appl/GnuPG/libgpg-error/ \ + http://gnupg.unixmexico.org/ftp/libgpg-error/ +PKG_MD5SUM:=62c0d09d1e76c5b6da8fff92314c4665 -PKG_BUILD_PARALLEL:=1 PKG_FIXUP:=libtool -PKG_INSTALL:=1 include $(INCLUDE_DIR)/package.mk +PKG_INSTALL=1 + define Package/libgpg-error SECTION:=libs CATEGORY:=Libraries @@ -30,18 +33,21 @@ endef define Package/libgpg-error/description An helper library for common error codes and descriptions. - This is a library that defines common error values for all GnuPG - components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, - Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the + This is a library that defines common error values for all GnuPG + components. Among these are GPG, GPGSM, GPGME, GPG-Agent, libgcrypt, + Libksba, DirMngr, Pinentry, SmartCard Daemon and possibly more in the future. endef TARGET_CFLAGS += $(FPIC) -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --disable-rpath +define Build/Configure + $(call Build/Configure/Default, \ + --enable-shared \ + --enable-static \ + --disable-rpath \ + ) +endef define Build/InstallDev $(INSTALL_DIR) $(2)/bin $(1)/usr/bin diff --git a/libs/libimobiledevice/Makefile b/libs/libimobiledevice/Makefile deleted file mode 100644 index cca696cb83..0000000000 --- a/libs/libimobiledevice/Makefile +++ /dev/null @@ -1,85 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libimobiledevice -PKG_REV:=c182599c8c18ed729726ea7cbbd0a3b89790d2db -PKG_VERSION:=20120112 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=git://git.sukimashita.com/libimobiledevice.git -PKG_SOURCE_PROTO:=git -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) - -PKG_FIXUP:=autoreconf -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk -$(call include_mk, python-package.mk) - -define Package/libimobiledevice/Default - TITLE:=A library that talks to Apple devices. - URL:=http://www.libimobiledevice.org/ -endef - -define Package/libimobiledevice/Default/description - libimobiledevice is a software library that talks the protocols to support - iPhone®, iPod Touch®, iPad® and Apple TV® devices. -endef - -define Package/libimobiledevice - $(call Package/libimobiledevice/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+glib2 +libgcrypt +libgnutls $(ICONV_DEPENDS) +libplist +libtasn1 +libusbmuxd -endef - -define Package/libimobiledevice/description - $(call Package/libimobiledevice/Default/description) -endef - -define Package/libimobiledevice-utils - $(call Package/libimobiledevice/Default) - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=+libimobiledevice -endef - -define Package/libimobiledevice-utils/description - $(call Package/libimobiledevice/Default/description) - This package contains the libimobiledevice utilities. -endef - -CONFIGURE_ARGS += --without-swig - -TARGET_LDFLAGS += -Wl,-rpath-link=$(STAGING_DIR)/usr/lib - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libimobiledevice $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libimobiledevice.{a,la,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libimobiledevice-*.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/libimobiledevice/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libimobiledevice.so.* $(1)/usr/lib/ -endef - -define Package/libimobiledevice-utils/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/idevice* $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,libimobiledevice)) -$(eval $(call BuildPackage,libimobiledevice-utils)) diff --git a/libs/libmbus/Makefile b/libs/libmbus/Makefile deleted file mode 100644 index 45a615c062..0000000000 --- a/libs/libmbus/Makefile +++ /dev/null @@ -1,105 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libmbus -PKG_VERSION:=0.6.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.freescada.com/public-dist/ -PKG_MD5SUM:=842d13b14ad4a88f9d1b9f321725c802 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libmbus/Default - SECTION:=utils - CATEGORY:=Utilities - URL:=http://www.freescada.com/libmbus/ - TITLE:=mbus-tools -endef - -define Package/libmbus/Default/description - libmbus is an open source M-bus (Meter-Bus) library. - The Meter-Bus is a standard for reading out meter data from - electricity meters, heat meters, gas meters, etc. -endef - -define Package/libmbus - $(call Package/libmbus/Default) - SECTION:=libs - CATEGORY:=Libraries - TITLE:=libmbus -endef - -define Package/libmbus/description - $(call Package/libmbus/Default/description) - - This package contains the M-bus shared library, used by other programs. -endef - -define Package/mbus-serial - $(call Package/libmbus/Default) - DEPENDS+=+libmbus - TITLE+= (serial) -endef - -define Package/mbus-serial/description - $(call Package/libmbus/Default/description) - - This package contains command line tools for scanning the M-bus - and retrieving data from meters which are connected through a - serial (e.g. RS232) interface. -endef - -define Package/mbus-tcp - $(call Package/libmbus/Default) - DEPENDS+=+libmbus - TITLE+= (tcp) -endef - -define Package/mbus-tcp/description - $(call Package/libmbus/Default/description) - - This package contains command line tools for scanning the M-bus - and retrieving data from meters which are accessible through - M-bus gateways via TCP. -endef - -TARGET_CFLAGS += $(FPIC) - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/mbus $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmbus.{so*,la} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmbus.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/libmbus/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmbus.so* $(1)/usr/lib/ -endef - -define Package/mbus-serial/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbus-serial-* $(1)/usr/bin/ -endef - -define Package/mbus-tcp/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/mbus-tcp-* $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,libmbus)) -$(eval $(call BuildPackage,mbus-serial)) -$(eval $(call BuildPackage,mbus-tcp)) diff --git a/libs/libmikmod/Makefile b/libs/libmikmod/Makefile index 6b083b105a..4c1c817a89 100644 --- a/libs/libmikmod/Makefile +++ b/libs/libmikmod/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2011 OpenWrt.org +# Copyright (C) 2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libmikmod PKG_VERSION:=3.1.12 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://prdownloads.sourceforge.net/mikmod @@ -71,7 +71,7 @@ endef define Package/libmikmod/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmikmod.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmikmod.so.* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libmikmod)) diff --git a/libs/libmnl/Makefile b/libs/libmnl/Makefile deleted file mode 100644 index d7b94083cf..0000000000 --- a/libs/libmnl/Makefile +++ /dev/null @@ -1,74 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libmnl -PKG_VERSION:=1.0.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:= \ - http://www.netfilter.org/projects/libmnl/files \ - ftp://ftp.netfilter.org/pub/libmnl -PKG_MD5SUM:=e936236bb57a2375afa4e70e75dc3ba9 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libmnl - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Minimalistic user-space library for Netlink - URL:=http://www.netfilter.org/projects/libmnl/ -endef - -define Package/libmnl/description - libmnl is a minimalistic user-space library oriented to Netlink developers. - There are a lot of common tasks in parsing, validating, constructing of - both the Netlink header and TLVs that are repetitive and easy to get wrong. - This library aims to provide simple helpers that allows you to re-use code - and to avoid re-inventing the wheel. The main features of this library are: - . - * Small: the shared library requires around 30KB for an x86-based computer. - . - * Simple: this library avoids complexity and elaborated abstractions that - tend to hide Netlink details. - . - * Easy to use: the library simplifies the work for Netlink-wise developers. - It provides functions to make socket handling, message building, validating, - parsing and sequence tracking, easier. - . - * Easy to re-use: you can use the library to build your own abstraction layer - on top of this library. - . - * Decoupling: the interdependency of the main bricks that compose the library - is reduced, i.e. the library provides many helpers, but the programmer is not - forced to use them. -endef - -CONFIGURE_ARGS+= \ - --enable-shared \ - --enable-static \ - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/libmnl $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmnl.{a,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmnl.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/libmnl/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libmnl.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libmnl)) diff --git a/libs/libmpeg2/Makefile b/libs/libmpeg2/Makefile deleted file mode 100644 index 9d3c052235..0000000000 --- a/libs/libmpeg2/Makefile +++ /dev/null @@ -1,60 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libmpeg2 -PKG_VERSION:=0.5.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=libmpeg2-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://libmpeg2.sourceforge.net/files/ -PKG_MD5SUM:=0f92c7454e58379b4a5a378485bbd8ef - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libmpeg2 - SECTION:=libs - CATEGORY:=Libraries - TITLE:=MPEG-1 & -2 decoding library - URL:=http://libmpeg2.sourceforge.net/ - MAINTAINER:=W. Michael Petullo -endef - -define Package/libmpeg2/decription - Libmpeg2 is a library for decoding MPEG-1 and MPEG-2 video streams -endef - -CONFIGURE_ARGS += \ - --disable-sdl \ - --without-x \ - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/mpeg2dec \ - $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libmpeg2{,convert}.{a,so*} \ - $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(INSTALL_DATA) \ - $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libmpeg2{,convert}.pc \ - $(1)/usr/lib/pkgconfig/ -endef - -define Package/libmpeg2/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/libmpeg2{,convert}.so.* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libmpeg2)) diff --git a/libs/libmpeg2/patches/101-ppc_no_altivec.patch b/libs/libmpeg2/patches/101-ppc_no_altivec.patch deleted file mode 100644 index 49251a0984..0000000000 --- a/libs/libmpeg2/patches/101-ppc_no_altivec.patch +++ /dev/null @@ -1,66 +0,0 @@ ---- a/libmpeg2/motion_comp_altivec.c -+++ b/libmpeg2/motion_comp_altivec.c -@@ -25,6 +25,8 @@ - - #ifdef ARCH_PPC - -+#ifdef __I_WANT_ALTIVEC__ -+ - #ifdef HAVE_ALTIVEC_H - #include - #endif -@@ -1007,4 +1009,6 @@ static void MC_avg_xy_8_altivec (uint8_t - - MPEG2_MC_EXTERN (altivec) - -+#endif /* __I_WANT_ALTIVEC__ */ -+ - #endif ---- a/libmpeg2/idct_altivec.c -+++ b/libmpeg2/idct_altivec.c -@@ -25,6 +25,8 @@ - - #ifdef ARCH_PPC - -+#ifdef __I_WANT_ALTIVEC__ -+ - #ifdef HAVE_ALTIVEC_H - #include - #endif -@@ -283,4 +285,6 @@ void mpeg2_idct_altivec_init (void) - } - } - -+#endif /* __I_WANT_ALTIVEC__ */ -+ - #endif ---- a/libmpeg2/idct.c -+++ b/libmpeg2/idct.c -@@ -251,11 +251,13 @@ void mpeg2_idct_init (uint32_t accel) - } else - #endif - #ifdef ARCH_PPC -+#ifdef __I_WANT_ALTIVEC__ - if (accel & MPEG2_ACCEL_PPC_ALTIVEC) { - mpeg2_idct_copy = mpeg2_idct_copy_altivec; - mpeg2_idct_add = mpeg2_idct_add_altivec; - mpeg2_idct_altivec_init (); - } else -+#endif /* __I_WANT_ALTIVEC__ */ - #endif - #ifdef ARCH_ALPHA - if (accel & MPEG2_ACCEL_ALPHA_MVI) { ---- a/libmpeg2/motion_comp.c -+++ b/libmpeg2/motion_comp.c -@@ -43,9 +43,11 @@ void mpeg2_mc_init (uint32_t accel) - else - #endif - #ifdef ARCH_PPC -+#ifdef __I_WANT_ALTIVEC__ - if (accel & MPEG2_ACCEL_PPC_ALTIVEC) - mpeg2_mc = mpeg2_mc_altivec; - else -+#endif /* __I_WANT_ALTIVEC__ */ - #endif - #ifdef ARCH_ALPHA - if (accel & MPEG2_ACCEL_ALPHA) diff --git a/libs/libnatpmp/Makefile b/libs/libnatpmp/Makefile index 40d7b751e1..df2ab557e4 100644 --- a/libs/libnatpmp/Makefile +++ b/libs/libnatpmp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2011-2012 OpenWrt.org +# Copyright (C) 2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libnatpmp -PKG_VERSION:=20110808 +PKG_VERSION:=20110618 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://miniupnp.free.fr/files -PKG_MD5SUM:=22a1225b890471a7750a9bf26eb863f7 +PKG_MD5SUM:=6a5fdc8aa6c8602ea96567dabe51d6d3 PKG_INSTALL:=1 @@ -59,8 +59,7 @@ endef MAKE_FLAGS += \ COPTS="$(TARGET_CFLAGS)" \ - PREFIX="$(PKG_INSTALL_DIR)" \ - OS="Linux" + PREFIX="$(PKG_INSTALL_DIR)" define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include diff --git a/libs/libnatpmp/patches/001-cross_compile.patch b/libs/libnatpmp/patches/001-cross_compile.patch index 1136f93efd..0869f2d931 100644 --- a/libs/libnatpmp/patches/001-cross_compile.patch +++ b/libs/libnatpmp/patches/001-cross_compile.patch @@ -1,9 +1,17 @@ --- a/Makefile +++ b/Makefile -@@ -11,7 +11,8 @@ INSTALL = install +@@ -4,14 +4,15 @@ + # (c) 2007-2011 Thomas Bernard + # http://miniupnp.free.fr/libnatpmp.html + +-OS = $(shell uname -s) ++OS = Linux + CC = gcc + INSTALL = install + # APIVERSION is used in soname APIVERSION = 1 - #LDFLAGS = -Wl,--no-undefined + LDFLAGS = -Wl,--no-undefined -CFLAGS = -O -fPIC -Wall -DENABLE_STRNATPMPERR +COPTS = -O +CFLAGS = $(COPTS) -fPIC -Wall -DENABLE_STRNATPMPERR diff --git a/libs/libnetfilter-conntrack/Makefile b/libs/libnetfilter-conntrack/Makefile index 620d13fbdf..690b9ac1a6 100644 --- a/libs/libnetfilter-conntrack/Makefile +++ b/libs/libnetfilter-conntrack/Makefile @@ -26,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk define Package/libnetfilter-conntrack SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libnfnetlink +kmod-nf-conntrack-netlink + DEPENDS:=@!LINUX_2_4 +libnfnetlink +kmod-nf-conntrack-netlink TITLE:=API to the in-kernel connection tracking state table URL:=http://www.netfilter.org/projects/libnetfilter_conntrack/ endef diff --git a/libs/libnetfilter-log/Makefile b/libs/libnetfilter-log/Makefile index 75125c2541..0936941205 100644 --- a/libs/libnetfilter-log/Makefile +++ b/libs/libnetfilter-log/Makefile @@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk define Package/libnetfilter-log SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libnfnetlink +kmod-nfnetlink-log + DEPENDS:=@!LINUX_2_4 +libnfnetlink +kmod-nfnetlink-log TITLE:=API to packets logged by the kernel packet filter URL:=http://www.netfilter.org/projects/libnetfilter_log/ endef diff --git a/libs/libnetfilter-queue/Makefile b/libs/libnetfilter-queue/Makefile index abe62d44f1..d10a799103 100644 --- a/libs/libnetfilter-queue/Makefile +++ b/libs/libnetfilter-queue/Makefile @@ -27,7 +27,7 @@ include $(INCLUDE_DIR)/package.mk define Package/libnetfilter-queue SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libnfnetlink +kmod-nfnetlink-queue + DEPENDS:=@!LINUX_2_4 +libnfnetlink +kmod-nfnetlink-queue TITLE:=API to packets queued by the kernel packet filter URL:=http://www.netfilter.org/projects/libnetfilter_queue/ endef diff --git a/libs/libnfnetlink/Makefile b/libs/libnfnetlink/Makefile index 3029b3749f..85d3c7c76e 100644 --- a/libs/libnfnetlink/Makefile +++ b/libs/libnfnetlink/Makefile @@ -27,6 +27,7 @@ include $(INCLUDE_DIR)/package.mk define Package/libnfnetlink SECTION:=libs CATEGORY:=Libraries + DEPENDS:=@!LINUX_2_4 TITLE:=A low-level library for netfilter related kernel/userspace communication URL:=http://netfilter.org/projects/libnfnetlink/ endef diff --git a/libs/libosip2/Makefile b/libs/libosip2/Makefile index d36a6a0ab5..1f22ac09f0 100644 --- a/libs/libosip2/Makefile +++ b/libs/libosip2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,16 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libosip2 -PKG_VERSION:=3.5.0 -PKG_RELEASE:=1 +PKG_VERSION:=3.1.0 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@GNU/osip -PKG_MD5SUM:=7691546f6b3349d10007fc1aaff0f4e0 +PKG_MD5SUM:=7eb305608256ac2a7a27b66ce52627c8 PKG_FIXUP:=libtool PKG_INSTALL:=1 -PKG_BUILD_PARALLEL:=1 include $(INCLUDE_DIR)/package.mk @@ -43,6 +42,7 @@ define Build/Configure --disable-trace \ --enable-pthread \ --enable-semaphore \ + --enable-ntimer \ ) endef diff --git a/libs/libosip2/patches/001-automake-compat.patch b/libs/libosip2/patches/001-automake-compat.patch index 9c0bc11cd6..1a6a0ecced 100644 --- a/libs/libosip2/patches/001-automake-compat.patch +++ b/libs/libosip2/patches/001-automake-compat.patch @@ -5,4 +5,4 @@ + EXTRA_DIST = README BUGS FEATURES HISTORY autogen.sh libosip2.pc.in - SUBDIRS = include src scripts help platform + SUBDIRS = include src scripts help platform debian diff --git a/libs/libpam/Makefile b/libs/libpam/Makefile index 9c960d9a24..42673e4753 100644 --- a/libs/libpam/Makefile +++ b/libs/libpam/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libpam -PKG_VERSION:=1.1.4 +PKG_VERSION:=1.1.3 PKG_RELEASE:=1 PKG_SOURCE:=Linux-PAM-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://pkgs.fedoraproject.org/repo/pkgs/pam/Linux-PAM-1.1.4.tar.bz2/e9af5fb27bb22edb55d077e2888b3ebc/ -PKG_MD5SUM:=e9af5fb27bb22edb55d077e2888b3ebc +PKG_SOURCE_URL:=@KERNEL/linux/libs/pam/library +PKG_MD5SUM:=6db7fcb5db6253350e3a4648ceac40e7 PKG_INSTALL:=1 PKG_FIXUP:=libtool diff --git a/libs/libpam/patches/000-OE-libpam-xtests.patch b/libs/libpam/patches/000-OE-libpam-xtests.patch deleted file mode 100644 index aac30abeae..0000000000 --- a/libs/libpam/patches/000-OE-libpam-xtests.patch +++ /dev/null @@ -1,35 +0,0 @@ -This patch is used to create a new sub package libpam-xtests to do more checks. - -Upstream-Status: Pending - -Signed-off-by: Kang Kai ---- a/xtests/Makefile.am -+++ b/xtests/Makefile.am -@@ -7,7 +7,7 @@ - AM_LDFLAGS = -L$(top_builddir)/libpam -lpam \ - -L$(top_builddir)/libpam_misc -lpam_misc - --CLEANFILES = *~ $(XTESTS) -+CLEANFILES = *~ - - EXTRA_DIST = run-xtests.sh tst-pam_dispatch1.pamd tst-pam_dispatch2.pamd \ - tst-pam_dispatch3.pamd tst-pam_dispatch4.pamd \ -@@ -51,3 +51,18 @@ - - xtests: $(XTESTS) run-xtests.sh - "$(srcdir)"/run-xtests.sh "$(srcdir)" ${XTESTS} ${NOSRCTESTS} -+ -+all: $(XTESTS) -+ -+install: install_xtests -+ -+install_xtests: -+ $(INSTALL) -d $(DESTDIR)$(pkgdatadir)/xtests -+ for file in $(EXTRA_DIST) ; do \ -+ $(INSTALL) $$file $(DESTDIR)$(pkgdatadir)/xtests ; \ -+ done -+ for file in $(XTESTS); do \ -+ $(INSTALL) .libs/$$file $(DESTDIR)$(pkgdatadir)/xtests ; \ -+ done -+ -+.PHONY: all install_xtests diff --git a/libs/libpam/patches/001-no_nis.patch b/libs/libpam/patches/001-no_nis.patch index 27d17a0077..db49bdd6bf 100644 --- a/libs/libpam/patches/001-no_nis.patch +++ b/libs/libpam/patches/001-no_nis.patch @@ -11,28 +11,28 @@ #ifdef HAVE_LIBAUDIT --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c -@@ -74,18 +74,18 @@ - #include "passverify.h" - #include "bigcrypt.h" - --#if (HAVE_YP_GET_DEFAULT_DOMAIN || HAVE_GETDOMAINNAME) && HAVE_YP_MASTER -+#if (HAVE_YP_GET_DEFAULT_DOMAIN || HAVE_GETDOMAINNAME) && HAVE_YP_MASTER && USE_NIS - # define HAVE_NIS +@@ -55,10 +55,10 @@ + #include + #include + #include +-#ifdef HAVE_RPCSVC_YP_PROT_H ++#ifdef HAVE_RPCSVC_YP_PROT_H && USE_NIS + #include + #endif +-#ifdef HAVE_RPCSVC_YPCLNT_H ++#ifdef HAVE_RPCSVC_YPCLNT_H && USE_NIS + #include #endif - #ifdef HAVE_NIS - # include - --# if HAVE_RPCSVC_YP_PROT_H -+# if HAVE_RPCSVC_YP_PROT_H && USE_NIS - # include - # endif - --# if HAVE_RPCSVC_YPCLNT_H -+# if HAVE_RPCSVC_YPCLNT_H && USE_NIS - # include - # endif +@@ -104,7 +104,7 @@ extern int getrpcport(const char *host, + static char *getNISserver(pam_handle_t *pamh, unsigned int ctrl) + { +-#if (defined(HAVE_YP_GET_DEFAULT_DOMAIN) || defined(HAVE_GETDOMAINNAME)) && defined(HAVE_YP_MASTER) ++#if (defined(HAVE_YP_GET_DEFAULT_DOMAIN) || defined(HAVE_GETDOMAINNAME)) && defined(HAVE_YP_MASTER) && defined(USE_NIS) + char *master; + char *domainname; + int port, err; --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -19,7 +19,7 @@ diff --git a/libs/libpam/patches/005-fix_ruserok.patch b/libs/libpam/patches/005-fix_ruserok.patch deleted file mode 100644 index 1f0f463371..0000000000 --- a/libs/libpam/patches/005-fix_ruserok.patch +++ /dev/null @@ -1,364 +0,0 @@ ---- a/modules/pam_rhosts/pam_rhosts.c -+++ b/modules/pam_rhosts/pam_rhosts.c -@@ -43,6 +43,361 @@ - #include - #include - -+#ifdef __UCLIBC__ -+ -+#include -+#include -+ -+ -+int __check_rhosts_file = 1; -+ -+/* Extremely paranoid file open function. */ -+static FILE * -+iruserfopen (const char *file, uid_t okuser) -+{ -+ struct stat st; -+ char *cp = NULL; -+ FILE *res = NULL; -+ -+ /* If not a regular file, if owned by someone other than user or -+ root, if writeable by anyone but the owner, or if hardlinked -+ anywhere, quit. */ -+ if (lstat (file, &st)) -+ cp = "lstat failed"; -+ else if (!S_ISREG (st.st_mode)) -+ cp = "not regular file"; -+ else -+ { -+ res = fopen (file, "r"); -+ if (!res) -+ cp = "cannot open"; -+ else if (fstat (fileno (res), &st) < 0) -+ cp = "fstat failed"; -+ else if (st.st_uid && st.st_uid != okuser) -+ cp = "bad owner"; -+ else if (st.st_mode & (S_IWGRP|S_IWOTH)) -+ cp = "writeable by other than owner"; -+ else if (st.st_nlink > 1) -+ cp = "hard linked somewhere"; -+ } -+ -+ /* If there were any problems, quit. */ -+ if (cp != NULL) -+ { -+ if (res) -+ fclose (res); -+ return NULL; -+ } -+ -+ return res; -+} -+ -+/* -+ * Returns 1 for blank lines (or only comment lines) and 0 otherwise -+ */ -+static int -+__isempty(char *p) -+{ -+ while (*p && isspace (*p)) { -+ ++p; -+ } -+ -+ return (*p == '\0' || *p == '#') ? 1 : 0 ; -+} -+ -+/* Returns 1 on positive match, 0 on no match, -1 on negative match. */ -+static int -+__icheckhost (u_int32_t raddr, char *lhost, const char *rhost) -+{ -+ struct hostent *hp; -+ u_int32_t laddr; -+ int negate=1; /* Multiply return with this to get -1 instead of 1 */ -+ char **pp; -+ -+#ifdef __UCLIBC_HAS_REENTRANT_RPC__ -+ int save_errno; -+ size_t buflen; -+ char *buffer; -+ struct hostent hostbuf; -+ int herr; -+#endif -+ -+#ifdef HAVE_NETGROUP -+ /* Check nis netgroup. */ -+ if (strncmp ("+@", lhost, 2) == 0) -+ return innetgr (&lhost[2], rhost, NULL, NULL); -+ -+ if (strncmp ("-@", lhost, 2) == 0) -+ return -innetgr (&lhost[2], rhost, NULL, NULL); -+#endif /* HAVE_NETGROUP */ -+ -+ /* -host */ -+ if (strncmp ("-", lhost,1) == 0) { -+ negate = -1; -+ lhost++; -+ } else if (strcmp ("+",lhost) == 0) { -+ return 1; /* asking for trouble, but ok.. */ -+ } -+ -+ /* Try for raw ip address first. */ -+ if (isdigit (*lhost) && (laddr = inet_addr (lhost)) != INADDR_NONE) -+ return negate * (! (raddr ^ laddr)); -+ -+ /* Better be a hostname. */ -+#ifdef __UCLIBC_HAS_REENTRANT_RPC__ -+ buflen = 1024; -+ buffer = malloc(buflen); -+ save_errno = errno; -+ -+ while (gethostbyname_r (lhost, &hostbuf, buffer, buflen, &hp, &herr) -+ != 0) { -+ free(buffer); -+ return (0); -+ } -+ free(buffer); -+ __set_errno (save_errno); -+#else -+ hp = gethostbyname(lhost); -+#endif /* __UCLIBC_HAS_REENTRANT_RPC__ */ -+ -+ if (hp == NULL) -+ return 0; -+ -+ /* Spin through ip addresses. */ -+ for (pp = hp->h_addr_list; *pp; ++pp) -+ if (!memcmp (&raddr, *pp, sizeof (u_int32_t))) -+ return negate; -+ -+ /* No match. */ -+ return (0); -+} -+ -+/* Returns 1 on positive match, 0 on no match, -1 on negative match. */ -+static int -+__icheckuser (const char *luser, const char *ruser) -+{ -+ -+ /* -+ luser is user entry from .rhosts/hosts.equiv file -+ ruser is user id on remote host -+ */ -+ -+#ifdef HAVE_NETGROUP -+ /* [-+]@netgroup */ -+ if (strncmp ("+@", luser, 2) == 0) -+ return innetgr (&luser[2], NULL, ruser, NULL); -+ -+ if (strncmp ("-@", luser,2) == 0) -+ return -innetgr (&luser[2], NULL, ruser, NULL); -+#endif /* HAVE_NETGROUP */ -+ -+ /* -user */ -+ if (strncmp ("-", luser, 1) == 0) -+ return -(strcmp (&luser[1], ruser) == 0); -+ -+ /* + */ -+ if (strcmp ("+", luser) == 0) -+ return 1; -+ -+ /* simple string match */ -+ return strcmp (ruser, luser) == 0; -+} -+ -+/* -+ * Returns 0 if positive match, -1 if _not_ ok. -+ */ -+static int -+__ivaliduser2(FILE *hostf, u_int32_t raddr, const char *luser, -+ const char *ruser, const char *rhost) -+{ -+ register const char *user; -+ register char *p; -+ int hcheck, ucheck; -+ char *buf = NULL; -+ size_t bufsize = 0; -+ int retval = -1; -+ -+ while (getline (&buf, &bufsize, hostf) > 0) { -+ buf[bufsize - 1] = '\0'; /* Make sure it's terminated. */ -+ p = buf; -+ -+ /* Skip empty or comment lines */ -+ if (__isempty (p)) { -+ continue; -+ } -+ -+ /* Skip lines that are too long. */ -+ if (strchr (p, '\n') == NULL) { -+ int ch = getc_unlocked (hostf); -+ -+ while (ch != '\n' && ch != EOF) -+ ch = getc_unlocked (hostf); -+ continue; -+ } -+ -+ for (;*p && !isspace(*p); ++p) { -+ *p = tolower (*p); -+ } -+ -+ /* Next we want to find the permitted name for the remote user. */ -+ if (*p == ' ' || *p == '\t') { -+ /* terminate hostname and skip spaces */ -+ for (*p++='\0'; *p && isspace (*p); ++p); -+ -+ user = p; /* this is the user's name */ -+ while (*p && !isspace (*p)) -+ ++p; /* find end of user's name */ -+ } else -+ user = p; -+ -+ *p = '\0'; /* terminate username (+host?) */ -+ -+ /* buf -> host(?) ; user -> username(?) */ -+ -+ /* First check host part */ -+ hcheck = __icheckhost (raddr, buf, rhost); -+ -+ if (hcheck < 0) -+ break; -+ -+ if (hcheck) { -+ /* Then check user part */ -+ if (! (*user)) -+ user = luser; -+ -+ ucheck = __icheckuser (user, ruser); -+ -+ /* Positive 'host user' match? */ -+ if (ucheck > 0) { -+ retval = 0; -+ break; -+ } -+ -+ /* Negative 'host -user' match? */ -+ if (ucheck < 0) -+ break; -+ -+ /* Neither, go on looking for match */ -+ } -+ } -+ -+ free (buf); -+ -+ return retval; -+} -+ -+static int -+iruserok2 (u_int32_t raddr, int superuser, const char *ruser, const char *luser, -+ const char *rhost) -+{ -+ FILE *hostf = NULL; -+ int isbad = -1; -+ -+ if (!superuser) -+ hostf = iruserfopen (_PATH_HEQUIV, 0); -+ -+ if (hostf) { -+ isbad = __ivaliduser2 (hostf, raddr, luser, ruser, rhost); -+ fclose (hostf); -+ -+ if (!isbad) -+ return 0; -+ } -+ -+ if (__check_rhosts_file || superuser) { -+ char *pbuf; -+ struct passwd *pwd; -+ size_t dirlen; -+ uid_t uid; -+ -+#ifdef __UCLIBC_HAS_REENTRANT_RPC__ -+ size_t buflen = sysconf (_SC_GETPW_R_SIZE_MAX); -+ struct passwd pwdbuf; -+ char *buffer = stack_heap_alloc(buflen); -+ -+ if (getpwnam_r (luser, &pwdbuf, buffer, -+ buflen, &pwd) != 0 || pwd == NULL) -+ { -+ stack_heap_free(buffer); -+ return -1; -+ } -+ stack_heap_free(buffer); -+#else -+ if ((pwd = getpwnam(luser)) == NULL) -+ return -1; -+#endif -+ -+ dirlen = strlen (pwd->pw_dir); -+ pbuf = malloc (dirlen + sizeof "/.rhosts"); -+ strcpy (pbuf, pwd->pw_dir); -+ strcat (pbuf, "/.rhosts"); -+ -+ /* Change effective uid while reading .rhosts. If root and -+ reading an NFS mounted file system, can't read files that -+ are protected read/write owner only. */ -+ uid = geteuid (); -+ seteuid (pwd->pw_uid); -+ hostf = iruserfopen (pbuf, pwd->pw_uid); -+ free(pbuf); -+ -+ if (hostf != NULL) { -+ isbad = __ivaliduser2 (hostf, raddr, luser, ruser, rhost); -+ fclose (hostf); -+ } -+ -+ seteuid (uid); -+ return isbad; -+ } -+ return -1; -+} -+ -+int ruserok(const char *rhost, int superuser, const char *ruser, -+ const char *luser) -+{ -+ struct hostent *hp; -+ u_int32_t addr; -+ char **ap; -+#ifdef __UCLIBC_HAS_REENTRANT_RPC__ -+ size_t buflen; -+ char *buffer; -+ int herr; -+ struct hostent hostbuf; -+#endif -+ -+#ifdef __UCLIBC_HAS_REENTRANT_RPC__ -+ buflen = 1024; -+ buffer = stack_heap_alloc(buflen); -+ -+ while (gethostbyname_r (rhost, &hostbuf, buffer, -+ buflen, &hp, &herr) != 0 || hp == NULL) -+ { -+ if (herr != NETDB_INTERNAL || errno != ERANGE) { -+ stack_heap_free(buffer); -+ return -1; -+ } else -+ { -+ /* Enlarge the buffer. */ -+ buflen *= 2; -+ stack_heap_free(buffer); -+ buffer = stack_heap_alloc(buflen); -+ } -+ } -+ stack_heap_free(buffer); -+#else -+ if ((hp = gethostbyname(rhost)) == NULL) { -+ return -1; -+ } -+#endif -+ for (ap = hp->h_addr_list; *ap; ++ap) { -+ memmove(&addr, *ap, sizeof(addr)); -+ if (iruserok2(addr, superuser, ruser, luser, rhost) == 0) -+ return 0; -+ } -+ return -1; -+} -+ -+#endif /* __UCLIBC__ */ -+ - PAM_EXTERN - int pam_sm_authenticate (pam_handle_t *pamh, int flags, int argc, - const char **argv) diff --git a/libs/libpam/patches/006-fix_xdr.patch b/libs/libpam/patches/006-fix_xdr.patch deleted file mode 100644 index eec6772e20..0000000000 --- a/libs/libpam/patches/006-fix_xdr.patch +++ /dev/null @@ -1,272 +0,0 @@ ---- a/modules/pam_unix/yppasswd_xdr.c -+++ b/modules/pam_unix/yppasswd_xdr.c -2011-10-01 13:46:21.599443197 +0300 -@@ -21,6 +21,268 @@ - #endif - #include "yppasswd.h" - -+#ifdef __UCLIBC__ -+ -+static const char xdr_zero[BYTES_PER_XDR_UNIT] = {0, 0, 0, 0}; -+ -+/* -+ * XDR integers -+ */ -+bool_t -+xdr_int (XDR *xdrs, int *ip) -+{ -+ -+#if INT_MAX < LONG_MAX -+ long l; -+ -+ switch (xdrs->x_op) -+ { -+ case XDR_ENCODE: -+ l = (long) *ip; -+ return XDR_PUTLONG (xdrs, &l); -+ -+ case XDR_DECODE: -+ if (!XDR_GETLONG (xdrs, &l)) -+ { -+ return FALSE; -+ } -+ *ip = (int) l; -+ case XDR_FREE: -+ return TRUE; -+ } -+ return FALSE; -+#elif INT_MAX == LONG_MAX -+ return xdr_long (xdrs, (long *) ip); -+#elif INT_MAX == SHRT_MAX -+ return xdr_short (xdrs, (short *) ip); -+#else -+#error unexpected integer sizes in xdr_int() -+#endif -+} -+ -+/* -+ * XDR null terminated ASCII strings -+ * xdr_string deals with "C strings" - arrays of bytes that are -+ * terminated by a NULL character. The parameter cpp references a -+ * pointer to storage; If the pointer is null, then the necessary -+ * storage is allocated. The last parameter is the max allowed length -+ * of the string as specified by a protocol. -+ */ -+bool_t -+xdr_string (XDR *xdrs, char **cpp, u_int maxsize) -+{ -+ char *sp = *cpp; /* sp is the actual string pointer */ -+ u_int size; -+ u_int nodesize; -+ -+ /* -+ * first deal with the length since xdr strings are counted-strings -+ */ -+ switch (xdrs->x_op) -+ { -+ case XDR_FREE: -+ if (sp == NULL) -+ { -+ return TRUE; /* already free */ -+ } -+ /* fall through... */ -+ case XDR_ENCODE: -+ if (sp == NULL) -+ return FALSE; -+ size = strlen (sp); -+ break; -+ case XDR_DECODE: -+ break; -+ } -+ if (!xdr_u_int (xdrs, &size)) -+ { -+ return FALSE; -+ } -+ if (size > maxsize) -+ { -+ return FALSE; -+ } -+ nodesize = size + 1; -+ -+ /* -+ * now deal with the actual bytes -+ */ -+ switch (xdrs->x_op) -+ { -+ case XDR_DECODE: -+ if (nodesize == 0) -+ { -+ return TRUE; -+ } -+ if (sp == NULL) -+ *cpp = sp = (char *) mem_alloc (nodesize); -+ if (sp == NULL) -+ { -+#ifdef USE_IN_LIBIO -+ if (_IO_fwide (stderr, 0) > 0) -+ (void) fwprintf (stderr, L"%s", -+ _("xdr_string: out of memory\n")); -+ else -+#endif -+ (void) fputs (_("xdr_string: out of memory\n"), stderr); -+ return FALSE; -+ } -+ sp[size] = 0; -+ /* fall into ... */ -+ -+ case XDR_ENCODE: -+ return xdr_opaque (xdrs, sp, size); -+ -+ case XDR_FREE: -+ mem_free (sp, nodesize); -+ *cpp = NULL; -+ return TRUE; -+ } -+ return FALSE; -+} -+ -+/* -+ * XDR long integers -+ * The definition of xdr_long() is kept for backward -+ * compatibility. Instead xdr_int() should be used. -+ */ -+bool_t -+xdr_long (XDR *xdrs, long *lp) -+{ -+ if (xdrs->x_op == XDR_ENCODE -+ && (sizeof (int32_t) == sizeof (long) -+ || (int32_t) *lp == *lp)) -+ return XDR_PUTLONG (xdrs, lp); -+ -+ if (xdrs->x_op == XDR_DECODE) -+ return XDR_GETLONG (xdrs, lp); -+ -+ if (xdrs->x_op == XDR_FREE) -+ return TRUE; -+ -+ return FALSE; -+} -+ -+/* -+ * XDR unsigned integers -+ */ -+bool_t -+xdr_u_int (XDR *xdrs, u_int *up) -+{ -+#if UINT_MAX < ULONG_MAX -+ u_long l; -+ -+ switch (xdrs->x_op) -+ { -+ case XDR_ENCODE: -+ l = (u_long) * up; -+ return XDR_PUTLONG (xdrs, (long *) &l); -+ -+ case XDR_DECODE: -+ if (!XDR_GETLONG (xdrs, (long *) &l)) -+ { -+ return FALSE; -+ } -+ *up = (u_int) l; -+ case XDR_FREE: -+ return TRUE; -+ } -+ return FALSE; -+#elif UINT_MAX == ULONG_MAX -+ return xdr_u_long (xdrs, (u_long *) up); -+#elif UINT_MAX == USHRT_MAX -+ return xdr_short (xdrs, (short *) up); -+#else -+#error unexpected integer sizes in xdr_u_int() -+#endif -+} -+ -+/* -+ * XDR opaque data -+ * Allows the specification of a fixed size sequence of opaque bytes. -+ * cp points to the opaque object and cnt gives the byte length. -+ */ -+bool_t -+xdr_opaque (XDR *xdrs, caddr_t cp, u_int cnt) -+{ -+ u_int rndup; -+ static char crud[BYTES_PER_XDR_UNIT]; -+ -+ /* -+ * if no data we are done -+ */ -+ if (cnt == 0) -+ return TRUE; -+ -+ /* -+ * round byte count to full xdr units -+ */ -+ rndup = cnt % BYTES_PER_XDR_UNIT; -+ if (rndup > 0) -+ rndup = BYTES_PER_XDR_UNIT - rndup; -+ -+ switch (xdrs->x_op) -+ { -+ case XDR_DECODE: -+ if (!XDR_GETBYTES (xdrs, cp, cnt)) -+ { -+ return FALSE; -+ } -+ if (rndup == 0) -+ return TRUE; -+ return XDR_GETBYTES (xdrs, (caddr_t)crud, rndup); -+ -+ case XDR_ENCODE: -+ if (!XDR_PUTBYTES (xdrs, cp, cnt)) -+ { -+ return FALSE; -+ } -+ if (rndup == 0) -+ return TRUE; -+ return XDR_PUTBYTES (xdrs, xdr_zero, rndup); -+ -+ case XDR_FREE: -+ return TRUE; -+ } -+ return FALSE; -+} -+ -+/* -+ * XDR unsigned long integers -+ * The definition of xdr_u_long() is kept for backward -+ * compatibility. Instead xdr_u_int() should be used. -+ */ -+bool_t -+xdr_u_long (XDR *xdrs, u_long *ulp) -+{ -+ switch (xdrs->x_op) -+ { -+ case XDR_DECODE: -+ { -+ long int tmp; -+ -+ if (XDR_GETLONG (xdrs, &tmp) == FALSE) -+ return FALSE; -+ -+ *ulp = (uint32_t) tmp; -+ return TRUE; -+ } -+ -+ case XDR_ENCODE: -+ if (sizeof (uint32_t) != sizeof (u_long) -+ && (uint32_t) *ulp != *ulp) -+ return FALSE; -+ -+ return XDR_PUTLONG (xdrs, (long *) ulp); -+ -+ case XDR_FREE: -+ return TRUE; -+ } -+ return FALSE; -+} -+ -+#endif /* UCLIBC */ -+ - bool_t - xdr_xpasswd(XDR * xdrs, xpasswd * objp) - { diff --git a/libs/libplist/Makefile b/libs/libplist/Makefile deleted file mode 100644 index 9aede13479..0000000000 --- a/libs/libplist/Makefile +++ /dev/null @@ -1,96 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libplist -PKG_VERSION:=1.8 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=http://www.libimobiledevice.org/downloads -PKG_MD5SUM:=2a9e0258847d50f9760dc3ece25f4dc6 - -CMAKE_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -define Package/libplist/Default - TITLE:=Apple property list - URL:=http://www.libimobiledevice.org/ -endef - -define Package/libplist/Default/description - A library to handle Apple Property List format whereas it's binary or XML -endef - -define Package/libplist - $(call Package/libplist/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libxml2 - TITLE+= library -endef - -define Package/libplist/description - $(call Package/libplist/Default/description) -endef - -define Package/libplistcxx - $(call Package/libplist/Default) - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libplist +libstdcpp - TITLE+= C++ library -endef - -define Package/libplistcxx/description - $(call Package/libplist/Default/description) - This package contains the libplist C++ shared library. -endef - -define Package/libplist-utils - $(call Package/libplist/Default) - SECTION:=utils - CATEGORY:=Utilities - DEPENDS:=+libplist - TITLE+= converter -endef - -define Package/libplist-utils/description - $(call Package/libplist/Default/description) - This package contains the libplist utilities. -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/plist $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist*.so* $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libplist*.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/libplist/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist.so.* $(1)/usr/lib/ -endef - -define Package/libplistcxx/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libplist++.so.* $(1)/usr/lib/ -endef - -define Package/libplist-utils/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/plutil* $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,libplist)) -$(eval $(call BuildPackage,libplistcxx)) -$(eval $(call BuildPackage,libplist-utils)) diff --git a/libs/libsml/Makefile b/libs/libsml/Makefile deleted file mode 100644 index 32ff60f07f..0000000000 --- a/libs/libsml/Makefile +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libsml -PKG_VERSION:=0.1 -PKG_RELEASE:=1 -PKG_REV:=4e546fb0db0bd4c0a2c3c2f3d29ac0a0ba6651a3 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=git://github.com/dailab/libsml.git -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_PROTO:=git - -include $(INCLUDE_DIR)/package.mk - -define Package/libsml - SECTION:=libs - CATEGORY:=Libraries - URL:=https://github.com/dailab/libsml - TITLE:=Library which implements the Smart Messaging Language (SML) protocol - DEPENDS:=+libuuid -endef - -define Package/libsml/description - libSML is a library which implements the Smart Messaging Language (SML) protocol specified by - VDE's Forum Netztechnik/Netzbetrieb (FNN). It can be utilized to communicate to FNN specified - Smart Meters or Smart Meter components (EDL/MUC). -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_BUILD_DIR)/sml/include/sml $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/sml/lib/libsml.{so*,a} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_BUILD_DIR)/sml.pc $(1)/usr/lib/pkgconfig/ -endef - -define Package/libsml/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_BUILD_DIR)/sml/lib/libsml.so* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libsml)) diff --git a/libs/libsml/patches/010-no-examples-tests.patch b/libs/libsml/patches/010-no-examples-tests.patch deleted file mode 100644 index bf2220c1ed..0000000000 --- a/libs/libsml/patches/010-no-examples-tests.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -1,8 +1,8 @@ - - all: - @$(MAKE) -C sml -- @$(MAKE) -C examples -- @$(MAKE) -C test -+# @$(MAKE) -C examples -+# @$(MAKE) -C test - - .PHONY: clean - clean : diff --git a/libs/libsml/patches/020-ldflags.patch b/libs/libsml/patches/020-ldflags.patch deleted file mode 100644 index d6fa2e4efe..0000000000 --- a/libs/libsml/patches/020-ldflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/sml/Makefile -+++ b/sml/Makefile -@@ -54,7 +54,7 @@ libsml: $(ST_LIB) $(OBJ_LIB) - endif - - $(DYN_LIB): $(OBJS) -- $(LD) $(LIBS) -shared -soname $(SONAME) -o $@ $^ -+ $(LD) $(LDFLAGS) $(LIBS) -shared -soname $(SONAME) -o $@ $^ - - $(OBJ_LIB): $(OBJS) - $(LD) -r -o $@ $^ diff --git a/libs/libsml/patches/030-cross-compile.patch b/libs/libsml/patches/030-cross-compile.patch deleted file mode 100644 index c7dcc22ead..0000000000 --- a/libs/libsml/patches/030-cross-compile.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/sml/Makefile -+++ b/sml/Makefile -@@ -1,4 +1,4 @@ --UNAME := $(shell uname) -+UNAME := Linux - CFLAGS += -I./include/ -fPIC -g -Wall - - # Available Flags: diff --git a/libs/libsndfile/Makefile b/libs/libsndfile/Makefile index 9fe6f381a5..6bbf155a53 100644 --- a/libs/libsndfile/Makefile +++ b/libs/libsndfile/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libsndfile -PKG_VERSION:=1.0.25 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.21 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.mega-nerd.com/libsndfile/files/ -PKG_MD5SUM:=e2b7bb637e01022c7d20f95f9c3990a2 +PKG_MD5SUM:=880a40ec636ab2185b97f8927299b292 PKG_FIXUP:=libtool PKG_INSTALL:=1 @@ -36,15 +36,8 @@ endef CONFIGURE_ARGS+= \ --disable-alsa \ --disable-external-libs \ - --disable-sqlite - -CONFIGURE_VARS += \ - ac_cv_sys_file_offset_bits=64 \ - ac_cv_sys_large_files=yes \ - ac_cv_sys_largefile_CFLAGS=-D_LARGFILE_SOURCE \ - ac_cv_sys_largefile_LDFLAGS= \ - ac_cv_sys_largefile_LIBS= \ - ac_cv_sys_largefile_source=yes + --disable-sqlite \ + --disable-shave \ TARGET_CFLAGS += $(FPIC) diff --git a/libs/libspe2/Makefile b/libs/libspe2/Makefile deleted file mode 100644 index 2fc4aa421f..0000000000 --- a/libs/libspe2/Makefile +++ /dev/null @@ -1,47 +0,0 @@ -# -# Copyright (C) 2006-2008 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=libspe2 -PKG_VERSION:=2.3.0 -PKG_MINOR_VERSION:=135 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).$(PKG_MINOR_VERSION).tar.gz -PKG_SOURCE_URL:=@SF/libspe -PKG_MD5SUM:=c77dc69d3585d45f980e661232ae2b0b - -include $(INCLUDE_DIR)/package.mk - -define Package/libspe2 - SECTION:=libs - CATEGORY:=Libraries - TITLE:=SPE Runtime Management Library for the Cell Broadband Engine - DEPENDS:=@TARGET_ps3||TARGET_ps3chk - URL:=http://sourceforge.net/projects/libspe/ -endef - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) DESTDIR="$(PKG_INSTALL_DIR)" SYSROOT="" CROSS=$(TARGET_CROSS) all install -endef - -define Build/InstallDev - echo "Build/InstallDev" - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspe2* $(1)/usr/lib/ -endef - -define Package/libspe2/install - echo "Package/libspe2/install" - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libspe2* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libspe2)) diff --git a/libs/libspe2/patches/001-remove_tls_requirement.patch b/libs/libspe2/patches/001-remove_tls_requirement.patch deleted file mode 100644 index ae4d118d0c..0000000000 --- a/libs/libspe2/patches/001-remove_tls_requirement.patch +++ /dev/null @@ -1,93 +0,0 @@ ---- libspe2-2.3.0.old/spebase/run.c 2008-10-28 14:43:09.000000000 +0100 -+++ libspe2-2.3.0/spebase/run.c 2008-10-28 14:44:07.000000000 +0100 -@@ -37,6 +37,7 @@ - #include "spebase.h" - #include "regs.h" - -+#if 0 - /*Thread-local variable for use by the debugger*/ - __thread struct spe_context_info { - int spe_id; -@@ -44,13 +45,15 @@ - unsigned int status; - struct spe_context_info *prev; - }*__spe_current_active_context; -+#endif - -- -+#if 0 - static void cleanupspeinfo(struct spe_context_info *ctxinfo) - { - struct spe_context_info *tmp = ctxinfo->prev; - __spe_current_active_context = tmp; - } -+#endif - - static int issue_isolated_exit(struct spe_context *spe) - { -@@ -69,12 +72,14 @@ - return 0; - } - -+#if 0 - static inline void freespeinfo() - { - /*Clean up the debug variable*/ - struct spe_context_info *tmp = __spe_current_active_context->prev; - __spe_current_active_context = tmp; - } -+#endif - - int _base_spe_context_run(spe_context_ptr_t spe, unsigned int *entry, - unsigned int runflags, void *argp, void *envp, -@@ -83,7 +88,9 @@ - int retval = 0, run_rc; - unsigned int run_status, tmp_entry; - spe_stop_info_t stopinfo_buf; -+#if 0 - struct spe_context_info this_context_info __attribute__((cleanup(cleanupspeinfo))); -+#endif - - /* If the caller hasn't set a stopinfo buffer, provide a buffer on the - * stack instead. */ -@@ -146,6 +153,7 @@ - return -1; - } - -+#if 0 - /*Leave a trail of breadcrumbs for the debugger to follow */ - if (!__spe_current_active_context) { - __spe_current_active_context = &this_context_info; -@@ -162,18 +170,23 @@ - } - /*remember the ls-addr*/ - __spe_current_active_context->spe_id = spe->base_private->fd_spe_dir; -+#endif - - do_run: -+#if 0 - /*Remember the npc value*/ - __spe_current_active_context->npc = tmp_entry; -+#endif - - /* run SPE context */ - run_rc = spu_run(spe->base_private->fd_spe_dir, - &tmp_entry, &run_status); - -+#if 0 - /*Remember the npc value*/ - __spe_current_active_context->npc = tmp_entry; - __spe_current_active_context->status = run_status; -+#endif - - DEBUG_PRINTF("spu_run returned run_rc=0x%08x, entry=0x%04x, " - "ext_status=0x%04x.\n", run_rc, tmp_entry, run_status); -@@ -341,6 +354,8 @@ - - } - -+#if 0 - freespeinfo(); -+#endif - return retval; - } diff --git a/libs/libsrtp/Makefile b/libs/libsrtp/Makefile deleted file mode 100644 index 443d17fa48..0000000000 --- a/libs/libsrtp/Makefile +++ /dev/null @@ -1,54 +0,0 @@ -# -# Copyright (C) 2011-2012 OpenWrt.org -# Copyright (C) 2011 Victor Seva -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=libsrtp -PKG_VERSION:=1.4.4 -PKG_RELEASE:=1 - -PKG_SOURCE:=srtp-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=@SF/srtp -PKG_MD5SUM:=9b449edb011c934ca97009e7e0566d22 - -PKG_BUILD_DIR:=$(BUILD_DIR)/srtp -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -TARGET_CFLAGS += $(FPIC) -CONFIGURE_ARGS += --disable-stdout --enable-syslog - -define Package/libsrtp - SECTION:=libs - CATEGORY:=Libraries - TITLE:=Secure Real-time Transport Protocol (SRTP) library - URL:=http://sourceforge.net/projects/srtp - MAINTAINER:=Victor Seva -endef - -define Package/libsrtp/description - Open-source implementation of the Secure Real-time Transport - Protocol (SRTP) originally authored by Cisco Systems, Inc. - It is available under a BSD-style license. -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/srtp $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.{a,so*} $(1)/usr/lib/ -endef - - -define Package/libsrtp/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsrtp.so.* \ - $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libsrtp)) diff --git a/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch b/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch deleted file mode 100644 index 534ea4bc30..0000000000 --- a/libs/libsrtp/patches/1003_fix_mips_namespace_collision.patch +++ /dev/null @@ -1,59 +0,0 @@ -Description: Fix MIPS namespace collision -Author: Thiemo Seufer -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=24;bug=439976 -Bug-Debian: http://bugs.debian.org/439976 -Last-Update: 2010-02-28 ---- a/test/srtp_driver.c -+++ b/test/srtp_driver.c -@@ -314,7 +314,7 @@ main (int argc, char *argv[]) { - if (do_codec_timing) { - srtp_policy_t policy; - int ignore; -- double mips = mips_estimate(1000000000, &ignore); -+ double mips_est = mips_estimate(1000000000, &ignore); - - crypto_policy_set_rtp_default(&policy.rtp); - crypto_policy_set_rtcp_default(&policy.rtcp); -@@ -323,33 +323,33 @@ main (int argc, char *argv[]) { - policy.key = test_key; - policy.next = NULL; - -- printf("mips estimate: %e\n", mips); -+ printf("mips estimate: %e\n", mips_est); - - printf("testing srtp processing time for voice codecs:\n"); - printf("codec\t\tlength (octets)\t\tsrtp instructions/second\n"); - printf("G.711\t\t%d\t\t\t%e\n", 80, -- (double) mips * (80 * 8) / -+ (double) mips_est * (80 * 8) / - srtp_bits_per_second(80, &policy) / .01 ); - printf("G.711\t\t%d\t\t\t%e\n", 160, -- (double) mips * (160 * 8) / -+ (double) mips_est * (160 * 8) / - srtp_bits_per_second(160, &policy) / .02); - printf("G.726-32\t%d\t\t\t%e\n", 40, -- (double) mips * (40 * 8) / -+ (double) mips_est * (40 * 8) / - srtp_bits_per_second(40, &policy) / .01 ); - printf("G.726-32\t%d\t\t\t%e\n", 80, -- (double) mips * (80 * 8) / -+ (double) mips_est * (80 * 8) / - srtp_bits_per_second(80, &policy) / .02); - printf("G.729\t\t%d\t\t\t%e\n", 10, -- (double) mips * (10 * 8) / -+ (double) mips_est * (10 * 8) / - srtp_bits_per_second(10, &policy) / .01 ); - printf("G.729\t\t%d\t\t\t%e\n", 20, -- (double) mips * (20 * 8) / -+ (double) mips_est * (20 * 8) / - srtp_bits_per_second(20, &policy) / .02 ); - printf("Wideband\t%d\t\t\t%e\n", 320, -- (double) mips * (320 * 8) / -+ (double) mips_est * (320 * 8) / - srtp_bits_per_second(320, &policy) / .01 ); - printf("Wideband\t%d\t\t\t%e\n", 640, -- (double) mips * (640 * 8) / -+ (double) mips_est * (640 * 8) / - srtp_bits_per_second(640, &policy) / .02 ); - } - diff --git a/libs/libsrtp/patches/1005_fix_data_alignment.patch b/libs/libsrtp/patches/1005_fix_data_alignment.patch deleted file mode 100644 index 4cb888983c..0000000000 --- a/libs/libsrtp/patches/1005_fix_data_alignment.patch +++ /dev/null @@ -1,33 +0,0 @@ -Description: Fix data alignment -Author: "Martin Guy" -Origin: vendor, http://bugs.debian.org/cgi-bin/bugreport.cgi?msg=5;bug=470505 -Bug: http://sourceforge.net/tracker/index.php?func=detail&aid=1912057&group_id=38894&atid=423799 -Bug-Debian: http://bugs.debian.org/470505 -Last-Update: 2011-05-30 ---- a/test/srtp_driver.c -+++ b/test/srtp_driver.c -@@ -1129,7 +1129,6 @@ mips_estimate(int num_trials, int *ignor - * These packets were made with the default SRTP policy. - */ - -- - err_status_t - srtp_validate() { - unsigned char test_key[30] = { -@@ -1144,14 +1143,14 @@ srtp_validate() { - 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, - 0xab, 0xab, 0xab, 0xab - }; -- uint8_t srtp_plaintext[38] = { -+ uint8_t srtp_plaintext[38] __attribute__((aligned(4))) = { - 0x80, 0x0f, 0x12, 0x34, 0xde, 0xca, 0xfb, 0xad, - 0xca, 0xfe, 0xba, 0xbe, 0xab, 0xab, 0xab, 0xab, - 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, 0xab, - 0xab, 0xab, 0xab, 0xab, 0x00, 0x00, 0x00, 0x00, - 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 - }; -- uint8_t srtp_ciphertext[38] = { -+ uint8_t srtp_ciphertext[38] __attribute__((aligned(4))) = { - 0x80, 0x0f, 0x12, 0x34, 0xde, 0xca, 0xfb, 0xad, - 0xca, 0xfe, 0xba, 0xbe, 0x4e, 0x55, 0xdc, 0x4c, - 0xe7, 0x99, 0x78, 0xd8, 0x8c, 0xa4, 0xd2, 0x15, diff --git a/libs/libsrtp/patches/1007_update_Doxyfile.patch b/libs/libsrtp/patches/1007_update_Doxyfile.patch deleted file mode 100644 index 8108d7d847..0000000000 --- a/libs/libsrtp/patches/1007_update_Doxyfile.patch +++ /dev/null @@ -1,94 +0,0 @@ -Description: Update Doxyfile and header template -Author: Jonas Smedegaard -Last-Update: 2010-02-28 ---- a/doc/Makefile.in -+++ b/doc/Makefile.in -@@ -25,6 +25,7 @@ libsrtpdoc: - echo "*** Sorry, can't build doc outside source dir"; exit 1; \ - fi - sed 's/LIBSRTPVERSION/$(version)/' header.template > header.tex -+ doxygen -u - doxygen - sed 's/\subsection/\section/' latex/index.tex > latex/index.tmp - mv latex/index.tmp latex/index.tex -@@ -38,7 +39,7 @@ cryptodoc: clean - cp latex/refman.pdf crypto.pdf - - clean: -- rm -rf latex/ header.tex -+ rm -rf latex/ header.tex Doxyfile.bak - for a in * ; do \ - if [ -f "$$a~" ] ; then rm -f $$a~; fi; \ - done; ---- a/doc/header.template -+++ b/doc/header.template -@@ -6,28 +6,40 @@ - % - \documentclass[letterpaper]{book} - \usepackage{makeidx} --\usepackage{fancyhdr} - \usepackage{graphicx} - \usepackage{multicol} - \usepackage{float} -+\usepackage{listings} -+\usepackage{color} -+\usepackage{ifthen} -+\usepackage[table]{xcolor} - \usepackage{textcomp} - \usepackage{alltt} --\usepackage{times} --\usepackage{graphicx} --\ifx\pdfoutput\undefined --\usepackage[ps2pdf, -+\usepackage{ifpdf} -+\ifpdf -+\usepackage[pdftex, - pagebackref=true, - colorlinks=true, -- linkcolor=blue -+ linkcolor=blue, -+ unicode - ]{hyperref} - \else --\usepackage[pdftex, -+\usepackage[ps2pdf, - pagebackref=true, - colorlinks=true, -- linkcolor=blue -+ linkcolor=blue, -+ unicode - ]{hyperref} -+\usepackage{pspicture} - \fi -+\usepackage[utf8]{inputenc} -+\usepackage{mathptmx} -+\usepackage[scaled=.90]{helvet} -+\usepackage{courier} -+\usepackage{sectsty} -+\usepackage[titles]{tocloft} - \usepackage{doxygen} -+\lstset{language=C++,inputencoding=utf8,basicstyle=\footnotesize,breaklines=true,breakatwhitespace=true,tabsize=3,numbers=left } - \makeindex - \setcounter{tocdepth}{1} - \renewcommand{\footrulewidth}{0.4pt} -@@ -59,7 +71,9 @@ - \selectfont - - -+\renewcommand{\familydefault}{\sfdefault} - \begin{document} -+\hypersetup{pageanchor=false} - \begin{titlepage} - \vspace*{4cm} - %\begin{center} -@@ -107,9 +121,6 @@ This reference material in this documena - \clearemptydoublepage - \pagenumbering{roman} - \tableofcontents --%\clearemptydoublepage -- - \clearemptydoublepage - \pagenumbering{arabic} -- -- -+\hypersetup{pageanchor=true} diff --git a/libs/libsrtp/patches/1008_shared-lib.patch b/libs/libsrtp/patches/1008_shared-lib.patch deleted file mode 100644 index 96a13ca6ab..0000000000 --- a/libs/libsrtp/patches/1008_shared-lib.patch +++ /dev/null @@ -1,55 +0,0 @@ -Description: Hack build routines to compile shared library -Author: loki_val and solar -Origin: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-libs/libsrtp/files/libsrtp-1.4.4-shared.patch -Last-Update: 2010-03-19 ---- a/Makefile.in -+++ b/Makefile.in -@@ -15,7 +15,7 @@ - - .PHONY: all test build_table_apps - --all: test -+all: libsrtp.so test - - runtest: build_table_apps test - @echo "running libsrtp test applications..." -@@ -67,7 +67,7 @@ libdir = @libdir@ - # implicit rules for object files and test apps - - %.o: %.c -- $(COMPILE) -c $< -o $@ -+ $(COMPILE) -fPIC -c $< -o $@ - - %$(EXE): %.c - $(COMPILE) $(LDFLAGS) $< -o $@ $(SRTPLIB) $(LIBS) -@@ -105,6 +105,9 @@ libsrtp.a: $(srtpobj) $(cryptobj) $(gdoi - ar cr libsrtp.a $^ - $(RANLIB) libsrtp.a - -+libsrtp.so: $(srtpobj) $(cryptobj) $(gdoi) -+ $(CC) $(LDFLAGS) -shared -Wl,-soname,libsrtp.so.0 -o libsrtp.so.0.0 $^ -+ - # libcryptomath.a contains general-purpose routines that are used to - # generate tables and verify cryptoalgorithm implementations - this - # library is not meant to be included in production code -@@ -197,6 +200,11 @@ install: - cp include/*.h $(DESTDIR)$(includedir)/srtp - cp crypto/include/*.h $(DESTDIR)$(includedir)/srtp - if [ -f libsrtp.a ]; then cp libsrtp.a $(DESTDIR)$(libdir)/; fi -+ if [ -f libsrtp.so.0.0 ]; then \ -+ cp libsrtp.so.0.0 $(DESTDIR)$(libdir)/; \ -+ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so.0; \ -+ ln -s libsrtp.so.0.0 $(DESTDIR)$(libdir)/libsrtp.so; \ -+ fi - - uninstall: - rm -rf $(DESTDIR)$(includedir)/srtp -@@ -204,7 +212,7 @@ uninstall: - - clean: - rm -rf $(cryptobj) $(srtpobj) $(cryptomath) TAGS \ -- libcryptomath.a libsrtp.a core *.core test/core -+ libcryptomath.a libsrtp.a libsrtp.so.0.0 core *.core test/core - for a in * */* */*/*; do \ - if [ -f "$$a~" ] ; then rm -f $$a~; fi; \ - done; diff --git a/libs/libtorrent/Makefile b/libs/libtorrent/Makefile index 40f0c392f4..6a3d783c4b 100644 --- a/libs/libtorrent/Makefile +++ b/libs/libtorrent/Makefile @@ -26,7 +26,7 @@ define Package/libtorrent CATEGORY:=Libraries TITLE:=Rakshasa's BitTorrent library URL:=http://libtorrent.rakshasa.no/ - DEPENDS:=+libopenssl +libsigcxx + DEPENDS:=+libopenssl +libsigcxx @!LINUX_2_4 MAINTAINER:=Luka Perkov endef diff --git a/libs/libupnp/Makefile b/libs/libupnp/Makefile index c020685b5d..83bdb5e7b3 100644 --- a/libs/libupnp/Makefile +++ b/libs/libupnp/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2011 OpenWrt.org +# +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=libupnp -PKG_VERSION:=1.6.14 +PKG_VERSION:=1.6.12 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/pupnp -PKG_MD5SUM:=a0497cf15b3e15f7e7ede88b3d04861b +PKG_MD5SUM:=d48938efe69d07142be8aaaeaa9a2d3e PKG_FIXUP:=libtool PKG_INSTALL:=1 @@ -50,6 +50,24 @@ define Package/libupnp-sample/description TVcontrolpoint & tvdevice sample applications run inside /etc/upnp-tvdevice/ endef +define Build/Configure + $(call Build/Configure/Default, \ + --enable-shared \ + --enable-static \ + ); +endef + +TARGET_CFLAGS += $(FPIC) + +define Build/Compile/libupnp-sample + $(MAKE) -C $(PKG_BUILD_DIR) \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + check + $(MAKE) -C $(PKG_BUILD_DIR)/upnp/sample \ + DESTDIR="$(PKG_INSTALL_DIR)" \ + upnp_tv_device upnp_tv_ctrlpt +endef + define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/upnp $(1)/usr/include/ @@ -66,9 +84,10 @@ endef define Package/libupnp-sample/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/.libs/* $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_device $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp/sample/tv_ctrlpt $(1)/usr/bin $(INSTALL_DIR) $(1)/etc/upnp-tvdevice/web - $(INSTALL_DATA) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice + $(CP) $(PKG_BUILD_DIR)/upnp/sample/web/* $(1)/etc/upnp-tvdevice endef $(eval $(call BuildPackage,libupnp)) diff --git a/libs/libv4l/Makefile b/libs/libv4l/Makefile index ea6e85059d..368aff1846 100644 --- a/libs/libv4l/Makefile +++ b/libs/libv4l/Makefile @@ -1,6 +1,6 @@ # -# Copyright (C) 2009-2011 OpenWrt.org # Copyright (C) 2009 David Cooper +# Copyright (C) 2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -18,13 +18,12 @@ PKG_MD5SUM:=0d0d96d77c98871d2e5466c10cb30a0a include $(INCLUDE_DIR)/package.mk -# XXX: v4l1 support has been removed in 2.6.38 define Package/libv4l SECTION:=libs CATEGORY:=Libraries TITLE:=Video 4 Linux wrapper libraries URL:=http://people.atrpms.net/~hdegoede/ - DEPENDS:=+libpthread @(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_33||LINUX_2_6_34||LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37) + DEPENDS:=+libpthread @!LINUX_2_4 endef define Package/libv4l/description diff --git a/libs/lzo/Makefile b/libs/lzo/Makefile index eede21bda7..3d47fb3408 100644 --- a/libs/lzo/Makefile +++ b/libs/lzo/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=lzo -PKG_VERSION:=2.05 +PKG_VERSION:=2.04 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.oberhumer.com/opensource/lzo/download/ -PKG_MD5SUM:=c67cda5fa191bab761c7cb06fe091e36 +PKG_MD5SUM:=a383c7055a310e2a71b9ecd19cfea238 PKG_FIXUP:=libtool diff --git a/libs/mysql/Makefile b/libs/mysql/Makefile index fdd822043c..3dcae75e87 100644 --- a/libs/mysql/Makefile +++ b/libs/mysql/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mysql PKG_VERSION:=5.1.53 -PKG_RELEASE:=6 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=\ @@ -29,7 +29,7 @@ include $(INCLUDE_DIR)/package.mk define Package/libmysqlclient/Default SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+uclibcxx +zlib + DEPENDS:=+zlib TITLE:=MySQL client library URL:=http://dev.mysql.com/ endef @@ -37,7 +37,7 @@ endef define Package/mysql-server/Default SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+libmysqlclient +libncurses +libreadline + DEPENDS:=+zlib +libmysqlclient +uclibcxx TITLE:=MySQL Server URL:=http://dev.mysql.com/ SUBMENU:=database @@ -195,10 +195,6 @@ define Package/mysql-server/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/mysql/mysql_system_tables_data.sql $(1)/usr/share/mysql/ endef -define Package/mysql-server/conffiles -/etc/my.cnf -endef - $(eval $(call BuildPackage,mysql-server)) $(eval $(call BuildPackage,libmysqlclient)) $(eval $(call BuildPackage,libmysqlclient_r)) diff --git a/libs/mysql/files/mysqld.init b/libs/mysql/files/mysqld.init index 48e61896ef..693dade6c1 100644 --- a/libs/mysql/files/mysqld.init +++ b/libs/mysql/files/mysqld.init @@ -1,30 +1,29 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2010-2011 OpenWrt.org +# Copyright (C) 2010 OpenWrt.org START=95 STOP=10 -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 -SERVICE_STOP_TIME=9 - -error() { - echo "${initscript}:" "$@" 1>&2 -} +PID=/var/run/mysqld.pid +CMD=/usr/bin/mysqld start() { local datadir=$(sed -n -e "s/^[[:space:]]*datadir[[:space:]]*=[[:space:]]*[\"']\?\([^\"']*\)[\"']\?/\1/p" /etc/my.cnf) if [ ! -d "$datadir" ]; then - error "Error: datadir '$datadir' in /etc/my.cnf doesn't exist" + echo "Error: datadir in /etc/my.cnf ($datadir) doesn't exist" return 1 - fi - if [ ! -f "$datadir/mysql/tables_priv.MYD" ]; then - error "Error: I didn't detect a privileges table, you might need to run mysql_install_db --force to initialize the system tables" + elif [ ! -f "$datadir/mysql/tables_priv.MYD" ]; then + echo "Error: I didn't detect a privileges table, you might need to run mysql_install_db --force to initialize the system tables" return 1 + else + echo -n "Starting MySQL daemon... " + start-stop-daemon -x $CMD -b -S -- --pid-file=$PID + echo "done" fi - service_start /usr/bin/mysqld } stop() { - service_stop /usr/bin/mysqld + echo -n "Stopping MySQL daemon... " + service_kill ${CMD##*/} $PID + echo "done" } diff --git a/libs/openldap/Makefile b/libs/openldap/Makefile index 3cb124d46f..6165d1f361 100644 --- a/libs/openldap/Makefile +++ b/libs/openldap/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006-2012 OpenWrt.org +# +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=openldap PKG_VERSION:=2.4.23 -PKG_RELEASE:=4 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=ftp://ftp.openldap.org/pub/OpenLDAP/openldap-release/ \ @@ -28,11 +28,6 @@ define Package/openldap/Default MAINTAINER:=W. Michael Petullo endef -define Package/openldap/Default/description - OpenLDAP Software is an open source implementation of the - Lightweight Directory Access Protocol (LDAP). -endef - define Package/libopenldap $(call Package/openldap/Default) SECTION:=libs @@ -42,7 +37,8 @@ define Package/libopenldap endef define Package/libopenldap/description - $(call Package/openldap/Default/description) + OpenLDAP Software is an open source implementation of the + Lightweight Directory Access Protocol (LDAP). This package contains the shared LDAP client libraries, needed by other programs. endef @@ -59,7 +55,8 @@ define Package/openldap-utils endef define Package/openldap-utils/description - $(call Package/openldap/Default/description) + OpenLDAP Software is an open source implementation of the + Lightweight Directory Access Protocol (LDAP). This package contains client programs required to access LDAP servers. endef @@ -67,12 +64,13 @@ define Package/openldap-server $(call Package/openldap/Default) SECTION:=net CATEGORY:=Network - DEPENDS:=+libopenldap +libuuid + DEPENDS:=+libopenldap TITLE+= (server) endef define Package/openldap-server/description - $(call Package/openldap/Default/description) + OpenLDAP Software is an open source implementation of the + Lightweight Directory Access Protocol (LDAP). This package contains server programs required to provide LDAP services. endef @@ -115,24 +113,25 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/include/{lber,ldap}*.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib/ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.{a,so*} $(1)/usr/lib/ endef define Package/libopenldap/install $(INSTALL_DIR) $(1)/etc/openldap $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/ldap.conf $(1)/etc/openldap/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/lib{lber,ldap}*.so.* $(1)/usr/lib/ endef - + define Package/openldap-utils/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/ldap* $(1)/usr/bin/ endef - + define Package/openldap-server/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/ldap.init $(1)/etc/init.d/ldap + $(INSTALL_DIR) $(1)/etc/openldap/ldif $(INSTALL_DIR) $(1)/etc/openldap/schema $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/schema/* $(1)/etc/openldap/schema/ $(INSTALL_CONF) $(PKG_INSTALL_DIR)/etc/openldap/slapd.conf $(1)/etc/openldap/ diff --git a/libs/openldap/files/ldap.init b/libs/openldap/files/ldap.init index b30bbf1953..dd14b2133d 100644 --- a/libs/openldap/files/ldap.init +++ b/libs/openldap/files/ldap.init @@ -3,17 +3,12 @@ START=60 -SERVICE_USE_PID=1 - start() { - mkdir -m 0755 -p /var/openldap-data - service_start /usr/sbin/slapd + mkdir -p /var/openldap-data + + /usr/sbin/slapd } stop() { - service_stop /usr/sbin/slapd -} - -reload() { - service_reload /usr/sbin/slapd + killall slapd 2> /dev/null } diff --git a/libs/openldap/patches/020-autofs-schema.patch b/libs/openldap/patches/020-autofs-schema.patch index 11c73f5551..093270fc72 100644 --- a/libs/openldap/patches/020-autofs-schema.patch +++ b/libs/openldap/patches/020-autofs-schema.patch @@ -5,21 +5,21 @@ + DESC 'Automount map name' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) -+ ++ +attributetype ( 1.3.6.1.1.1.1.32 NAME 'automountKey' + DESC 'Automount key value' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) -+ ++ +attributetype ( 1.3.6.1.1.1.1.33 NAME 'automountInformation' + DESC 'Automount information' + EQUALITY caseExactMatch + SYNTAX 1.3.6.1.4.1.1466.115.121.1.15 SINGLE-VALUE ) -+ ++ +objectclass ( 1.3.6.1.1.1.2.16 NAME 'automountMap' SUP top STRUCTURAL + MUST ( automountMapName ) + MAY ( description ) ) -+ ++ +objectclass ( 1.3.6.1.1.1.2.17 NAME 'automount' SUP top STRUCTURAL + DESC 'Automount' + MUST ( automountKey $ automountInformation ) diff --git a/libs/polarssl/Makefile b/libs/polarssl/Makefile index 80d1f2c9bd..df132e03fe 100644 --- a/libs/polarssl/Makefile +++ b/libs/polarssl/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2011 OpenWrt.org +# +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,15 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=polarssl -PKG_VERSION:=1.0.0 +PKG_VERSION:=0.14.3 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-gpl.tgz PKG_SOURCE_URL:=http://polarssl.org/code/releases -PKG_MD5SUM:=9e0ef5090070ae95363f201851ca62f2 +PKG_MD5SUM:=f1b2fe9087ab64d7ea40a276a3628583 include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk define Package/polarssl/Default SUBMENU:=SSL @@ -56,25 +55,27 @@ endef PKG_INSTALL:=1 -CMAKE_OPTIONS += \ - -DCMAKE_BUILD_TYPE:String="Release" \ - -DUSE_SHARED_POLARSSL_LIBRARY:Bool=ON \ +define Build/Configure +endef + +TARGET_CFLAGS += $(FPIC) +MAKE_FLAGS += OFLAGS="$(TARGET_CFLAGS)" define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/polarssl $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/include/polarssl $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpolarssl.so* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/lib/libpolarssl.{a,so} $(1)/usr/lib/ endef define Package/libpolarssl/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpolarssl.so* $(1)/usr/lib/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/libpolarssl.so $(1)/usr/lib/ endef define Package/polarssl-progs/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/* $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/bin/polarssl_* $(1)/usr/bin/ endef $(eval $(call BuildPackage,libpolarssl)) diff --git a/libs/polarssl/patches/100-disable-testsuites.patch b/libs/polarssl/patches/100-disable-testsuites.patch deleted file mode 100644 index 7754ee6521..0000000000 --- a/libs/polarssl/patches/100-disable-testsuites.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -26,25 +26,3 @@ function(add_test_suite suite_name) - endfunction(add_test_suite) - - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-unused-function -Wno-unused-value") -- --add_test_suite(aes) --add_test_suite(arc4) --add_test_suite(base64) --add_test_suite(camellia) --add_test_suite(cipher cipher.aes) --add_test_suite(cipher cipher.camellia) --add_test_suite(cipher cipher.des) --add_test_suite(debug) --add_test_suite(des) --add_test_suite(dhm) --add_test_suite(error) --add_test_suite(hmac_shax) --add_test_suite(md) --add_test_suite(mdx) --add_test_suite(mpi) --add_test_suite(pkcs1_v21) --add_test_suite(shax) --add_test_suite(rsa) --add_test_suite(version) --add_test_suite(xtea) --add_test_suite(x509parse) diff --git a/libs/polarssl/patches/100-shared.patch b/libs/polarssl/patches/100-shared.patch new file mode 100644 index 0000000000..d74d8822a9 --- /dev/null +++ b/libs/polarssl/patches/100-shared.patch @@ -0,0 +1,11 @@ +--- a/library/Makefile ++++ b/library/Makefile +@@ -29,7 +29,7 @@ OBJS= aes.o arc4.o base64.o \ + + .SILENT: + +-all: static ++all: static shared + + static: libpolarssl.a + diff --git a/libs/polarssl/patches/110-make.patch b/libs/polarssl/patches/110-make.patch new file mode 100644 index 0000000000..2137e0a759 --- /dev/null +++ b/libs/polarssl/patches/110-make.patch @@ -0,0 +1,20 @@ +--- a/Makefile ++++ b/Makefile +@@ -7,7 +7,7 @@ PREFIX=polarssl_ + all: + cd library && $(MAKE) all && cd .. + cd programs && $(MAKE) all && cd .. +- cd tests && $(MAKE) all && cd .. ++ #cd tests && $(MAKE) all && cd .. + + install: + mkdir -p $(DESTDIR)/include/polarssl +@@ -28,7 +28,7 @@ install: + clean: + cd library && $(MAKE) clean && cd .. + cd programs && $(MAKE) clean && cd .. +- cd tests && $(MAKE) clean && cd .. ++ #cd tests && $(MAKE) clean && cd .. + + check: + ( cd tests && $(MAKE) check ) diff --git a/libs/postgresql/Makefile b/libs/postgresql/Makefile index 8f91b51780..2120155ad0 100644 --- a/libs/postgresql/Makefile +++ b/libs/postgresql/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=postgresql PKG_VERSION:=9.0.1 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=\ @@ -156,9 +156,6 @@ endef TARGET_CFLAGS += $(FPIC) -# because PROFILE means something else in the project Makefile -unexport PROFILE - define Build/Compile $(MAKE) $(PKG_JOBS) -C "$(PKG_BUILD_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ @@ -199,10 +196,6 @@ define Package/pgsql-server/install $(1)/usr/lib endef -define Package/pgsql-server/conffiles -/etc/config/postgresql -endef - define Package/pgsql-server/postinst #!/bin/sh grep -q '^postgres:' /etc/passwd && exit 0 diff --git a/libs/protobuf-c/Makefile b/libs/protobuf-c/Makefile deleted file mode 100644 index fd1e4f669c..0000000000 --- a/libs/protobuf-c/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=protobuf-c -PKG_VERSION:=0.15 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://protobuf-c.googlecode.com/files -PKG_MD5SUM:=73ff0c8df50d2eee75269ad8f8c07dc8 - -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/libprotobuf-c - TITLE:=Protocol Buffers library - SECTION:=libs - CATEGORY:=Libraries - URL:=http://code.google.com/p/protobuf-c/ -endef - -define Package/libprotobuf-c/description - Runtime library to use Google Protocol Buffers from C applications. - Protocol Buffers are a way of encoding structured data in an efficient yet - extensible format. Google uses Protocol Buffers for almost all of its - internal RPC protocols and file formats. -endef - -CONFIGURE_ARGS += \ - --enable-shared \ - --enable-static \ - --disable-protoc - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include/google/protobuf-c - $(CP) \ - $(PKG_INSTALL_DIR)/usr/include/google/protobuf-c/* \ - $(1)/usr/include/google/protobuf-c/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-c.{a,la,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/* $(1)/usr/lib/pkgconfig/ -endef - -define Package/libprotobuf-c/install - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libprotobuf-c.so.* $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,libprotobuf-c)) diff --git a/libs/re/Makefile b/libs/re/Makefile index e6f9ed4ce5..13c0f2713b 100644 --- a/libs/re/Makefile +++ b/libs/re/Makefile @@ -1,31 +1,33 @@ -# -# Copyright (C) 2010-2011 OpenWrt.org -# Copyright (C) 2010 Alfred E. Heggestad # -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# Makefile +# +# Copyright (C) 2010 Alfred E. Heggestad # include $(TOPDIR)/rules.mk PKG_NAME:=re -PKG_VERSION:=0.4.0 +PKG_VERSION:=0.2.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub -PKG_MD5SUM:=77469714212b40ec7f224ad8648f91d2 +PKG_MD5SUM:=0aa00762fbee7694b9e5844675f5c57d include $(INCLUDE_DIR)/package.mk define Package/libre SECTION:=libs CATEGORY:=Libraries - DEPENDS:=+libopenssl +libpthread + DEPENDS:=+libopenssl +libpthread @BROKEN TITLE:=Generic library for real-time communications with async IO support URL:=http://www.creytiv.com/ endef +define Package/libre/description + Generic library for real-time communications with async IO support. +endef + TARGET_CFLAGS += $(FPIC) define Build/Compile @@ -35,11 +37,9 @@ define Build/Compile EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ EXTRA_LFLAGS="-lm" \ DESTDIR="$(PKG_INSTALL_DIR)" \ - SYSROOT="$$$$(echo '#include ' | $(TARGET_CROSS)cpp -x c | sed -ne 's,^# [0-9]* \"\(.*\)/include/pthread\.h\".*,\1,p' | head -n1)" \ + SYSROOT="$(TOOLCHAIN_DIR)" \ SYSROOT_ALT="$(STAGING_DIR)/usr" \ RELEASE=1 \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - OS=linux \ all install endef @@ -49,12 +49,19 @@ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include $(CP) $(PKG_INSTALL_DIR)/usr/include/re $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.{a,so*} $(1)/usr/lib/ +endef + +define Build/UninstallDev + rm -rf \ + $(STAGING_DIR)/usr/share/re \ + $(STAGING_DIR)/usr/include/re \ + $(STAGING_DIR)/usr/lib/libre.{a,so*} endef define Package/libre/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libre.so* $(1)/usr/lib/ endef $(eval $(call BuildPackage,libre)) diff --git a/libs/rem/Makefile b/libs/rem/Makefile deleted file mode 100644 index fc2d9c0a53..0000000000 --- a/libs/rem/Makefile +++ /dev/null @@ -1,61 +0,0 @@ -# -# Copyright (C) 2010-2011 OpenWrt.org -# Copyright (C) 2010 Alfred E. Heggestad -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=rem -PKG_VERSION:=0.4.0 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.creytiv.com/pub -PKG_MD5SUM:=0d5cf133a62d11a2f80875a8fa7adab6 - -include $(INCLUDE_DIR)/package.mk - -define Package/librem - SECTION:=libs - CATEGORY:=Libraries - DEPENDS:=+libre +libpthread - TITLE:=Audio and video processing media library - URL:=http://www.creytiv.com/ -endef - -TARGET_CFLAGS += $(FPIC) - -define Build/Compile - $(MAKE) -C $(PKG_BUILD_DIR) \ - LIBRE_MK=$(STAGING_DIR)/usr/share/re/re.mk \ - LIBRE_INC=$(STAGING_DIR)/usr/include/re \ - LIBRE_SO=$(STAGING_DIR)/usr/lib \ - CC="$(TARGET_CC)" \ - EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ - EXTRA_LFLAGS="-lm" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - SYSROOT="$(TOOLCHAIN_DIR)" \ - SYSROOT_ALT="$(STAGING_DIR)/usr" \ - RELEASE=1 \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - OS=linux \ - all install -endef - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/rem $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/librem.{a,so} $(1)/usr/lib/ -endef - -define Package/librem/install - ln -sf $(PKG_NAME)-$(PKG_VERSION) $(BUILD_DIR)/$(PKG_NAME) - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/librem.so $(1)/usr/lib/ -endef - -$(eval $(call BuildPackage,librem)) diff --git a/libs/rrdtool-1.0.x/Makefile b/libs/rrdtool-1.0.x/Makefile index 22a1fe6111..4e0eebc5c8 100644 --- a/libs/rrdtool-1.0.x/Makefile +++ b/libs/rrdtool-1.0.x/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=rrdtool1 PKG_VERSION:=1.0.50 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_BUILD_DIR:=$(BUILD_DIR)/rrdtool-$(PKG_VERSION) PKG_SOURCE:=rrdtool-$(PKG_VERSION).tar.gz diff --git a/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch b/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch deleted file mode 100644 index 5b8a66276b..0000000000 --- a/libs/rrdtool-1.0.x/patches/020-x86-float-cast.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: rrdtool-1.0.50/src/rrd_format.h -=================================================================== ---- rrdtool-1.0.50.orig/src/rrd_format.h -+++ rrdtool-1.0.50/src/rrd_format.h -@@ -20,7 +20,7 @@ - - #define RRD_COOKIE "RRD" - #define RRD_VERSION "0001" --#define FLOAT_COOKIE 8.642135E130 -+#define FLOAT_COOKIE ((double)8.642135E130) - - #if defined(WIN32) - #define DNAN ((double)fmod(0.0,0.0)) diff --git a/libs/sctp/Makefile b/libs/sctp/Makefile index 553db9ec12..7495b6e1f3 100644 --- a/libs/sctp/Makefile +++ b/libs/sctp/Makefile @@ -15,6 +15,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/lksctp/ PKG_MD5SUM:=e9cf6c57402c9d4f1173a9529466e16d +PKG_BUILD_DEPENDS:=binutils PKG_FIXUP:=libtool PKG_INSTALL:=1 diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile index f9a6b4480d..4d9833e38d 100644 --- a/libs/serdisplib/Makefile +++ b/libs/serdisplib/Makefile @@ -21,6 +21,7 @@ define Package/serdisplib SECTION:=libs CATEGORY:=Libraries TITLE:=A display control library + DEPENDS:=@!LINUX_2_4 URL:=http://serdisplib.sourceforge.net/ endef diff --git a/libs/spandsp/Makefile b/libs/spandsp/Makefile index e2054a07bc..1b6ea5985d 100644 --- a/libs/spandsp/Makefile +++ b/libs/spandsp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2012 OpenWrt.org +# Copyright (C) 2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -11,7 +11,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spandsp PKG_VERSION:=0.0.6 PKG_VERSION_SUFFIX:=pre17 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)$(PKG_VERSION_SUFFIX).tgz PKG_SOURCE_URL:=http://www.soft-switch.org/downloads/spandsp/ @@ -19,7 +19,6 @@ PKG_MD5SUM:=cc860f77270cf3b881f8ccd42d2d0238 PKG_INSTALL:=1 PKG_BUILD_PARALLEL:=1 -PKG_FIXUP:=autoreconf include $(INCLUDE_DIR)/package.mk @@ -30,6 +29,8 @@ define Package/libspandsp DEPENDS:=+libtiff endef +CONFIGURE_ARGS+= LIBS="-Wl,-rpath-link=$(STAGING_DIR)/usr/lib" + TARGET_CFLAGS += $(FPIC) define Build/InstallDev diff --git a/libs/spandsp/patches/100-compile-fixes.patch b/libs/spandsp/patches/100-compile-fixes.patch index afe9e33b85..367dc95b56 100644 --- a/libs/spandsp/patches/100-compile-fixes.patch +++ b/libs/spandsp/patches/100-compile-fixes.patch @@ -1,6 +1,8 @@ ---- a/src/spandsp/fast_convert.h -+++ b/src/spandsp/fast_convert.h -@@ -197,7 +197,7 @@ extern "C" +Index: spandsp-0.0.6/src/spandsp/fast_convert.h +=================================================================== +--- spandsp-0.0.6.orig/src/spandsp/fast_convert.h 2010-10-24 12:20:25.000000000 +0200 ++++ spandsp-0.0.6/src/spandsp/fast_convert.h 2010-10-24 12:21:39.000000000 +0200 +@@ -197,7 +197,7 @@ { return (long int) (x); } @@ -9,15 +11,3 @@ static __inline__ long int lfastrint(register double x) { int res[2]; ---- a/configure.ac -+++ b/configure.ac -@@ -152,9 +152,7 @@ AC_ARG_ENABLE(builtin_tiff, - - AC_FUNC_ERROR_AT_LINE - AC_FUNC_VPRINTF --AC_FUNC_MALLOC - AC_FUNC_MEMCMP --AC_FUNC_REALLOC - AC_FUNC_SELECT_ARGTYPES - - AX_C99_FUNC_LRINT diff --git a/libs/sqlite3/Makefile b/libs/sqlite3/Makefile index 481951bc64..a2101db4ed 100644 --- a/libs/sqlite3/Makefile +++ b/libs/sqlite3/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2012 OpenWrt.org +# Copyright (C) 2006-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=sqlite -PKG_VERSION:=3070900 +PKG_VERSION:=3070701 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-autoconf-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.sqlite.org -PKG_MD5SUM:=dce303524736fe89a76b8ed29d566352 +PKG_MD5SUM:=554026fe7fac47b1cf61c18d5fe43419 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-autoconf-$(PKG_VERSION) PKG_BUILD_DEPENDS:=libncurses libreadline @@ -64,8 +64,7 @@ $(call Package/sqlite3/Default/description) formats. endef -TARGET_CFLAGS += $(FPIC) \ - -DSQLITE_ENABLE_UNLOCK_NOTIFY \ +TARGET_CFLAGS += $(FPIC) CONFIGURE_ARGS += \ --enable-shared \ @@ -81,7 +80,7 @@ CONFIGURE_VARS += \ define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3{,ext}.h $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/sqlite3.h $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib $(CP) $(PKG_INSTALL_DIR)/usr/lib/libsqlite3.{a,so*} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig diff --git a/libs/sysfsutils/Makefile b/libs/sysfsutils/Makefile index 4dc7dc1176..cfad23c0b2 100644 --- a/libs/sysfsutils/Makefile +++ b/libs/sysfsutils/Makefile @@ -25,6 +25,7 @@ define Package/libsysfs SECTION:=libs CATEGORY:=Libraries SUBMENU:=Filesystem + DEPENDS:=@!LINUX_2_4 TITLE:=Sysfs library URL:=http://linux-diag.sourceforge.net/Sysfsutils.html endef @@ -33,7 +34,7 @@ define Package/sysfsutils SECTION:=utils CATEGORY:=Utilities SUBMENU:=Filesystem - DEPENDS:=+libsysfs + DEPENDS:=@!LINUX_2_4 +libsysfs TITLE:=System Utilities Based on Sysfs URL:=http://linux-diag.sourceforge.net/Sysfsutils.html endef diff --git a/libs/tokyocabinet/patches/200-uclibc_0.9.30_compat.patch b/libs/tokyocabinet/patches/200-uclibc_0.9.30_compat.patch deleted file mode 100644 index bf6a4346cf..0000000000 --- a/libs/tokyocabinet/patches/200-uclibc_0.9.30_compat.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- a/tctdb.c -+++ b/tctdb.c -@@ -20,6 +20,26 @@ - #include "tctdb.h" - #include "myconf.h" - -+#ifdef __UCLIBC__ -+# include -+# if __UCLIBC_MINOR__ <= 9 && __UCLIBC_SUBLEVEL__ <= 30 -+ -+size_t strlen(const char *s); -+long double strtold(const char *nptr, char **endptr); -+static inline long double nanl(const char *tagp) -+{ -+ if (tagp[0] != '\0') { -+ char buf[6 + strlen(tagp)]; -+ sprintf(buf, "NAN(%s)", tagp); -+ return strtold(buf, NULL); -+ } -+ return NAN; -+} -+ -+# endif /* __UCLIBC_MINOR__ <= 9 && __UCLIBC_SUBLEVEL__ <= 30 */ -+#endif /* __UCLIBC__ */ -+ -+ - #define TDBOPAQUESIZ 64 // size of using opaque field - #define TDBLEFTOPQSIZ 64 // size of left opaque field - #define TDBPAGEBUFSIZ 32768 // size of a buffer to read each page diff --git a/libs/vips/Makefile b/libs/vips/Makefile index 2fa68d48e4..ec30c009ac 100644 --- a/libs/vips/Makefile +++ b/libs/vips/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2011 OpenWrt.org +# Copyright (C) 2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=vips -PKG_VERSION:=7.26.3 -PKG_RELEASE:=2 +PKG_VERSION:=7.24.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.26/ -PKG_MD5SUM:=1fbf164ef0da8e835a036c56ff659e8e +PKG_SOURCE_URL:=http://www.vips.ecs.soton.ac.uk/supported/7.24/ +PKG_MD5SUM:=7e9d34960c3453f3b8d1d4300fe4b7a0 PKG_FIXUP = libtool include $(INCLUDE_DIR)/package.mk @@ -21,13 +21,20 @@ include $(INCLUDE_DIR)/nls.mk PKG_INSTALL=1 +define Package/vips/Default + TITLE:=vips + URL:=http://www.vips.ecs.soton.ac.uk/ +endef + define Package/vips $(call Package/vips/Default) SECTION:=multimedia CATEGORY:=Multimedia - TITLE:=An image manipulation library - URL:=http://www.vips.ecs.soton.ac.uk/ - DEPENDS:=+glib2 +libexif +libjpeg +libpng +libxml2 $(INTL_DEPENDS) + DEPENDS:=+libjpeg +glib2 +libxml2 +imagemagick +libfreetype $(INTL_DEPENDS) +endef + +define Package/vips/description + An image manipulation library. endef TARGET_LDFLAGS+= \ @@ -36,22 +43,7 @@ TARGET_LDFLAGS+= \ CONFIGURE_ARGS += \ --disable-cxx \ --disable-threads \ - --without-cfitsio \ - --without-fftw3 \ - --without-lcms \ - --without-magick \ - --without-matio \ - --without-OpenEXR \ - --without-orc \ - --without-pangoft2 \ - --without-python \ - --without-tiff \ - --without-v4l \ - --without-x \ - --without-zip \ - --with-jpeg \ - --with-libexif \ - --with-png \ + --without-liboil define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/vips diff --git a/libs/vips/patches/001-no_cpp.patch b/libs/vips/patches/001-no_cpp.patch index 9c4671fe2b..1511add85a 100644 --- a/libs/vips/patches/001-no_cpp.patch +++ b/libs/vips/patches/001-no_cpp.patch @@ -1,7 +1,7 @@ -diff -u --recursive vips-7.26.3-vanilla/configure.in vips-7.26.3/configure.in ---- vips-7.26.3-vanilla/configure.in 2011-10-07 20:43:26.474844552 -0500 -+++ vips-7.26.3/configure.in 2011-10-07 21:00:33.633107256 -0500 -@@ -142,7 +142,6 @@ +diff -u --recursive vips-7.24.1-vanilla/configure.in vips-7.24.1/configure.in +--- vips-7.24.1-vanilla/configure.in 2011-03-29 22:09:45.465282663 -0500 ++++ vips-7.24.1/configure.in 2011-03-29 22:18:40.786482911 -0500 +@@ -143,7 +143,6 @@ AC_PROG_AWK AC_PROG_CC AC_PROG_CC_STDC @@ -9,77 +9,23 @@ diff -u --recursive vips-7.26.3-vanilla/configure.in vips-7.26.3/configure.in AC_C_CONST AC_C_RESTRICT AC_PROG_RANLIB -@@ -150,45 +149,6 @@ - AC_PROG_LN_S - AM_WITH_DMALLOC - --# vips_PROG_CXX_WORKS --# Check whether the C++ compiler works. --AC_DEFUN([vips_PROG_CXX_WORKS], -- [AC_REQUIRE([AC_PROG_CXX])dnl -- AC_CACHE_CHECK([whether the C++ compiler works], -- [vips_cv_prog_cxx_works], -- [AC_LANG_PUSH([C++]) -- AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], -- [vips_cv_prog_cxx_works=yes], -- [vips_cv_prog_cxx_works=no]) -- AC_LANG_POP([C++])]) --]) -- --# option to build without C++ --# handy for some embedded applications --# also, including C++ source causes link problems on some --# platforms, so have an option to disable it --AC_ARG_ENABLE(cxx, -- AS_HELP_STRING([--enable-cxx], [build C++ components (default: test)])) -- --if test x"$enable_cxx" != x"no"; then -- vips_PROG_CXX_WORKS -- if test x"$vips_cv_prog_cxx_works" = x"yes"; then -- AC_DEFINE(ENABLE_CXX,1,[build C++ components]) -- AM_CONDITIONAL(ENABLE_CXX, true) -- # need -lstdc++ for (eg.) the C++ format loaders -- # this gets added to vips-7.xx.pc to help mingw and friends link programs -- # using libvips -- VIPS_CXX_LIBS="-lstdc++" -- enable_cxx=yes -- fi --fi -- --if test x"$enable_cxx" != x"yes"; then -- AM_CONDITIONAL(ENABLE_CXX, false) -- VIPS_CXX_LIBS="" -- enable_cxx=no --fi -- - # we need a fully expanded version of $libdir - # without this we get something like - # define VIPS_LIBDIR ${exec_prefix}/lib -@@ -614,7 +574,6 @@ - AC_SUBST(VIPS_CFLAGS) - AC_SUBST(VIPS_INCLUDES) - AC_SUBST(VIPS_LIBS) --AC_SUBST(VIPS_CXX_LIBS) - AC_SUBST(PACKAGES_USED) - - # you'd think we could have -@@ -622,7 +581,6 @@ +@@ -615,7 +614,6 @@ # in AC_OUTPUT, but that seems to break for some combinations of sh/m4 AC_OUTPUT([ - vips-7.26.pc -- vipsCC-7.26.pc + vips-7.24.pc +- vipsCC-7.24.pc Makefile libvips/include/vips/version.h libvips/include/Makefile -@@ -630,7 +588,6 @@ - libvips/Makefile +@@ -624,7 +622,6 @@ + libvips/acquire/Makefile libvips/arithmetic/Makefile libvips/boolean/Makefile - libvips/cimg/Makefile libvips/colour/Makefile libvips/conversion/Makefile libvips/convolution/Makefile -@@ -647,9 +604,6 @@ +@@ -641,9 +638,6 @@ libvips/relational/Makefile libvips/resample/Makefile libvips/video/Makefile @@ -87,19 +33,19 @@ diff -u --recursive vips-7.26.3-vanilla/configure.in vips-7.26.3/configure.in - libvipsCC/include/vips/Makefile - libvipsCC/Makefile tools/Makefile - tools/batch_crop - tools/batch_image_convert -@@ -657,7 +611,6 @@ - tools/light_correct - tools/shrink_width + tools/iofuncs/Makefile + tools/mosaicing/Makefile +@@ -655,7 +649,6 @@ + tools/scripts/light_correct + tools/scripts/shrink_width swig/Makefile - swig/vipsCC/Makefile swig/python/setup.py man/Makefile doc/Makefile -diff -u --recursive vips-7.26.3-vanilla/libvips/Makefile.am vips-7.26.3/libvips/Makefile.am ---- vips-7.26.3-vanilla/libvips/Makefile.am 2011-10-07 20:43:26.909839013 -0500 -+++ vips-7.26.3/libvips/Makefile.am 2011-10-07 20:45:25.074274823 -0500 +diff -u --recursive vips-7.24.1-vanilla/libvips/Makefile.am vips-7.24.1/libvips/Makefile.am +--- vips-7.24.1-vanilla/libvips/Makefile.am 2011-03-29 22:09:45.525280200 -0500 ++++ vips-7.24.1/libvips/Makefile.am 2011-03-29 22:16:08.223081415 -0500 @@ -1,14 +1,3 @@ -# only build in the cimg dir if C++ is enabled -if ENABLE_CXX @@ -114,8 +60,8 @@ diff -u --recursive vips-7.26.3-vanilla/libvips/Makefile.am vips-7.26.3/libvips/ - SUBDIRS = \ include \ - arithmetic \ -@@ -18,7 +7,6 @@ + acquire \ +@@ -19,7 +8,6 @@ conversion \ deprecated \ convolution \ @@ -123,22 +69,17 @@ diff -u --recursive vips-7.26.3-vanilla/libvips/Makefile.am vips-7.26.3/libvips/ format \ freq_filt \ histograms_lut \ -@@ -37,14 +25,6 @@ - # empty means default to C linking - libvips_la_SOURCES = +@@ -36,9 +24,6 @@ + lib_LTLIBRARIES = libvips.la --# if we have C++ components enabled, make sure we link the top-level with c++ --# --# sadly the if/enndif isn't enough to stop automake detecting a c++ link even --# when c++ is disabled ... comment out this line if you have linking problems + libvips_la_SOURCES = dummy.c -if ENABLE_CXX --nodist_EXTRA_libvips_la_SOURCES = cimg/dummy2.cxx +-libvips_la_SOURCES += dummy2.cc -endif -- + # DLLs need dependant libs there too ... put @VIPS_LIBS@ at the end libvips_la_LIBADD = \ - resample/libresample.la \ -@@ -54,7 +34,6 @@ +@@ -50,7 +35,6 @@ conversion/libconversion.la \ convolution/libconvolution.la \ deprecated/libdeprecated.la \ @@ -146,7 +87,7 @@ diff -u --recursive vips-7.26.3-vanilla/libvips/Makefile.am vips-7.26.3/libvips/ format/libformat.la \ freq_filt/libfreq_filt.la \ histograms_lut/libhistograms_lut.la \ -@@ -68,13 +47,6 @@ +@@ -64,13 +48,6 @@ video/libvideo.la \ @VIPS_LIBS@ @@ -160,10 +101,10 @@ diff -u --recursive vips-7.26.3-vanilla/libvips/Makefile.am vips-7.26.3/libvips/ - -EXTRA_DIST = \ - $(C_DIST_DIR) -diff -u --recursive vips-7.26.3-vanilla/libvips/resample/Makefile.am vips-7.26.3/libvips/resample/Makefile.am ---- vips-7.26.3-vanilla/libvips/resample/Makefile.am 2011-10-07 20:43:27.173835707 -0500 -+++ vips-7.26.3/libvips/resample/Makefile.am 2011-10-07 20:45:49.360933471 -0500 -@@ -2,22 +2,6 @@ +diff -u --recursive vips-7.24.1-vanilla/libvips/resample/Makefile.am vips-7.24.1/libvips/resample/Makefile.am +--- vips-7.24.1-vanilla/libvips/resample/Makefile.am 2011-03-29 22:09:45.546279339 -0500 ++++ vips-7.24.1/libvips/resample/Makefile.am 2011-03-29 22:16:28.918185323 -0500 +@@ -2,23 +2,6 @@ # you'd think we could just define a couple of variables, but that seems to # confuse libtool and make it link the library with g++ # instead, have two completely different paths @@ -173,6 +114,7 @@ diff -u --recursive vips-7.26.3-vanilla/libvips/resample/Makefile.am vips-7.26.3 - im_affine.c \ - interpolate.c \ - im_shrink.c \ +- im_stretch3.c \ - im_rightshift_size.c \ - transform.c \ - resample_dispatch.c \ @@ -186,7 +128,7 @@ diff -u --recursive vips-7.26.3-vanilla/libvips/resample/Makefile.am vips-7.26.3 libresample_la_SOURCES = \ im_affine.c \ -@@ -27,15 +11,6 @@ +@@ -29,15 +12,6 @@ transform.c \ resample_dispatch.c @@ -202,180 +144,3 @@ diff -u --recursive vips-7.26.3-vanilla/libvips/resample/Makefile.am vips-7.26.3 noinst_LTLIBRARIES = libresample.la INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ -diff -u --recursive vips-7.26.3-vanilla/Makefile.am vips-7.26.3/Makefile.am ---- vips-7.26.3-vanilla/Makefile.am 2011-10-07 20:43:26.476844503 -0500 -+++ vips-7.26.3/Makefile.am 2011-10-07 22:31:54.034586656 -0500 -@@ -1,43 +1,17 @@ -- --# turn off libvipsCC if C++ is disabled --if ENABLE_CXX --C_COMPILE_DIR = libvipsCC --C_DIST_DIR = --C_PKGCONFIG = vipsCC-7.${VIPS_MINOR_VERSION}.pc -- --# turn on Python if we can (requires C++) --if HAVE_PYTHON --P_COMPILE_DIR = swig --P_DIST_DIR = --endif -- --else --C_COMPILE_DIR = --C_DIST_DIR = libvipsCC --C_PKGCONFIG = --P_COMPILE_DIR = --P_DIST_DIR = swig --endif -- - SUBDIRS = \ - libvips \ - tools \ - po \ - man \ -- doc \ -- $(C_COMPILE_DIR) \ -- $(P_COMPILE_DIR) -+ doc - - EXTRA_DIST = \ - m4 \ - benchmark \ - bootstrap.sh \ - vips-7.${VIPS_MINOR_VERSION}.pc.in \ -- vipsCC-7.${VIPS_MINOR_VERSION}.pc.in \ - acinclude.m4 \ -- depcomp \ -- $(C_DIST_DIR) \ -- $(P_DIST_DIR) -+ depcomp - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = vips-7.${VIPS_MINOR_VERSION}.pc $(C_PKGCONFIG) -diff -u --recursive vips-7.26.3-vanilla/Makefile.in vips-7.26.3/Makefile.in ---- vips-7.26.3-vanilla/Makefile.in 2011-10-07 20:43:26.766840803 -0500 -+++ vips-7.26.3/Makefile.in 2011-10-07 22:30:18.980820947 -0500 -@@ -37,7 +37,6 @@ - subdir = . - DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \ - $(srcdir)/Makefile.in $(srcdir)/config.h.in \ -- $(srcdir)/vips-7.26.pc.in $(srcdir)/vipsCC-7.26.pc.in \ - $(top_srcdir)/configure $(top_srcdir)/swig/python/setup.py.in \ - AUTHORS COPYING ChangeLog INSTALL NEWS THANKS TODO \ - config.guess config.sub depcomp install-sh ltmain.sh missing \ -@@ -51,7 +50,7 @@ - configure.lineno config.status.lineno - mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs - CONFIG_HEADER = config.h --CONFIG_CLEAN_FILES = vips-7.26.pc vipsCC-7.26.pc swig/python/setup.py -+CONFIG_CLEAN_FILES = vips-7.26.pc swig/python/setup.py - CONFIG_CLEAN_VPATH_FILES = - SOURCES = - DIST_SOURCES = -@@ -92,7 +91,7 @@ - distdir dist dist-all distcheck - ETAGS = etags - CTAGS = ctags --DIST_SUBDIRS = libvips tools po man doc libvipsCC swig -+DIST_SUBDIRS = libvips tools po man doc swig - DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) - distdir = $(PACKAGE)-$(VERSION) - top_distdir = $(distdir) -@@ -146,10 +145,6 @@ - CFLAGS = @CFLAGS@ - CPP = @CPP@ - CPPFLAGS = @CPPFLAGS@ --CXX = @CXX@ --CXXCPP = @CXXCPP@ --CXXDEPMODE = @CXXDEPMODE@ --CXXFLAGS = @CXXFLAGS@ - CYGPATH_W = @CYGPATH_W@ - DATADIRNAME = @DATADIRNAME@ - DEFS = @DEFS@ -@@ -262,7 +257,6 @@ - USE_NLS = @USE_NLS@ - VERSION = @VERSION@ - VIPS_CFLAGS = @VIPS_CFLAGS@ --VIPS_CXX_LIBS = @VIPS_CXX_LIBS@ - VIPS_EXEEXT = @VIPS_EXEEXT@ - VIPS_INCLUDES = @VIPS_INCLUDES@ - VIPS_LIBDIR = @VIPS_LIBDIR@ -@@ -285,7 +279,6 @@ - abs_top_builddir = @abs_top_builddir@ - abs_top_srcdir = @abs_top_srcdir@ - ac_ct_CC = @ac_ct_CC@ --ac_ct_CXX = @ac_ct_CXX@ - ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ - am__include = @am__include@ - am__leading_dot = @am__leading_dot@ -@@ -337,39 +330,21 @@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --@ENABLE_CXX_FALSE@C_COMPILE_DIR = - --# turn off libvipsCC if C++ is disabled --@ENABLE_CXX_TRUE@C_COMPILE_DIR = libvipsCC --@ENABLE_CXX_FALSE@C_DIST_DIR = libvipsCC --@ENABLE_CXX_TRUE@C_DIST_DIR = --@ENABLE_CXX_FALSE@C_PKGCONFIG = --@ENABLE_CXX_TRUE@C_PKGCONFIG = vipsCC-7.${VIPS_MINOR_VERSION}.pc --@ENABLE_CXX_FALSE@P_COMPILE_DIR = -- --# turn on Python if we can (requires C++) --@ENABLE_CXX_TRUE@@HAVE_PYTHON_TRUE@P_COMPILE_DIR = swig --@ENABLE_CXX_FALSE@P_DIST_DIR = swig --@ENABLE_CXX_TRUE@@HAVE_PYTHON_TRUE@P_DIST_DIR = - SUBDIRS = \ - libvips \ - tools \ - po \ - man \ - doc \ -- $(C_COMPILE_DIR) \ -- $(P_COMPILE_DIR) - - EXTRA_DIST = \ - m4 \ - benchmark \ - bootstrap.sh \ - vips-7.${VIPS_MINOR_VERSION}.pc.in \ -- vipsCC-7.${VIPS_MINOR_VERSION}.pc.in \ - acinclude.m4 \ - depcomp \ -- $(C_DIST_DIR) \ -- $(P_DIST_DIR) - - pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = vips-7.${VIPS_MINOR_VERSION}.pc $(C_PKGCONFIG) -@@ -431,8 +406,6 @@ - -rm -f config.h stamp-h1 - vips-7.26.pc: $(top_builddir)/config.status $(srcdir)/vips-7.26.pc.in - cd $(top_builddir) && $(SHELL) ./config.status $@ --vipsCC-7.26.pc: $(top_builddir)/config.status $(srcdir)/vipsCC-7.26.pc.in -- cd $(top_builddir) && $(SHELL) ./config.status $@ - swig/python/setup.py: $(top_builddir)/config.status $(top_srcdir)/swig/python/setup.py.in - cd $(top_builddir) && $(SHELL) ./config.status $@ - -diff -u --recursive vips-7.26.3-vanilla/tools/Makefile.am vips-7.26.3/tools/Makefile.am ---- vips-7.26.3-vanilla/tools/Makefile.am 2011-10-07 20:43:26.495844193 -0500 -+++ vips-7.26.3/tools/Makefile.am 2011-10-07 22:34:56.215304397 -0500 -@@ -16,9 +16,6 @@ - INCLUDES = -I${top_srcdir}/libvips/include @VIPS_CFLAGS@ @VIPS_INCLUDES@ - AM_LDFLAGS = @LDFLAGS@ - LDADD = @VIPS_CFLAGS@ ${top_builddir}/libvips/libvips.la @VIPS_LIBS@ --if ENABLE_CXX --LDADD += @VIPS_CXX_LIBS@ --endif - - bin_SCRIPTS = \ - light_correct \ -diff -u --recursive vips-7.26.3-vanilla/vips-7.26.pc.in vips-7.26.3/vips-7.26.pc.in ---- vips-7.26.3-vanilla/vips-7.26.pc.in 2011-10-07 20:43:26.769840766 -0500 -+++ vips-7.26.3/vips-7.26.pc.in 2011-10-07 22:25:21.633810254 -0500 -@@ -7,5 +7,5 @@ - Description: Image processing library - Version: @VERSION@ - Requires: @PACKAGES_USED@ --Libs: -L${libdir} -lvips @VIPS_LIBS@ @VIPS_CXX_LIBS@ -+Libs: -L${libdir} -lvips @VIPS_LIBS@ - Cflags: -I${includedir} diff --git a/libs/wt/Makefile b/libs/wt/Makefile deleted file mode 100644 index b9b494151c..0000000000 --- a/libs/wt/Makefile +++ /dev/null @@ -1,164 +0,0 @@ -# -# Copyright (C) 2007-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=wt -PKG_VERSION:=3.1.9 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://downloads.sourceforge.net/project/witty/wt/$(PKG_VERSION) -PKG_MD5SUM:=ee9490d5f24a47766e54f630ba0da2bb - -include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/cmake.mk - -PKG_INSTALL:=1 - -define Package/wt/Default - SECTION:=libs - CATEGORY:=Libraries - URL:=http://www.webtoolkit.eu/wt -endef - -define Package/wt - $(call Package/wt/Default) - MENU:=1 - DEPENDS:= +libstdcpp +boost-date_time +boost-system +boost-filesystem +boost-thread +boost-program_options +boost-signals +boost-regex +libpthread - TITLE:=C++ Web Toolkit -endef - -define Package/wt-resources - $(call Package/wt/Default) - DEPENDS:=wt - TITLE:=Optional Resource Files -endef - -define Package/wt-fcgi - $(call Package/wt/Default) - DEPENDS:=wt +fcgixx - TITLE:=FastCGI Connector -endef - -define Package/wt-http - $(call Package/wt/Default) - DEPENDS:=wt +PACKAGE_wt_http_zlib:zlib +PACKAGE_wt_http_ssl:libopenssl - TITLE:=Built in HTTP Server -endef - -define Package/wt-http/config -config PACKAGE_wt_http_zlib - bool "Enable zlib compression option" - depends on PACKAGE_wt-http - default n -config PACKAGE_wt_http_ssl - bool "Enable ssl option" - depends on PACKAGE_wt-http - default n -endef - -define Package/wt-dbo - $(call Package/wt/Default) - DEPENDS:=wt - TITLE:=Object Relational Mapping -endef - -define Package/wt-dbosqlite3 - $(call Package/wt/Default) - DEPENDS:=wt +wt-dbo - TITLE:=Sqlite3 Dbo Backend -endef - -define Package/wt-resources/conffiles -/usr/share/Wt -endef - -# TODO: some parts of the code show that -DHAVE_GNU_REGEX can be defined to avoid dependence or boost-regex -# But that's turning out not to be the case (some portions still depend on boost-regex) -TARGET_CFLAGS += $(FPIC) -CMAKE_OPTIONS += \ - -DCMAKE_BUILD_TYPE=MinSizeRel \ - -DCMAKE_CXX_FLAGS_MINSIZEREL:STRING="-DNDEBUG -DWT_NO_SPIRIT -DWT_NO_XSS_FILTER" \ - -DSHARED_LIBS:BOOL=ON \ - -DBUILD_TESTS=OFF \ - -DBUILD_EXAMPLES=OFF \ - -DINSTALL_RESOURCES=ON \ - -DENABLE_GM=OFF \ - -DENABLE_HARU=OFF \ - -DENABLE_PANGO=OFF \ - -DENABLE_EXT=OFF \ - -DENABLE_POSTGRES=OFF \ - -DENABLE_QT4=OFF \ - -DWT_NO_STD_LOCALE=ON \ - -DWT_NO_STD_WSTRING=ON - -ifndef CONFIG_PACKAGE_wt-http -CMAKE_OPTIONS += \ - -DCONNECTOR_HTTP=OFF -endif - -ifndef CONFIG_PACKAGE_wt_http_zlib -CMAKE_OPTIONS += \ - -DHTTP_WITH_ZLIB=OFF -endif - -ifndef CONFIG_PACKAGE_wt_http_ssl -CMAKE_OPTIONS += \ - -DHTTP_WITH_SSL=OFF -endif - -ifndef CONFIG_PACKAGE_wt-fcgi -CMAKE_OPTIONS += \ - -DCONNECTOR_FCGI=OFF -endif - -define Build/InstallDev - $(INSTALL_DIR) $(1)/usr/include - $(CP) -a $(PKG_INSTALL_DIR)/usr/include/Wt $(1)/usr/include - - $(INSTALL_DIR) $(1)/usr/share/cmake-2.4/Modules - $(CP) $(PKG_INSTALL_DIR)/usr/share/cmake-2.4/Modules/FindWt.cmake $(1)/usr/share/cmake-2.4/Modules - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwt*.so* $(1)/usr/lib -endef - -define BuildPlugin - define Package/$(1)/install - $(INSTALL_DIR) $$(1)/usr/lib - for m in $(2); do \ - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwt$$$$$$$${m}.so* $$(1)/usr/lib/ ; \ - done - endef - - $$(eval $$(call BuildPackage,$(1))) -endef - -define Package/wt/install - $(INSTALL_DIR) $(1)/etc/wt - $(INSTALL_DATA) $(PKG_BUILD_DIR)/wt_config.xml $(1)/etc/wt - - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/libwt.so* $(1)/usr/lib -endef - -define Package/wt/conffiles -/etc/wt -endef - -define Package/wt-resources/install - $(INSTALL_DIR) $(1)/usr/share - $(CP) -a $(PKG_INSTALL_DIR)/usr/share/Wt $(1)/usr/share -endef - -$(eval $(call BuildPackage,wt)) -$(eval $(call BuildPackage,wt-resources)) -$(eval $(call BuildPlugin,wt-http,http)) -$(eval $(call BuildPlugin,wt-fcgi,fcgi)) -$(eval $(call BuildPlugin,wt-dbo,dbo)) -$(eval $(call BuildPlugin,wt-dbosqlite3,dbosqlite3)) diff --git a/libs/xmlrpc-c/Makefile b/libs/xmlrpc-c/Makefile index 33d2e7ad4c..fbff4a89b1 100644 --- a/libs/xmlrpc-c/Makefile +++ b/libs/xmlrpc-c/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2012 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xmlrpc-c -PKG_REV:=2233 +PKG_REV:=2080 PKG_VERSION:=advanced_r$(PKG_REV) PKG_RELEASE:=1 @@ -26,60 +26,70 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI include $(INCLUDE_DIR)/package.mk -define Package/xmlrpc-c/Default +define Package/xmlrpc-c-common SECTION:=libs CATEGORY:=Libraries - TITLE:=XML-RPC library + TITLE:=XML-RPC library - common URL:=http://xmlrpc-c.sourceforge.net/ endef -define Package/xmlrpc-c-common - $(call Package/xmlrpc-c/Default) - TITLE+= - common -endef - define Package/xmlrpc-c-internal - $(call Package/xmlrpc-c/Default) - TITLE+= - (uses internal expat variant) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=XML-RPC library - (ueses internal expat variant) + URL:=http://xmlrpc-c.sourceforge.net/ DEPENDS:=+xmlrpc-c-common # PROVIDES:=xmlrpc-c VARIANT:=internal endef define Package/xmlrpc-c - $(call Package/xmlrpc-c/Default) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=XML-RPC library + URL:=http://xmlrpc-c.sourceforge.net/ DEPENDS:=+xmlrpc-c-internal endef define Package/xmlrpc-c-libxml2 - $(call Package/xmlrpc-c/Default) - TITLE+= - (uses libxml2) + SECTION:=libs + CATEGORY:=Libraries + TITLE:=XML-RPC library - (uses libxml2) + URL:=http://xmlrpc-c.sourceforge.net/ DEPENDS:=+xmlrpc-c-common +libxml2 @BROKEN # PROVIDES:=xmlrpc-c VARIANT:=libxml2 endef define Package/xmlrpc-c-client - $(call Package/xmlrpc-c/Default) - TITLE+= - client + SECTION:=libs + CATEGORY:=Libraries + TITLE:=XML-RPC library - client + URL:=http://xmlrpc-c.sourceforge.net/ DEPENDS:=+xmlrpc-c +libcurl endef define Package/xmlrpc-c-server - $(call Package/xmlrpc-c/Default) - TITLE+= - server + SECTION:=libs + CATEGORY:=Libraries + TITLE:=XML-RPC library - server + URL:=http://xmlrpc-c.sourceforge.net/ DEPENDS:=+xmlrpc-c endef define Package/xmlrpc-c-abyss - $(call Package/xmlrpc-c/Default) - TITLE+= - abyss + SECTION:=libs + CATEGORY:=Libraries + TITLE:=XML-RPC library - abyss + URL:=http://xmlrpc-c.sourceforge.net/ DEPENDS:=+xmlrpc-c-common endef define Package/xmlrpc-c-server-abyss - $(call Package/xmlrpc-c/Default) - TITLE+= - abyss server + SECTION:=libs + CATEGORY:=Libraries + TITLE:=XML-RPC library - abyss server + URL:=http://xmlrpc-c.sourceforge.net/ DEPENDS:=+xmlrpc-c-server +xmlrpc-c-abyss endef @@ -101,6 +111,7 @@ CONFIGURE_ARGS+= \ --disable-libwww-client \ --enable-abyss-server \ --disable-cplusplus \ + --disable-static \ --disable-abyss-threads \ --disable-cgi-server @@ -125,18 +136,23 @@ define Build/InstallDev $(1)/usr/lib \ $(1)/usr/bin \ $(2)/bin + $(CP) \ $(PKG_INSTALL_DIR)/usr/include/* \ $(1)/usr/include/ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc*.{a,so*} \ $(1)/usr/lib/ + $(INSTALL_BIN) \ $(PKG_INSTALL_DIR)/usr/bin/xmlrpc-c-config \ $(2)/bin/ + $(SED) \ 's,HEADERINST_DIR="/usr/include",HEADERINST_DIR="$(STAGING_DIR)/usr/include",g' \ $(2)/bin/xmlrpc-c-config + $(SED) \ 's,LIBINST_DIR="/usr/lib",LIBINST_DIR="$(STAGING_DIR)/usr/lib",g' \ $(2)/bin/xmlrpc-c-config @@ -145,6 +161,7 @@ endef define Package/xmlrpc-c-libxml2/install $(INSTALL_DIR) \ $(1)/usr/lib + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \ $(1)/usr/lib/ @@ -153,12 +170,15 @@ endef define Package/xmlrpc-c-internal/install $(INSTALL_DIR) \ $(1)/usr/lib + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc.so* \ $(1)/usr/lib/ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmltok.so* \ $(1)/usr/lib/ + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_xmlparse.so* \ $(1)/usr/lib/ @@ -167,6 +187,7 @@ endef define Package/xmlrpc-c-server/install $(INSTALL_DIR) \ $(1)/usr/lib + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server.so* \ $(1)/usr/lib/ @@ -175,6 +196,7 @@ endef define Package/xmlrpc-c-abyss/install $(INSTALL_DIR) \ $(1)/usr/lib + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_abyss.so* \ $(1)/usr/lib/ @@ -183,6 +205,7 @@ endef define Package/xmlrpc-c-server-abyss/install $(INSTALL_DIR) \ $(1)/usr/lib + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_server_abyss.so* \ $(1)/usr/lib/ @@ -191,6 +214,7 @@ endef define Package/xmlrpc-c-client/install $(INSTALL_DIR) \ $(1)/usr/lib + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_client* \ $(1)/usr/lib/ @@ -199,6 +223,7 @@ endef define Package/xmlrpc-c-common/install $(INSTALL_DIR) \ $(1)/usr/lib + $(CP) \ $(PKG_INSTALL_DIR)/usr/lib/libxmlrpc_util.so* \ $(1)/usr/lib/ @@ -208,6 +233,7 @@ define Package/xmlrpc-c/install true endef + $(eval $(call BuildPackage,xmlrpc-c)) $(eval $(call BuildPackage,xmlrpc-c-common)) $(eval $(call BuildPackage,xmlrpc-c-libxml2)) diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 850a72e087..614cc18e41 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dovecot PKG_VERSION:=1.2.13 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.dovecot.org/releases/1.2 @@ -74,4 +74,41 @@ define Package/dovecot/conffiles /etc/dovecot.conf endef +define Package/dovecot/postinst +#!/bin/sh + +id=59 +name=dovecot +home=/var/run/dovecot +shell=/bin/false + +# do not change below +# check if we are on real system +if [ -z "$${IPKG_INSTROOT}" ]; then + # create copies of passwd and group, if we use squashfs + rootfs=`mount |awk '/root/ { print $$5 }'` + if [ "$$rootfs" = "squashfs" ]; then + if [ -h /etc/group ]; then + rm /etc/group + cp -p /rom/etc/group /etc/group + fi + if [ -h /etc/passwd ]; then + rm /etc/passwd + cp -p /rom/etc/passwd /etc/passwd + fi + fi +fi + +echo "" +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/group)" ]; then + echo "adding group $$name to /etc/group" + echo "$${name}:x:$${id}:" >> $${IPKG_INSTROOT}/etc/group +fi +if [ -z "$$(grep ^\\$${name}: $${IPKG_INSTROOT}/etc/passwd)" ]; then + echo "adding user $$name to /etc/passwd" + echo "$${name}:x:$${id}:$${id}:$${name}:$${home}:$${shell}" >> $${IPKG_INSTROOT}/etc/passwd +fi +endef + + $(eval $(call BuildPackage,dovecot)) diff --git a/mail/dovecot/files/dovecot.init b/mail/dovecot/files/dovecot.init index 7539fb614d..00f0edbc3a 100644 --- a/mail/dovecot/files/dovecot.init +++ b/mail/dovecot/files/dovecot.init @@ -1,23 +1,20 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org START=99 -SERVICE_PID_FILE=/var/run/dovecot/master.pid +RUN_D=/var/run/dovecot +PID_F=$RUN_D/master.pid start() { - user_exists dovecot 59 || user_add dovecot 59 - group_exists dovecot 59 || group_add dovecot 59 - mkdir -p -m 0755 /var/lib/dovecot - mkdir -p -m 0755 /var/run/dovecot - chmod 0750 /var/lib/dovecot - service_start /usr/sbin/dovecot + mkdir -p $RUN_D + dovecot } stop() { - service_stop /usr/sbin/dovecot + [ -f $PID_F ] && kill $(cat $PID_F) } reload() { - service_reload /usr/sbin/dovecot + [ -f $PID_F ] && kill -HUP $(cat $PID_F) } diff --git a/mail/msmtp/Makefile b/mail/msmtp/Makefile index 8dfca7edb1..7d7fec8ea0 100644 --- a/mail/msmtp/Makefile +++ b/mail/msmtp/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=msmtp -PKG_VERSION:=1.4.24 +PKG_VERSION:=1.4.23 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/msmtp -PKG_MD5SUM:=3ed704fbd3e7419cab5c65bb7928d9ba +PKG_MD5SUM:=5fb7ae88186624cdb125d3efad3fdc16 PKG_FIXUP:=libtool PKG_INSTALL:=1 @@ -67,6 +67,7 @@ endef CONFIGURE_ARGS += \ --disable-rpath \ + --without-libssl32-prefix \ --without-libintl-prefix \ --without-libgsasl \ --without-libidn @@ -75,7 +76,8 @@ MAKE_FLAGS := ifeq ($(BUILD_VARIANT),ssl) CONFIGURE_ARGS += \ - --with-ssl=openssl + --with-ssl=openssl \ + --with-libssl-prefix="$(STAGING_DIR)/usr/include" endif ifeq ($(BUILD_VARIANT),nossl) diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index 15f9b5f75e..565d954559 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=nullmailer PKG_VERSION:=1.05 -PKG_RELEASE:=4 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://untroubled.org/nullmailer/ @@ -47,10 +47,6 @@ define Package/nullmailer/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/protocols/smtp $(1)/usr/lib/nullmailer/ endef -define Package/nullmailer/conffiles -/etc/nullmailer/remotes -endef - define Package/nullmailer/postinst ln -sf ../sbin/sendmail $${IPKG_INSTROOT}/usr/lib/sendmail ln -sf nullmailer-sendmail $${IPKG_INSTROOT}/usr/sbin/sendmail diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile index 0240ae0e7a..4afd27f0dd 100644 --- a/mail/ssmtp/Makefile +++ b/mail/ssmtp/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2012 OpenWrt.org +# Copyright (C) 2007-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ssmtp PKG_VERSION:=2.64 -PKG_RELEASE:=4 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.bz2 PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/s/ssmtp @@ -55,8 +55,7 @@ define Package/ssmtp/install endef define Package/ssmtp/postinst -#!/bin/sh -ln -sf ssmtp $${IPKG_INSTROOT}/usr/sbin/sendmail + ln -sf ssmtp $${IPKG_INSTROOT}/usr/sbin/sendmail endef $(eval $(call BuildPackage,ssmtp)) diff --git a/mail/xmail/Makefile b/mail/xmail/Makefile index d3496a9dd7..8716e374cd 100644 --- a/mail/xmail/Makefile +++ b/mail/xmail/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=xmail PKG_VERSION:=1.26 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.xmailserver.org/ @@ -53,8 +53,4 @@ define Package/xmail/install $(INSTALL_BIN) ./files/xmail.init $(1)/etc/init.d/xmail endef -define Package/xmail/conffiles -/etc/config/xmail -endef - $(eval $(call BuildPackage,xmail)) diff --git a/multimedia/crtmpserver/Makefile b/multimedia/crtmpserver/Makefile index 046eeb6cd8..a101915d2a 100644 --- a/multimedia/crtmpserver/Makefile +++ b/multimedia/crtmpserver/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crtmpserver -PKG_REV:=726 +PKG_REV:=346 PKG_VERSION:=r$(PKG_REV) PKG_RELEASE:=1 @@ -53,8 +53,6 @@ define Build/Configure cp linux.mk linux-openwrt-uclibc.mk; \ $(SED) 's,^TOOLCHAIN_BASE[[:space:]]*=.*,TOOLCHAIN_BASE=$(TS_BASE),' \ -e 's,^TOOLCHAIN_PREFIX[[:space:]]*=.*,TOOLCHAIN_PREFIX=$(TARGET_CROSS),' \ - -e 's,^CCOMPILER[[:space:]]*=.*,CCOMPILER=$(TARGET_CC),' \ - -e 's,^CXXCOMPILER[[:space:]]*=.*,CXXCOMPILER=$(TARGET_CXX),' \ -e 's,^OPTIMIZATIONS[[:space:]]*=.*,OPTIMIZATIONS=-O2,' \ -e 's,^SSL_BASE[[:space:]]*=.*,SSL_BASE=$(STAGING_DIR)/usr,' \ linux-openwrt-uclibc.mk) @@ -67,18 +65,18 @@ endef define Package/crtmpserver/install $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/crtmpserver $(1)/usr/bin/ - $(INSTALL_DIR) $(1)/usr/lib/crtmpserver - $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/*.so $(1)/usr/lib/crtmpserver/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/rtmpserver $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/lib/rtmpserver + $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/*.so $(1)/usr/lib/rtmpserver/ $(foreach app,flvplayback samplefactory admin stresstest appselector vptests applestreamingclient proxypublish, \ - $(INSTALL_DIR) $(1)/usr/lib/crtmpserver/$(app); \ + $(INSTALL_DIR) $(1)/usr/lib/rtmpserver/$(app); \ $(INSTALL_BIN) $(PKG_BUILD_DIR)/builders/make/output/dynamic/applications/$(app)/lib$(app).so \ - $(1)/usr/lib/crtmpserver/$(app)/; \ + $(1)/usr/lib/rtmpserver/$(app)/; \ ) $(INSTALL_DIR) $(1)/etc - $(INSTALL_DATA) $(PKG_BUILD_DIR)/builders/make/output/dynamic/crtmpserver.lua $(1)/etc/ - $(INSTALL_DIR) $(1)/usr/share/crtmpserver/appselector - $(INSTALL_DIR) $(1)/usr/share/crtmpserver/media + $(INSTALL_DATA) $(PKG_BUILD_DIR)/builders/make/output/dynamic/rtmpserver.lua $(1)/etc/ + $(INSTALL_DIR) $(1)/usr/share/rtmpserver/appselector + $(INSTALL_DIR) $(1)/usr/share/rtmpserver/media endef $(eval $(call BuildPackage,crtmpserver)) diff --git a/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch b/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch index 4840ec40bb..6c6622cde9 100644 --- a/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch +++ b/multimedia/crtmpserver/patches/010-link-crypt-for-lua.patch @@ -1,13 +1,11 @@ -Index: crtmpserver-r692/builders/make/compile.mk -=================================================================== ---- crtmpserver-r692.orig/builders/make/compile.mk -+++ crtmpserver-r692/builders/make/compile.mk -@@ -67,7 +67,7 @@ TINYXML_OBJS = $(TINYXML_SRCS:.cpp=.tiny +--- a/builders/make/compile.mk ++++ b/builders/make/compile.mk +@@ -65,7 +65,7 @@ LUA_OBJS = $(LUA_SRCS:.c=.lua.o) #common - COMMON_INCLUDE=$(LUA_INCLUDE) $(TINYXML_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include --COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml -+COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -ltinyxml -lcrypt + COMMON_INCLUDE=$(LUA_INCLUDE) $(SSL_INCLUDE) -I$(PROJECT_BASE_PATH)/sources/common/include +-COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua ++COMMON_LIBS=$(SSL_LIB) -L$(OUTPUT_DYNAMIC) -llua -lcrypt COMMON_SRCS = $(shell find $(PROJECT_BASE_PATH)/sources/common/src -type f -name "*.cpp") COMMON_OBJS = $(COMMON_SRCS:.cpp=.common.o) diff --git a/multimedia/crtmpserver/patches/020-add-rpath.patch b/multimedia/crtmpserver/patches/020-add-rpath.patch index 83ebe561f5..7b6d5f435f 100644 --- a/multimedia/crtmpserver/patches/020-add-rpath.patch +++ b/multimedia/crtmpserver/patches/020-add-rpath.patch @@ -1,15 +1,15 @@ -Index: crtmpserver-r692/builders/make/linux.mk +Index: crtmpserver-r219/builders/make/linux.mk =================================================================== ---- crtmpserver-r692.orig/builders/make/linux.mk -+++ crtmpserver-r692/builders/make/linux.mk -@@ -31,8 +31,8 @@ OPTIMIZATIONS = -O3 - COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS) $(CFLAGS) +--- crtmpserver-r219.orig/builders/make/linux.mk ++++ crtmpserver-r219/builders/make/linux.mk +@@ -29,8 +29,8 @@ OPTIMIZATIONS = -O3 + COMPILE_FLAGS = $(FPIC) $(OPTIMIZATIONS) #linking flags -dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,"\$$ORIGIN" -dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,"\$$ORIGIN" -+dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,/usr/lib/crtmpserver -+dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,/usr/lib/crtmpserver ++dynamic_lib_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-soname,$(DYNAMIC_LIB_PREFIX)$(1)$(DYNAMIC_LIB_SUFIX) -Wl,-rpath,/usr/lib/rtmpserver ++dynamic_exec_flags = $(FPIC) $(OPTIMIZATIONS) -Wl,-rpath,/usr/lib/rtmpserver #compile switches PLATFORM_DEFINES = \ diff --git a/multimedia/crtmpserver/patches/030-default-config.patch b/multimedia/crtmpserver/patches/030-default-config.patch index a5031c98e7..f0fdc1a74c 100644 --- a/multimedia/crtmpserver/patches/030-default-config.patch +++ b/multimedia/crtmpserver/patches/030-default-config.patch @@ -1,53 +1,37 @@ -Index: crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua -=================================================================== ---- crtmpserver-r726.orig/builders/cmake/crtmpserver/crtmpserver.lua -+++ crtmpserver-r726/builders/cmake/crtmpserver/crtmpserver.lua -@@ -44,7 +44,7 @@ configuration= +--- a/builders/cmake/rtmpserver/rtmpserver.lua ++++ b/builders/cmake/rtmpserver/rtmpserver.lua +@@ -4,7 +4,7 @@ configuration= + { + -- if true, the server will run as a daemon. + -- NOTE: all console appenders will be ignored if this is a daemon +- daemon=false, ++ daemon=true, + -- the OS's path separator. Used in composing paths + pathSeparator="/", + -- this is the async DNS resolver. This is a "clinet" connection +@@ -58,7 +58,7 @@ configuration= { -- this is the root directory of all applications -- usually this is relative to the binary execuable - rootDirectory="applications", -+ rootDirectory="/usr/lib/crtmpserver", ++ rootDirectory="/usr/lib/rtmpserver", --this is where the applications array starts -@@ -68,7 +68,7 @@ configuration= +@@ -82,7 +82,7 @@ configuration= -- this is the folder from where the current application gets it's content. -- It is optional. If not specified, it will be defaulted to: -- //mediaFolder - -- mediaFolder="/some/directory/where/media/files/are/stored" -+ mediaFolder="/usr/share/crtmpserver/appselector", ++ mediaFolder="/usr/share/rtmpserver/appselector", -- the application will also be known by that names. It is optional --aliases= --{ -@@ -89,13 +89,6 @@ configuration= - }, - { - ip="0.0.0.0", -- port=8081, -- protocol="inboundRtmps", -- sslKey="server.key", -- sslCert="server.crt" -- }, -- { -- ip="0.0.0.0", - port=8080, - protocol="inboundRtmpt" - }, -@@ -105,7 +98,7 @@ configuration= +@@ -119,6 +119,7 @@ configuration= description="FLV Playback Sample", name="flvplayback", protocol="dynamiclinklibrary", -- mediaFolder="/Volumes/android/backup/media/", -+ mediaFolder="/media/", ++ mediaFolder="/usr/share/rtmpserver/media", aliases= { "simpleLive", -@@ -183,6 +176,7 @@ configuration= - name="samplefactory", - description="asdsadasdsa", - protocol="dynamiclinklibrary", -+ mediaFolder="/usr/share/ctmpserver/media", - aliases= - { - "httpOutboundTest" diff --git a/multimedia/crtmpserver/patches/040-use-select.patch b/multimedia/crtmpserver/patches/040-use-select.patch index 466f86c9e6..42b3a283e9 100644 --- a/multimedia/crtmpserver/patches/040-use-select.patch +++ b/multimedia/crtmpserver/patches/040-use-select.patch @@ -1,8 +1,6 @@ -Index: crtmpserver-r726/builders/make/linux.mk -=================================================================== ---- crtmpserver-r726.orig/builders/make/linux.mk -+++ crtmpserver-r726/builders/make/linux.mk -@@ -38,7 +38,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT +--- a/builders/make/linux.mk ++++ b/builders/make/linux.mk +@@ -36,7 +36,7 @@ dynamic_exec_flags = $(FPIC) $(OPTIMIZAT PLATFORM_DEFINES = \ -DLINUX \ -DLITTLE_ENDIAN_BYTE_ALIGNED \ diff --git a/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch b/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch deleted file mode 100644 index 43447b0040..0000000000 --- a/multimedia/crtmpserver/patches/050-add-missing-make-defines.patch +++ /dev/null @@ -1,22 +0,0 @@ -Index: crtmpserver-r726/builders/make/compile.mk -=================================================================== ---- crtmpserver-r726.orig/builders/make/compile.mk -+++ crtmpserver-r726/builders/make/compile.mk -@@ -43,10 +43,16 @@ FEATURES_DEFINES = \ - -DHAS_PROTOCOL_RTP \ - -DHAS_PROTOCOL_TS \ - -DHAS_PROTOCOL_VAR \ -+ -DHAS_PROTOCOL_CLI \ -+ -DHAS_PROTOCOL_HLS \ -+ -DHAS_PROTOCOL_RAWHTTPSTREAM \ - -DHAS_LUA \ - -DHAS_MEDIA_MP3 \ - -DHAS_MEDIA_MP4 \ -- -DHAS_MEDIA_FLV -+ -DHAS_MEDIA_FLV \ -+ -DHAS_MEDIA_NSV \ -+ -DHAS_SYSLOG -+ - - - DEFINES = $(PLATFORM_DEFINES) $(FEATURES_DEFINES) diff --git a/multimedia/darkice/Makefile b/multimedia/darkice/Makefile deleted file mode 100644 index 395ce9c4df..0000000000 --- a/multimedia/darkice/Makefile +++ /dev/null @@ -1,58 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=darkice -PKG_VERSION:=1.0 -PKG_RELEASE:=4 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=http://darkice.googlecode.com/files/ -PKG_MD5SUM:= 1804e63d42a9703d01fe378c9a77c473 - -PKG_FIXUP:=libtool -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/darkice - SECTION:=multimedia - CATEGORY:=Multimedia - SUBMENU:=Streaming - TITLE:=DarkIce is a live audio streamer - DEPENDS:=+lame +libpthread +libstdcpp - MAINTAINER:=Artur Wronowski -endef - -define Package/darkice/description -DarkIce is a live audio streamer. It records audio from an audio interface (e.g. sound card), encodes it and sends it to a streaming server. -endef - -CONFIGURE_ARGS += \ - --with-lame \ - --without-aacplus \ - --without-alsa \ - --without-faac \ - --without-jack \ - --without-samplerate \ - --without-twolame \ - --without-vorbis \ - --with-lame-prefix="$(STAGING_DIR)/usr" \ - -define Package/darkice/install - $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/darkice $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/etc/darkice.cfg $(1)/etc/ -endef - -define Package/darkice/conffiles -/etc/darkice.cfg -endef - -$(eval $(call BuildPackage,darkice)) diff --git a/multimedia/darkice/patches/001-upstream_svn_r494.patch b/multimedia/darkice/patches/001-upstream_svn_r494.patch deleted file mode 100644 index 3f6b3f1376..0000000000 --- a/multimedia/darkice/patches/001-upstream_svn_r494.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/src/SerialUlaw.cpp -+++ b/src/SerialUlaw.cpp -@@ -40,6 +40,12 @@ - #include "config.h" - #endif - -+#ifdef HAVE_STDIO_H -+#include -+#else -+#error need stdio.h -+#endif -+ - #ifdef HAVE_UNISTD_H - #include - #else diff --git a/multimedia/ffmpeg/Config.in b/multimedia/ffmpeg/Config.in index fcd2124e86..32665d884e 100644 --- a/multimedia/ffmpeg/Config.in +++ b/multimedia/ffmpeg/Config.in @@ -1,313 +1,324 @@ menu "Configuration" - depends PACKAGE_libffmpeg-custom + depends PACKAGE_libffmpeg -config FFMPEG_CUSTOM_PATENTED +config FFMPEG_IPV6 + bool "Enable IPv6" + default IPV6 + +config FFMPEG_PATENTED bool "Include patented codecs and technologies" default BUILD_PATENTED -comment "Profiles ---" - -config FFMPEG_CUSTOM_FFSERVER_SUPPORT +config FFMPEG_FFSERVER_SUPPORT bool "Include support for ffserver (FFmpeg streaming server)" - select FFMPEG_CUSTOM_MUXER_ffm - select FFMPEG_CUSTOM_DEMUXER_ffm - select FFMPEG_CUSTOM_DEMUXER_rtsp - select FFMPEG_CUSTOM_PROTOCOL_rtp + select FFMPEG_MUXER_ffm + select FFMPEG_DEMUXER_ffm + select FFMPEG_DEMUXER_rtsp + select FFMPEG_PROTOCOL_rtp -config FFMPEG_CUSTOM_LIBDLNA_SUPPORT +config FFMPEG_LIBDLNA_SUPPORT bool "Include support for libdlna/ushare" - depends FFMPEG_CUSTOM_PATENTED - select FFMPEG_CUSTOM_DECODER_ac3 - select FFMPEG_CUSTOM_DECODER_atrac3 - select FFMPEG_CUSTOM_DECODER_h264 - select FFMPEG_CUSTOM_DECODER_jpegls - select FFMPEG_CUSTOM_DECODER_mp3 - select FFMPEG_CUSTOM_DECODER_mpeg1video - select FFMPEG_CUSTOM_DECODER_mpeg2video - select FFMPEG_CUSTOM_DECODER_mpeg4 - select FFMPEG_CUSTOM_DECODER_mpegvideo - select FFMPEG_CUSTOM_DECODER_wmav1 - select FFMPEG_CUSTOM_DECODER_wmav2 - select FFMPEG_CUSTOM_DECODER_png - select FFMPEG_CUSTOM_DEMUXER_ac3 - select FFMPEG_CUSTOM_DEMUXER_h264 - select FFMPEG_CUSTOM_DEMUXER_mp3 - select FFMPEG_CUSTOM_DEMUXER_mpegvideo - -config FFMPEG_CUSTOM_MINIDLNA_SUPPORT + depends FFMPEG_PATENTED + select FFMPEG_DECODER_ac3 + select FFMPEG_DECODER_atrac3 + select FFMPEG_DECODER_h264 + select FFMPEG_DECODER_jpegls + select FFMPEG_DECODER_mp3 + select FFMPEG_DECODER_mpeg1video + select FFMPEG_DECODER_mpeg2video + select FFMPEG_DECODER_mpeg4 + select FFMPEG_DECODER_mpeg4aac + select FFMPEG_DECODER_mpegvideo + select FFMPEG_DECODER_wmav1 + select FFMPEG_DECODER_wmav2 + select FFMPEG_DECODER_png + select FFMPEG_DEMUXER_ac3 + select FFMPEG_DEMUXER_h264 + select FFMPEG_DEMUXER_mp3 + select FFMPEG_DEMUXER_mpegvideo + +config FFMPEG_MINIDLNA_SUPPORT bool "Include support for minidlna" - depends FFMPEG_CUSTOM_PATENTED - select FFMPEG_CUSTOM_DECODER_aac - select FFMPEG_CUSTOM_DECODER_ac3 - select FFMPEG_CUSTOM_DECODER_flac - select FFMPEG_CUSTOM_DECODER_h264 - select FFMPEG_CUSTOM_DECODER_jpegls - select FFMPEG_CUSTOM_DECODER_mp3 - select FFMPEG_CUSTOM_DECODER_mpeg1video - select FFMPEG_CUSTOM_DECODER_mpeg2video - select FFMPEG_CUSTOM_DECODER_mpeg4 - select FFMPEG_CUSTOM_DECODER_mpegvideo - select FFMPEG_CUSTOM_DECODER_wmav1 - select FFMPEG_CUSTOM_DECODER_wmav2 - select FFMPEG_CUSTOM_DECODER_png - select FFMPEG_CUSTOM_DEMUXER_aac - select FFMPEG_CUSTOM_DEMUXER_ac3 - select FFMPEG_CUSTOM_DEMUXER_avi - select FFMPEG_CUSTOM_DEMUXER_flac - select FFMPEG_CUSTOM_DEMUXER_h264 - select FFMPEG_CUSTOM_DEMUXER_matroska - select FFMPEG_CUSTOM_DEMUXER_mov - select FFMPEG_CUSTOM_DEMUXER_mp3 - select FFMPEG_CUSTOM_DEMUXER_mpegvideo - select FFMPEG_CUSTOM_PROTOCOL_file + depends FFMPEG_PATENTED + select FFMPEG_DECODER_aac + select FFMPEG_DECODER_ac3 + select FFMPEG_DECODER_flac + select FFMPEG_DECODER_h264 + select FFMPEG_DECODER_jpegls + select FFMPEG_DECODER_mp3 + select FFMPEG_DECODER_mpeg1video + select FFMPEG_DECODER_mpeg2video + select FFMPEG_DECODER_mpeg4 + select FFMPEG_DECODER_mpeg4aac + select FFMPEG_DECODER_mpegvideo + select FFMPEG_DECODER_wmav1 + select FFMPEG_DECODER_wmav2 + select FFMPEG_DECODER_png + select FFMPEG_DEMUXER_aac + select FFMPEG_DEMUXER_ac3 + select FFMPEG_DEMUXER_avi + select FFMPEG_DEMUXER_flac + select FFMPEG_DEMUXER_h264 + select FFMPEG_DEMUXER_matroska + select FFMPEG_DEMUXER_mov + select FFMPEG_DEMUXER_mp3 + select FFMPEG_DEMUXER_mpegvideo + select FFMPEG_PROTOCOL_file comment "Encoders ---" -config FFMPEG_CUSTOM_ENCODER_ac3 +config FFMPEG_ENCODER_ac3 bool "AC3" - depends FFMPEG_CUSTOM_PATENTED - select FFMPEG_CUSTOM_PARSER_ac3 + depends FFMPEG_PATENTED + select FFMPEG_PARSER_ac3 -config FFMPEG_CUSTOM_ENCODER_jpegls +config FFMPEG_ENCODER_jpegls bool "JPEG-LS" -config FFMPEG_CUSTOM_ENCODER_mpeg1video +config FFMPEG_ENCODER_mpeg1video bool "MPEG-1 Video" -config FFMPEG_CUSTOM_ENCODER_mpeg2video +config FFMPEG_ENCODER_mpeg2video bool "MPEG-2 Video" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_ENCODER_mpeg4 +config FFMPEG_ENCODER_mpeg4 bool "MPEG-4" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_ENCODER_pcm_s16be +config FFMPEG_ENCODER_pcm_s16be bool "PCM signed 16-bit big-endian" -config FFMPEG_CUSTOM_ENCODER_pcm_s16le +config FFMPEG_ENCODER_pcm_s16le bool "PCM signed 16-bit little-endian" -config FFMPEG_CUSTOM_ENCODER_png +config FFMPEG_ENCODER_png bool "PNG" - select FFMPEG_CUSTOM_ENCODER_zlib + select FFMPEG_ENCODER_zlib -config FFMPEG_CUSTOM_ENCODER_vorbis +config FFMPEG_ENCODER_vorbis bool "Vorbis" -config FFMPEG_CUSTOM_ENCODER_zlib +config FFMPEG_ENCODER_zlib bool "Zlib" comment "Decoders ---" -config FFMPEG_CUSTOM_DECODER_aac +config FFMPEG_DECODER_aac bool "AAC (Advanced Audio Coding)" - depends FFMPEG_CUSTOM_PATENTED - select FFMPEG_CUSTOM_PARSER_aac + depends FFMPEG_PATENTED + select FFMPEG_PARSER_aac -config FFMPEG_CUSTOM_DECODER_ac3 +config FFMPEG_DECODER_ac3 bool "AC3" - depends FFMPEG_CUSTOM_PATENTED - select FFMPEG_CUSTOM_PARSER_ac3 + depends FFMPEG_PATENTED + select FFMPEG_PARSER_ac3 -config FFMPEG_CUSTOM_DECODER_atrac3 +config FFMPEG_DECODER_atrac3 bool "ATRAC3" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_DECODER_flac +config FFMPEG_DECODER_flac bool "FLAC" -config FFMPEG_CUSTOM_DECODER_gif +config FFMPEG_DECODER_gif bool "GIF" -config FFMPEG_CUSTOM_DECODER_h264 +config FFMPEG_DECODER_h264 bool "H.264" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_DECODER_jpegls +config FFMPEG_DECODER_jpegls bool "JPEG-LS" -config FFMPEG_CUSTOM_DECODER_mp2 +config FFMPEG_DECODER_mp2 bool "MP2 (MPEG Audio Layer 2)" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_DECODER_mp3 +config FFMPEG_DECODER_mp3 bool "MP3 (MPEG Audio Layer 2)" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_DECODER_mpegvideo +config FFMPEG_DECODER_mpegvideo bool "MPEG Video" -config FFMPEG_CUSTOM_DECODER_mpeg1video +config FFMPEG_DECODER_mpeg1video bool "MPEG-1 Video" -config FFMPEG_CUSTOM_DECODER_mpeg2video +config FFMPEG_DECODER_mpeg2video bool "MPEG-2 Video" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_DECODER_mpeg4 +config FFMPEG_DECODER_mpeg4 bool "MPEG-4" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_DECODER_pcm_s16be +config FFMPEG_DECODER_mpeg4aac + bool "MPEG-4 (AAC)" + depends FFMPEG_PATENTED + +config FFMPEG_DECODER_pcm_s16be bool "PCM signed 16-bit big-endian" -config FFMPEG_CUSTOM_DECODER_pcm_s16le +config FFMPEG_DECODER_pcm_s16le bool "PCM signed 16-bit little-endian" -config FFMPEG_CUSTOM_DECODER_png +config FFMPEG_DECODER_png bool "PNG" - select FFMPEG_CUSTOM_DECODER_zlib + select FFMPEG_DECODER_zlib -config FFMPEG_CUSTOM_DECODER_vorbis +config FFMPEG_DECODER_vorbis bool "Vorbis" -config FFMPEG_CUSTOM_DECODER_wmav1 +config FFMPEG_DECODER_wmav1 bool "WMAv1" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_DECODER_wmav2 +config FFMPEG_DECODER_wmav2 bool "WMAv2" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_DECODER_zlib +config FFMPEG_DECODER_zlib bool "Zlib" comment "Muxers ---" -config FFMPEG_CUSTOM_MUXER_ac3 +config FFMPEG_MUXER_ac3 bool "AC3" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_MUXER_ffm +config FFMPEG_MUXER_ffm bool "FFM (ffserver live feed)" -config FFMPEG_CUSTOM_MUXER_h264 +config FFMPEG_MUXER_h264 bool "H.264" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_MUXER_mp3 +config FFMPEG_MUXER_mp3 bool "MP3 (MPEG Audio Layer 3)" -config FFMPEG_CUSTOM_MUXER_mp4 +config FFMPEG_MUXER_mp4 bool "MP4" -config FFMPEG_CUSTOM_MUXER_mpeg1video +config FFMPEG_MUXER_mpeg1video bool "MPEG-1 Video" -config FFMPEG_CUSTOM_MUXER_mpeg2video +config FFMPEG_MUXER_mpeg2video bool "MPEG-2 Video" -config FFMPEG_CUSTOM_MUXER_mpegts +config FFMPEG_MUXER_mpegts bool "MPEG-2 (TS)" -config FFMPEG_CUSTOM_MUXER_ogg +config FFMPEG_MUXER_ogg bool "Ogg" -config FFMPEG_CUSTOM_MUXER_rtp +config FFMPEG_MUXER_oss + bool "OSS (Open Sound System playback)" + +config FFMPEG_MUXER_rtp bool "RTP" comment "Demuxers ---" -config FFMPEG_CUSTOM_DEMUXER_aac +config FFMPEG_DEMUXER_aac bool "AAC" -config FFMPEG_CUSTOM_DEMUXER_avi +config FFMPEG_DEMUXER_avi bool "AVI (Audio Video Interleave)" -config FFMPEG_CUSTOM_DEMUXER_ac3 +config FFMPEG_DEMUXER_ac3 bool "AC3" -config FFMPEG_CUSTOM_DEMUXER_flac +config FFMPEG_DEMUXER_flac bool "FLAC" -config FFMPEG_CUSTOM_DEMUXER_ffm +config FFMPEG_DEMUXER_ffm bool "FFM (ffserver live feed)" -config FFMPEG_CUSTOM_DEMUXER_h264 +config FFMPEG_DEMUXER_h264 bool "H.264" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_DEMUXER_matroska +config FFMPEG_DEMUXER_matroska bool "Matroska (MKA,MKV)" - select FFMPEG_CUSTOM_DECODER_zlib + select FFMPEG_DECODER_zlib -config FFMPEG_CUSTOM_DEMUXER_mov +config FFMPEG_DEMUXER_mov bool "MOV/MP4/M4A/3GP/3G2/MJ2" - select FFMPEG_CUSTOM_DECODER_zlib + select FFMPEG_DECODER_zlib -config FFMPEG_CUSTOM_DEMUXER_mp3 +config FFMPEG_DEMUXER_mp3 bool "MP3 (MPEG Audio Layer 3)" - select FFMPEG_CUSTOM_PARSER_mpegaudio + select FFMPEG_PARSER_mpegaudio -config FFMPEG_CUSTOM_DEMUXER_mpegvideo +config FFMPEG_DEMUXER_mpegvideo bool "MPEG Video" -config FFMPEG_CUSTOM_DEMUXER_mpegps +config FFMPEG_DEMUXER_mpegps bool "MPEG-2 (PS)" -config FFMPEG_CUSTOM_DEMUXER_mpegts +config FFMPEG_DEMUXER_mpegts bool "MPEG-2 (TS)" -config FFMPEG_CUSTOM_DEMUXER_ogg +config FFMPEG_DEMUXER_ogg bool "Ogg" -config FFMPEG_CUSTOM_DEMUXER_rm +config FFMPEG_DEMUXER_rm bool "RM" help RealMedia format demuxer -config FFMPEG_CUSTOM_DEMUXER_rtsp +config FFMPEG_DEMUXER_rtsp bool "RTSP" - select FFMPEG_CUSTOM_DEMUXER_rm - select FFMPEG_CUSTOM_DEMUXER_sdp + select FFMPEG_DEMUXER_rm + select FFMPEG_DEMUXER_sdp -config FFMPEG_CUSTOM_DEMUXER_sdp +config FFMPEG_DEMUXER_sdp bool "SDP" - select FFMPEG_CUSTOM_DEMUXER_mpegts + select FFMPEG_DEMUXER_mpegts comment "Parsers ---" -config FFMPEG_CUSTOM_PARSER_aac +config FFMPEG_PARSER_aac bool "AAC (Advanced Audio Coding)" - depends FFMPEG_CUSTOM_PATENTED + depends FFMPEG_PATENTED -config FFMPEG_CUSTOM_PARSER_ac3 +config FFMPEG_PARSER_ac3 bool "AC3" -config FFMPEG_CUSTOM_PARSER_h264 +config FFMPEG_PARSER_h264 bool "H.264" - depends FFMPEG_CUSTOM_PATENTED - select FFMPEG_CUSTOM_DECODER_h264 + depends FFMPEG_PATENTED + select FFMPEG_DECODER_h264 -config FFMPEG_CUSTOM_PARSER_mpegaudio +config FFMPEG_PARSER_mpegaudio bool "MPEG Audio" -config FFMPEG_CUSTOM_PARSER_mpegvideo +config FFMPEG_PARSER_mpegvideo bool "MPEG Video" -config FFMPEG_CUSTOM_PARSER_mpeg4video +config FFMPEG_PARSER_mpeg4video bool "MPEG-4 Video" comment "Protocols ---" -config FFMPEG_CUSTOM_PROTOCOL_file +config FFMPEG_PROTOCOL_file bool "file:" -config FFMPEG_CUSTOM_PROTOCOL_http +config FFMPEG_PROTOCOL_http bool "http:" -config FFMPEG_CUSTOM_PROTOCOL_pipe +config FFMPEG_PROTOCOL_pipe bool "pipe:" -config FFMPEG_CUSTOM_PROTOCOL_rtp +config FFMPEG_PROTOCOL_rtp bool "rtp:" - select FFMPEG_CUSTOM_PROTOCOL_udp + select FFMPEG_PROTOCOL_udp -config FFMPEG_CUSTOM_PROTOCOL_tcp +config FFMPEG_PROTOCOL_tcp bool "tcp:" -config FFMPEG_CUSTOM_PROTOCOL_udp +config FFMPEG_PROTOCOL_udp bool "udp:" endmenu diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 5a5699d0f6..e2dc1f13a3 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ffmpeg -PKG_VERSION:=0.8.7 -PKG_RELEASE:=1 +PKG_VERSION:=0.5.4 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ffmpeg.org/releases/ -PKG_MD5SUM:=31da4d5610d7138761e23fab8fe3a84d +PKG_MD5SUM:=87e771cd0f5d465fbf1a0a4824b7cc24 -FFMPEG_CUSTOM_ENCODERS:= \ +FFMPEG_ENCODERS:= \ ac3 \ jpegls \ mpeg1video \ @@ -27,7 +27,7 @@ FFMPEG_CUSTOM_ENCODERS:= \ vorbis \ zlib \ -FFMPEG_CUSTOM_DECODERS:= \ +FFMPEG_DECODERS:= \ aac \ ac3 \ atrac3 \ @@ -40,6 +40,7 @@ FFMPEG_CUSTOM_DECODERS:= \ mpeg1video \ mpeg2video \ mpeg4 \ + mpeg4aac \ mpegvideo \ pcm_s16be \ pcm_s16le \ @@ -49,7 +50,7 @@ FFMPEG_CUSTOM_DECODERS:= \ wmav2 \ zlib \ -FFMPEG_CUSTOM_MUXERS:= \ +FFMPEG_MUXERS:= \ ac3 \ ffm \ h264 \ @@ -59,9 +60,10 @@ FFMPEG_CUSTOM_MUXERS:= \ mpeg2video \ mpegts \ ogg \ + oss \ rtp \ -FFMPEG_CUSTOM_DEMUXERS:= \ +FFMPEG_DEMUXERS:= \ aac \ ac3 \ avi \ @@ -80,7 +82,7 @@ FFMPEG_CUSTOM_DEMUXERS:= \ sdp \ v4l2 \ -FFMPEG_CUSTOM_PARSERS:= \ +FFMPEG_PARSERS:= \ aac \ ac3 \ h264 \ @@ -88,66 +90,16 @@ FFMPEG_CUSTOM_PARSERS:= \ mpeg4video \ mpegvideo \ -FFMPEG_CUSTOM_PROTOCOLS:= \ +FFMPEG_PROTOCOLS:= \ file http pipe rtp tcp udp -FFMPEG_MINI_ENCODERS:= \ - -FFMPEG_MINI_DECODERS:= \ - aac \ - ac3 \ - atrac3 \ - flac \ - h263 \ - h264 \ - jpegls \ - mp3 \ - mpeg1video \ - mpeg2video \ - mpeg4 \ - mpegvideo \ - png \ - wmav1 \ - wmav2 \ - -FFMPEG_MINI_MUXERS:= \ - ffm \ - -FFMPEG_MINI_DEMUXERS := \ - aac \ - ac3 \ - asf \ - avi \ - ffm \ - flac \ - h264 \ - matroska \ - mov \ - mp3 \ - mpegts \ - mpegvideo \ - rtsp \ - -FFMPEG_MINI_PARSERS:= \ - ac3 \ - flac \ - h263 \ - h264 \ - mpeg4video \ - mpegaudio \ - -FFMPEG_MINI_PROTOCOLS := \ - file http rtp tcp udp \ - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) - PKG_CONFIG_DEPENDS:= \ - $(patsubst %,CONFIG_FFMPEG_CUSTOM_ENCODER_%,$(FFMPEG_CUSTOM_ENCODERS)) \ - $(patsubst %,CONFIG_FFMPEG_CUSTOM_DECODER_%,$(FFMPEG_CUSTOM_DECODERS)) \ - $(patsubst %,CONFIG_FFMPEG_CUSTOM_MUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \ - $(patsubst %,CONFIG_FFMPEG_CUSTOM_DEMUXER_%,$(FFMPEG_CUSTOM_DEMUXERS)) \ - $(patsubst %,CONFIG_FFMPEG_CUSTOM_PARSER_%,$(FFMPEG_CUSTOM_PARSERS)) \ - $(patsubst %,CONFIG_FFMPEG_CUSTOM_PROTOCOL_%,$(FFMPEG_CUSTOM_PROTOCOLS)) + $(patsubst %,CONFIG_FFMPEG_ENCODER_%,$(FFMPEG_ENCODERS)) \ + $(patsubst %,CONFIG_FFMPEG_DECODER_%,$(FFMPEG_DECODERS)) \ + $(patsubst %,CONFIG_FFMPEG_MUXER_%,$(FFMPEG_DEMUXERS)) \ + $(patsubst %,CONFIG_FFMPEG_DEMUXER_%,$(FFMPEG_DEMUXERS)) \ + $(patsubst %,CONFIG_FFMPEG_PARSER_%,$(FFMPEG_PARSERS)) \ + $(patsubst %,CONFIG_FFMPEG_PROTOCOL_%,$(FFMPEG_PROTOCOLS)) include $(INCLUDE_DIR)/package.mk @@ -161,14 +113,12 @@ define Package/ffmpeg/Default/description audio and video in numerous formats. endef - define Package/ffmpeg $(call Package/ffmpeg/Default) SECTION:=multimedia CATEGORY:=Multimedia TITLE+= program - DEPENDS+= +libpthread +libffmpeg - VARIANT:=full + DEPENDS+= +libpthread +libffmpeg +libpostproc +libswscale endef define Package/ffmpeg/description @@ -177,30 +127,12 @@ $(call Package/ffmpeg/Default/description) This package contains the FFmpeg command line tool. endef - -define Package/ffprobe -$(call Package/ffmpeg/Default) - SECTION:=multimedia - CATEGORY:=Multimedia - TITLE+= CLI media identifier - DEPENDS+= +libffmpeg - VARIANT:=full -endef - -define Package/ffprobe/description -$(call Package/ffmpeg/Default/description) - . - This package contains the FFprobe command line tool. -endef - - define Package/ffserver $(call Package/ffserver/Default) SECTION:=multimedia CATEGORY:=Multimedia TITLE+= streaming server - DEPENDS+= +libpthread +libffmpeg - VARIANT:=full + DEPENDS+= +libpthread +libffmpeg +@FFMPEG_FFSERVER_SUPPORT endef define Package/ffserver/description @@ -209,146 +141,110 @@ $(call Package/ffmpeg/Default/description) This package contains the FFmpeg streaming server. endef - -define Package/libffmpeg/Default +define Package/libffmpeg $(call Package/ffmpeg/Default) SECTION:=libs CATEGORY:=Libraries TITLE+= libraries DEPENDS+= +libpthread +zlib - PROVIDES:= libffmpeg -endef - - -define Package/libffmpeg-custom -$(call Package/libffmpeg/Default) - TITLE+= (mini) - DEPENDS+= @DEVEL - VARIANT:=custom MENU:=1 endef -define Package/libffmpeg-custom/config +define Package/libffmpeg/config source "$(SOURCE)/Config.in" endef -define Package/libffmpeg-custom/description -$(call Package/ffmpeg/Default/description) - . - This package contains customized FFmpeg shared libraries. -endef - - -define Package/libffmpeg-full -$(call Package/libffmpeg/Default) - TITLE+= (full) - DEPENDS+= @BUILD_PATENTED +alsa-lib - VARIANT:=full -endef - -define Package/libffmpeg-full/description +define Package/libffmeg/description $(call Package/ffmpeg/Default/description) . - This package contains full-featured FFmpeg shared libraries. + This package contains FFmpeg shared libraries. endef - -define Package/libffmpeg-mini -$(call Package/libffmpeg/Default) - TITLE+= (mini) - DEPENDS+= @BUILD_PATENTED - VARIANT:=mini +define Package/libpostproc + SECTION:=libs + CATEGORY:=Libraries + TITLE:=libpostproc + URL:=http://ffmpeg.mplayerhq.hu/ + DEPENDS:=+libffmpeg endef -define Package/libffmpeg-mini/description -$(call Package/ffmpeg/Default/description) - . - This package contains minimal-featured FFmpeg shared libraries. +define Package/libswscale + SECTION:=libs + CATEGORY:=Libraries + TITLE:=libswscale + URL:=http://ffmpeg.mplayerhq.hu/ + DEPENDS:=+libffmpeg endef - -FFMPEG_CONFIGURE:= \ - CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ./configure \ - --enable-cross-compile \ - --cross-prefix="$(TARGET_CROSS)" \ - --arch="$(ARCH)" \ - --target-os=linux \ - --prefix="/usr" \ - --enable-shared \ - --enable-static \ - --disable-debug \ - --pkg-config="pkg-config" \ - \ - --enable-gpl \ - --enable-version3 \ - \ - --disable-asm \ - --disable-doc \ - --disable-dxva2 \ - --enable-pthreads \ - --disable-optimizations \ - --enable-small \ - --disable-stripping \ - --enable-zlib \ - -ifeq ($(BUILD_VARIANT),custom) - - FFMPEG_ENABLE= \ - $(foreach c, $(2), \ - $(if $($(3)_$(c)),--enable-$(1)="$(c)") \ - ) - - FFMPEG_CONFIGURE+= \ - --disable-ffmpeg \ - --disable-ffplay \ - --disable-ffprobe \ - --disable-ffserver \ - --disable-avfilter \ - --disable-postproc \ - --disable-swscale \ - --disable-everything \ - $(call FFMPEG_ENABLE,encoder,$(FFMPEG_CUSTOM_ENCODERS),CONFIG_FFMPEG_ENCODER) \ - $(call FFMPEG_ENABLE,decoder,$(FFMPEG_CUSTOM_DECODERS),CONFIG_FFMPEG_DECODER) \ - $(call FFMPEG_ENABLE,muxer,$(FFMPEG_CUSTOM_MUXERS),CONFIG_FFMPEG_MUXER) \ - $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_CUSTOM_DEMUXERS),CONFIG_FFMPEG_DEMUXER) \ - $(call FFMPEG_ENABLE,parser,$(FFMPEG_CUSTOM_PARSERS),CONFIG_FFMPEG_PARSER) \ - $(call FFMPEG_ENABLE,protocol,$(FFMPEG_CUSTOM_PROTOCOLS),CONFIG_FFMPEG_PROTOCOL) \ - -endif - -ifeq ($(BUILD_VARIANT),mini) - - FFMPEG_ENABLE= \ - $(foreach c, $(2), \ - --enable-$(1)="$(c)" \ +FILTER_CONFIG= \ + $(foreach c, $(3), \ + $(if $(CONFIG_FFMPEG_$(1)_$(c)),--enable-$(2)="$(c)") \ ) - FFMPEG_CONFIGURE+= \ - --disable-ffmpeg \ - --disable-ffplay \ - --disable-ffprobe \ - --disable-ffserver \ - --disable-avfilter \ - --disable-postproc \ - --disable-swscale \ - --disable-everything \ - $(call FFMPEG_ENABLE,encoder,$(FFMPEG_MINI_ENCODERS)) \ - $(call FFMPEG_ENABLE,decoder,$(FFMPEG_MINI_DECODERS)) \ - $(call FFMPEG_ENABLE,muxer,$(FFMPEG_MINI_MUXERS)) \ - $(call FFMPEG_ENABLE,demuxer,$(FFMPEG_MINI_DEMUXERS)) \ - $(call FFMPEG_ENABLE,parser,$(FFMPEG_MINI_PARSERS)) \ - $(call FFMPEG_ENABLE,protocol,$(FFMPEG_MINI_PROTOCOLS)) \ - -endif +FFMPEG_CONFIGURE_ENCODERS:=$(call FILTER_CONFIG,ENCODER,encoder,$(FFMPEG_ENCODERS)) +FFMPEG_CONFIGURE_DECODERS:=$(call FILTER_CONFIG,DECODER,decoder,$(FFMPEG_DECODERS)) +FFMPEG_CONFIGURE_MUXERS:=$(call FILTER_CONFIG,MUXER,muxer,$(FFMPEG_MUXERS)) +FFMPEG_CONFIGURE_DEMUXERS:=$(call FILTER_CONFIG,DEMUXER,demuxer,$(FFMPEG_DEMUXERS)) +FFMPEG_CONFIGURE_PARSERS:=$(call FILTER_CONFIG,PARSER,parser,$(FFMPEG_PARSERS)) +FFMPEG_CONFIGURE_PROTOCOLS:=$(call FILTER_CONFIG,PROTOCOL,protocol,$(FFMPEG_PROTOCOLS)) ifneq ($(CONFIG_TARGET_x86),) TARGET_CFLAGS += -fomit-frame-pointer endif +# XXX: add --disable-mmx & --disable-mmx2 to fix build failure on x86 +# libpostproc/postprocess_template.c:2195: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' +# libpostproc/postprocess_template.c:3124: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' +# libpostproc/postprocess_template.c:3207: error: can't find a register in class 'GENERAL_REGS' while reloading 'asm' + define Build/Configure - ( cd $(PKG_BUILD_DIR); $(FFMPEG_CONFIGURE) ) + # this is *NOT* GNU configure + ( cd $(PKG_BUILD_DIR); \ + CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) $(FPIC)" \ + LDFLAGS="$(TARGET_LDFLAGS)" \ + ./configure \ + --enable-cross-compile \ + --cross-prefix="$(TARGET_CROSS)" \ + --arch="$(ARCH)" \ + --target-os=linux \ + --prefix="/usr" \ + --enable-shared \ + --enable-static \ + --disable-debug \ + --enable-gpl \ + --disable-libfaad \ + --disable-amd3dnow \ + --disable-amd3dnowext \ + --disable-mmx \ + --disable-mmx2 \ + --enable-pthreads \ + --disable-optimizations \ + --enable-small \ + --disable-stripping \ + --disable-vhook \ + --enable-zlib \ + --enable-postproc \ + --enable-swscale \ + \ + $(if $(CONFIG_PACKAGE_ffmpeg),,--disable-ffmpeg) \ + $(if $(CONFIG_PACKAGE_ffserver),,--disable-ffserver) \ + $(if $(CONFIG_FFMPEG_IPV6),,--disable-ipv6) \ + \ + --disable-bsfs \ + --disable-devices \ + --disable-encoders \ + $(FFMPEG_CONFIGURE_ENCODERS) \ + --disable-decoders \ + $(FFMPEG_CONFIGURE_DECODERS) \ + --disable-muxers \ + $(FFMPEG_CONFIGURE_MUXERS) \ + --disable-demuxers \ + $(FFMPEG_CONFIGURE_DEMUXERS) \ + --disable-parsers \ + $(FFMPEG_CONFIGURE_PARSERS) \ + --disable-protocols \ + $(FFMPEG_CONFIGURE_PROTOCOLS) \ + ) endef define Build/Compile @@ -357,74 +253,48 @@ define Build/Compile all install endef -define Build/InstallDev/custom - $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avformat,avutil} $(1)/usr/include/ - $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.{a,so*} $(1)/usr/lib/ - $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avformat,avutil}.pc $(1)/usr/lib/pkgconfig/ -endef - -define Build/InstallDev/full +define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include - $(CP) $(PKG_INSTALL_DIR)/usr/include/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale} $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libav{codec,device,format,util} $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libpostproc $(1)/usr/include/ + $(CP) $(PKG_INSTALL_DIR)/usr/include/libswscale $(1)/usr/include/ $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libav{codec,device,format,util}.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.{a,so*} $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libswscale.{a,so*} $(1)/usr/lib/ $(INSTALL_DIR) $(1)/usr/lib/pkgconfig - $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}.pc $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libav{codec,device,format,util}.pc $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libpostproc.pc $(1)/usr/lib/pkgconfig/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libswscale.pc $(1)/usr/lib/pkgconfig/ endef -Build/InstallDev/mini = $(Build/InstallDev/custom) - -# XXX: attempt at installing "best" dev files available -ifeq ($(BUILD_VARIANT),custom) - # XXX: only install "custom" dev files if -full & -mini are not selected - ifeq ($(CONFIG_PACKAGE_libffmpeg-full)$(CONFIG_PACKAGE_libffmpeg-mini),) - Build/InstallDev = $(Build/InstallDev/custom) - endif -endif -ifeq ($(BUILD_VARIANT),full) - # XXX: always install "full" dev files if -full is selected - Build/InstallDev = $(Build/InstallDev/full) -endif -ifeq ($(BUILD_VARIANT),mini) - # XXX: only install "mini" dev files if -full is not selected - ifeq ($(CONFIG_PACKAGE_libffmpeg-full),) - Build/InstallDev = $(Build/InstallDev/mini) - endif -endif - define Package/ffmpeg/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffmpeg $(1)/usr/bin/ endef -define Package/ffprobe/install - $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffprobe $(1)/usr/bin/ -endef - define Package/ffserver/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/ffserver $(1)/usr/bin/ endef -define Package/libffmpeg-custom/install +define Package/libffmpeg/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avformat,avutil}.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libav{codec,device,format,util}.so.* $(1)/usr/lib/ endef -define Package/libffmpeg-full/install +define Package/libpostproc/install $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib{avcodec,avdevice,avfilter,avformat,avutil,postproc,swscale}.so.* $(1)/usr/lib/ + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libpostproc.so.* $(1)/usr/lib/ endef -Package/libffmpeg-mini/install = $(Package/libffmpeg-custom/install) +define Package/libswscale/install + $(INSTALL_DIR) $(1)/usr/lib + $(CP) $(PKG_INSTALL_DIR)/usr/lib/libswscale.so.* $(1)/usr/lib/ +endef $(eval $(call BuildPackage,ffmpeg)) -$(eval $(call BuildPackage,ffprobe)) $(eval $(call BuildPackage,ffserver)) -$(eval $(call BuildPackage,libffmpeg-custom)) -$(eval $(call BuildPackage,libffmpeg-full)) -$(eval $(call BuildPackage,libffmpeg-mini)) +$(eval $(call BuildPackage,libffmpeg)) +$(eval $(call BuildPackage,libpostproc)) +$(eval $(call BuildPackage,libswscale)) diff --git a/multimedia/ffmpeg/patches/901-fix_libswscale_on_x86.patch b/multimedia/ffmpeg/patches/901-fix_libswscale_on_x86.patch new file mode 100644 index 0000000000..2fcee2ff11 --- /dev/null +++ b/multimedia/ffmpeg/patches/901-fix_libswscale_on_x86.patch @@ -0,0 +1,35 @@ +Index: ffmpeg-0.5.4/libswscale/rgb2rgb.c +=================================================================== +--- ffmpeg-0.5.4.orig/libswscale/rgb2rgb.c 2011-03-17 13:10:27.000000000 +0100 ++++ ffmpeg-0.5.4/libswscale/rgb2rgb.c 2011-10-10 03:35:15.000000000 +0200 +@@ -149,7 +149,7 @@ + #define RENAME(a) a ## _C + #include "rgb2rgb_template.c" + +-#if ARCH_X86 && CONFIG_GPL ++#if ARCH_X86 && CONFIG_GPL && 0 + + //MMX versions + #undef RENAME +Index: ffmpeg-0.5.4/libswscale/swscale_template.c +=================================================================== +--- ffmpeg-0.5.4.orig/libswscale/swscale_template.c 2011-10-10 03:33:19.000000000 +0200 ++++ ffmpeg-0.5.4/libswscale/swscale_template.c 2011-10-10 03:38:37.000000000 +0200 +@@ -2219,7 +2219,7 @@ + } + else // fast bilinear upscale / crap downscale + { +-#if ARCH_X86 && CONFIG_GPL ++#if ARCH_X86 && CONFIG_GPL && 0 + #if HAVE_MMX2 + int i; + #if defined(PIC) +@@ -2492,7 +2492,7 @@ + } + else // fast bilinear upscale / crap downscale + { +-#if ARCH_X86 && CONFIG_GPL ++#if ARCH_X86 && CONFIG_GPL && 0 + #if HAVE_MMX2 + int i; + #if defined(PIC) diff --git a/multimedia/fswebcam/Makefile b/multimedia/fswebcam/Makefile index 8c6167cce7..cfd92019b1 100644 --- a/multimedia/fswebcam/Makefile +++ b/multimedia/fswebcam/Makefile @@ -24,7 +24,7 @@ define Package/fswebcam CATEGORY:=Multimedia TITLE:=fswebcam URL:=http://www.sanslogic.co.uk/fswebcam/ - DEPENDS:=+libgd + DEPENDS:= @!LINUX_2_4 +libgd endef define Package/fswebcam/description diff --git a/multimedia/ftpd-topfield/Makefile b/multimedia/ftpd-topfield/Makefile index c271cb4a0c..6259d4d27c 100644 --- a/multimedia/ftpd-topfield/Makefile +++ b/multimedia/ftpd-topfield/Makefile @@ -1,15 +1,9 @@ -# -# Copyright (C) 2008-2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# include $(TOPDIR)/rules.mk PKG_NAME:=ftpd-topfield PKG_VERSION:=0.7.4 -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/puppy @@ -36,13 +30,9 @@ define Package/ftpd-topfield/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/ftpd $(1)/usr/sbin/ftpd-topfield $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/ftpd-topfield.init $(1)/etc/init.d/ftpd-topfield + $(INSTALL_BIN) ./files/ftpd-topfield.sh $(1)/etc/init.d/ftpd-topfield $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_DATA) ./files/ftpd-topfield.config $(1)/etc/config/ftpd-topfield -endef - -define Package/ftpd-topfield/conffiles -/etc/config/ftpd-topfield + $(INSTALL_DATA) ./files/ftpd-topfield.conf $(1)/etc/config/ftpd-topfield endef $(eval $(call BuildPackage,ftpd-topfield)) diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.config b/multimedia/ftpd-topfield/files/ftpd-topfield.conf similarity index 100% rename from multimedia/ftpd-topfield/files/ftpd-topfield.config rename to multimedia/ftpd-topfield/files/ftpd-topfield.conf diff --git a/multimedia/ftpd-topfield/files/ftpd-topfield.init b/multimedia/ftpd-topfield/files/ftpd-topfield.sh similarity index 100% rename from multimedia/ftpd-topfield/files/ftpd-topfield.init rename to multimedia/ftpd-topfield/files/ftpd-topfield.sh diff --git a/multimedia/gmediaserver/Makefile b/multimedia/gmediaserver/Makefile index ced2554990..926edebf4f 100644 --- a/multimedia/gmediaserver/Makefile +++ b/multimedia/gmediaserver/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gmediaserver PKG_VERSION:=0.13.0 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://savannah.nongnu.org/download/gmediaserver/ @@ -60,8 +60,4 @@ define Package/gmediaserver/install $(INSTALL_BIN) ./files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) endef -define Package/gmediaserver/conffiles -/etc/config/gmediaserver -endef - $(eval $(call BuildPackage,gmediaserver)) diff --git a/multimedia/gst-plugins-bad/Makefile b/multimedia/gst-plugins-bad/Makefile index c792ff1090..5cef2d9c7c 100644 --- a/multimedia/gst-plugins-bad/Makefile +++ b/multimedia/gst-plugins-bad/Makefile @@ -28,6 +28,7 @@ define Package/gstreamer/Default SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= @!LINUX_2_4 endef define Package/gstreamer/description/Default diff --git a/multimedia/gst-plugins-base/Makefile b/multimedia/gst-plugins-base/Makefile index 7916c1c498..d867fd38cb 100644 --- a/multimedia/gst-plugins-base/Makefile +++ b/multimedia/gst-plugins-base/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,27 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst-plugins-base PKG_VERSION:=0.10.29 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-base/ PKG_MD5SUM:=d07e251152cccbaa81807c14cf0fd8c0 PKG_BUILD_DEPENDS:= gstreamer liboil -PKG_CONFIG_DEPENDS:= \ - CONFIG_PACKAGE_gst-mod-alsa \ - CONFIG_PACKAGE_gst-mod-app \ - CONFIG_PACKAGE_gst-mod-audioconvert \ - CONFIG_PACKAGE_gst-mod-audiorate \ - CONFIG_PACKAGE_gst-mod-audioresample \ - CONFIG_PACKAGE_gst-mod-audiotestsrc \ - CONFIG_PACKAGE_gst-mod-gio \ - CONFIG_PACKAGE_gst-mod-ogg \ - CONFIG_PACKAGE_gst-mod-tcp \ - CONFIG_PACKAGE_gst-mod-theora \ - CONFIG_PACKAGE_gst-mod-videotestsrc \ - CONFIG_PACKAGE_gst-mod-volume \ - CONFIG_PACKAGE_gst-mod-vorbis \ PKG_FIXUP:=libtool PKG_INSTALL:=1 @@ -45,6 +31,7 @@ define Package/gstreamer/Default SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= @!LINUX_2_4 endef define Package/gstreamer/description/Default @@ -66,39 +53,23 @@ $(call Package/gstreamer/description/Default) endef -GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst-mod-$(1)),--enable,--disable)-%,$(1)) - GST_VERSION:=0.10 CONFIGURE_ARGS += \ --disable-debug \ --disable-examples \ \ - $(call GST_COND_SELECT,alsa) \ - --disable-alsa-test \ - $(call GST_COND_SELECT,app) \ - $(call GST_COND_SELECT,audioconvert) \ - $(call GST_COND_SELECT,audiorate) \ - $(call GST_COND_SELECT,audioresample) \ - $(call GST_COND_SELECT,audiotestsrc) \ --disable-cdparanoia \ --disable-ffmpegcolorspace \ --disable-freetypetest \ - $(call GST_COND_SELECT,gio) \ --disable-gnome_vfs \ --disable-gst_v4l \ --disable-libvisual \ - $(call GST_COND_SELECT,ogg) \ --disable-oggtest \ --disable-pango \ --disable-subparse \ - $(call GST_COND_SELECT,tcp) \ - $(call GST_COND_SELECT,theora) \ --disable-videorate \ --disable-videoscale \ - $(call GST_COND_SELECT,videotestsrc) \ - $(call GST_COND_SELECT,volume) \ - $(call GST_COND_SELECT,vorbis) \ --disable-vorbistest \ --disable-x \ --disable-xshm \ diff --git a/multimedia/gst-plugins-good/Makefile b/multimedia/gst-plugins-good/Makefile index 080dd80030..f382dd7c6d 100644 --- a/multimedia/gst-plugins-good/Makefile +++ b/multimedia/gst-plugins-good/Makefile @@ -27,6 +27,7 @@ define Package/gstreamer/Default SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= @!LINUX_2_4 endef define Package/gstreamer/description/Default diff --git a/multimedia/gst-plugins-ugly/Makefile b/multimedia/gst-plugins-ugly/Makefile index 1ebdd7ea3b..92d3e810d9 100644 --- a/multimedia/gst-plugins-ugly/Makefile +++ b/multimedia/gst-plugins-ugly/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2011 OpenWrt.org +# Copyright (C) 2009-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,18 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gst-plugins-ugly PKG_VERSION:=0.10.15 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gst-plugins-ugly/ PKG_MD5SUM:=21c034a762a5da252f91640e53bfe457 PKG_BUILD_DEPENDS:= gstreamer gst-plugins-base liboil -PKG_CONFIG_DEPENDS:= \ - CONFIG_PACKAGE_gst-mod-asf \ - CONFIG_PACKAGE_gst-mod-lame \ - CONFIG_PACKAGE_gst-mod-mad \ - CONFIG_PACKAGE_gst-mod-mpeg2dec \ PKG_FIXUP:=autoreconf PKG_INSTALL:=1 @@ -33,6 +28,7 @@ define Package/gstreamer/Default SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= @!LINUX_2_4 endef define Package/gstreamer/description/Default @@ -54,8 +50,6 @@ $(call Package/gstreamer/description/Default) endef -GST_COND_SELECT = $(patsubst %,$(if $(CONFIG_PACKAGE_gst-mod-$(1)),--enable,--disable)-%,$(1)) - GST_VERSION:=0.10 CONFIGURE_ARGS += \ @@ -65,15 +59,12 @@ CONFIGURE_ARGS += \ --disable-a52dec \ --disable-amrnb \ --disable-amrwb \ - $(call GST_COND_SELECT,asf) \ --disable-cdio \ --disable-dvdlpcmdec \ --disable-dvdread \ --disable-dvdsub \ --disable-iec958 \ - $(call GST_COND_SELECT,lame) \ - $(call GST_COND_SELECT,mad) \ - $(call GST_COND_SELECT,mpeg2dec) \ + --disable-mpeg2dec \ --disable-mpegaudioparse \ --disable-mpegstream \ --disable-realmedia \ @@ -84,6 +75,7 @@ CONFIGURE_ARGS += \ \ --without-libiconv-prefix \ --without-libintl-prefix \ + --without-x \ EXTRA_LDFLAGS+= \ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ @@ -126,9 +118,8 @@ define GstBuildPlugin $$(eval $$(call BuildPackage,gst-mod-$(1))) endef -$(eval $(call GstBuildPlugin,asf,ASF demuxer,audio riff rtp rtsp sdp tag,,)) $(eval $(call GstBuildPlugin,lame,MP3 encoder (using LAME),,,+lame-lib)) $(eval $(call GstBuildPlugin,mad,MP3 decoder (using MAD),audio tag,,+libid3tag +libmad)) -$(eval $(call GstBuildPlugin,mpeg2dec,MPEG decoder,video,,+libmpeg2)) +$(eval $(call GstBuildPlugin,asf,ASF demuxer,,,)) $(eval $(call BuildPackage,gst-plugins-ugly)) diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile index e7b0651a29..141c21ffe3 100644 --- a/multimedia/gstreamer/Makefile +++ b/multimedia/gstreamer/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=gstreamer -PKG_VERSION:=0.10.34 +PKG_VERSION:=0.10.29 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://gstreamer.freedesktop.org/src/gstreamer/ -PKG_MD5SUM:=e6938af242cd002be9f0b6441e848d83 +PKG_MD5SUM:=c92d6bce4fc65fa9d5a3ad35cdd1a466 PKG_FIXUP:=libtool PKG_REMOVE_FILES:=autogen.sh aclocal.m4 @@ -28,6 +28,7 @@ define Package/gstreamer/Default SECTION:=multimedia TITLE:=GStreamer URL:=http://gstreamer.freedesktop.org/ + DEPENDS:= @!LINUX_2_4 endef define Package/gstreamer/description/Default diff --git a/multimedia/hasciicam/Makefile b/multimedia/hasciicam/Makefile index a982281b0a..e0fd9c2b35 100644 --- a/multimedia/hasciicam/Makefile +++ b/multimedia/hasciicam/Makefile @@ -8,12 +8,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hasciicam -PKG_VERSION:=1.1.2 +PKG_REV:=262f56eb307f9a0d4bee04d38e0adde7e4257d87 +PKG_VERSION:=20080922 PKG_RELEASE:=1 -PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=ftp://ftp.dyne.org/hasciicam/releases/ -PKG_MD5SUM:=2c7393270e18ab913043683fa3390d8c +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 +PKG_SOURCE_URL:=git://git.dyne.org/$(PKG_NAME).git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_SOURCE_VERSION:=$(PKG_REV) PKG_INSTALL:=1 @@ -24,7 +27,7 @@ define Package/hasciicam CATEGORY:=Multimedia TITLE:=Live ASCII video feeds URL:=http://ascii.dyne.org/ - DEPENDS:= +libaa +ftplib + DEPENDS:= +libaa endef diff --git a/multimedia/icecast/Makefile b/multimedia/icecast/Makefile index 2b44113b93..684bede329 100644 --- a/multimedia/icecast/Makefile +++ b/multimedia/icecast/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=icecast PKG_VERSION:=2.3.2 -PKG_RELEASE:=4 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.us.xiph.org/releases/icecast/ PKG_MD5SUM:=ff516b3ccd2bcc31e68f460cd316093f -PKG_FIXUP:=autoreconf +PKG_FIXUP:=libtool include $(INCLUDE_DIR)/package.mk @@ -74,7 +74,7 @@ define Build/Compile all install endef -define Package/icecast/install +define Package/icecast/install $(INSTALL_DIR) $(1)/etc $(CP) $(PKG_INSTALL_DIR)/etc/icecast.xml $(1)/etc/ $(INSTALL_DIR) $(1)/usr/bin @@ -84,8 +84,4 @@ define Package/icecast/install $(CP) $(PKG_INSTALL_DIR)/usr/share/icecast/web $(1)/usr/share/icecast/ endef -define Package/icecast/conffiles -/etc/icecast.xml -endef - $(eval $(call BuildPackage,icecast)) diff --git a/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch b/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch index 6fa6f0822b..a8cc2676c5 100644 --- a/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch +++ b/multimedia/icecast/patches/001-icecast-2.3.0-tremor.patch @@ -1,5 +1,6 @@ ---- a/src/format_flac.c -+++ b/src/format_flac.c +diff -urN icecast-2.3.2/src/format_flac.c icecast-2.3.2.new/src/format_flac.c +--- icecast-2.3.2/src/format_flac.c 2006-09-21 03:49:16.000000000 +0200 ++++ icecast-2.3.2.new/src/format_flac.c 2008-09-29 19:43:54.000000000 +0200 @@ -18,7 +18,7 @@ #endif @@ -9,8 +10,9 @@ #include typedef struct source_tag source_t; ---- a/src/format_midi.c -+++ b/src/format_midi.c +diff -urN icecast-2.3.2/src/format_midi.c icecast-2.3.2.new/src/format_midi.c +--- icecast-2.3.2/src/format_midi.c 2006-09-21 03:49:16.000000000 +0200 ++++ icecast-2.3.2.new/src/format_midi.c 2008-09-29 19:44:15.000000000 +0200 @@ -18,7 +18,7 @@ #endif @@ -20,8 +22,9 @@ #include typedef struct source_tag source_t; ---- a/src/format_ogg.c -+++ b/src/format_ogg.c +diff -urN icecast-2.3.2/src/format_ogg.c icecast-2.3.2.new/src/format_ogg.c +--- icecast-2.3.2/src/format_ogg.c 2008-04-19 15:45:30.000000000 +0200 ++++ icecast-2.3.2.new/src/format_ogg.c 2008-09-29 19:44:32.000000000 +0200 @@ -24,7 +24,7 @@ #include #include @@ -31,8 +34,9 @@ #include "refbuf.h" #include "source.h" ---- a/src/format_ogg.h -+++ b/src/format_ogg.h +diff -urN icecast-2.3.2/src/format_ogg.h icecast-2.3.2.new/src/format_ogg.h +--- icecast-2.3.2/src/format_ogg.h 2006-09-21 03:49:16.000000000 +0200 ++++ icecast-2.3.2.new/src/format_ogg.h 2008-09-29 19:44:38.000000000 +0200 @@ -18,7 +18,7 @@ #ifndef __FORMAT_OGG_H__ #define __FORMAT_OGG_H__ @@ -42,8 +46,9 @@ #include "refbuf.h" #include "format.h" ---- a/src/format_speex.c -+++ b/src/format_speex.c +diff -urN icecast-2.3.2/src/format_speex.c icecast-2.3.2.new/src/format_speex.c +--- icecast-2.3.2/src/format_speex.c 2007-10-04 04:07:57.000000000 +0200 ++++ icecast-2.3.2.new/src/format_speex.c 2008-09-29 19:44:56.000000000 +0200 @@ -18,7 +18,7 @@ #endif @@ -53,8 +58,9 @@ #include typedef struct source_tag source_t; ---- a/src/format_theora.c -+++ b/src/format_theora.c +diff -urN icecast-2.3.2/src/format_theora.c icecast-2.3.2.new/src/format_theora.c +--- icecast-2.3.2/src/format_theora.c 2006-09-21 03:49:16.000000000 +0200 ++++ icecast-2.3.2.new/src/format_theora.c 2008-09-29 19:46:36.000000000 +0200 @@ -18,7 +18,7 @@ #endif @@ -64,8 +70,9 @@ #include typedef struct source_tag source_t; ---- a/src/format_vorbis.c -+++ b/src/format_vorbis.c +diff -urN icecast-2.3.2/src/format_vorbis.c icecast-2.3.2.new/src/format_vorbis.c +--- icecast-2.3.2/src/format_vorbis.c 2007-09-13 00:40:55.000000000 +0200 ++++ icecast-2.3.2.new/src/format_vorbis.c 2008-09-29 19:47:25.000000000 +0200 @@ -18,8 +18,8 @@ #endif @@ -77,8 +84,9 @@ #include #include ---- a/src/source.c -+++ b/src/source.c +diff -urN icecast-2.3.2/src/source.c icecast-2.3.2.new/src/source.c +--- icecast-2.3.2/src/source.c 2008-05-15 15:25:04.000000000 +0200 ++++ icecast-2.3.2.new/src/source.c 2008-09-29 19:47:40.000000000 +0200 @@ -19,7 +19,7 @@ #include #include @@ -88,21 +96,28 @@ #include #ifndef _WIN32 ---- a/src/format_kate.c -+++ b/src/format_kate.c -@@ -19,7 +19,7 @@ +--- icecast-2.3.2/configure 2008-05-27 02:21:57.000000000 +0200 ++++ icecast-2.3.2.new/configure 2008-09-29 20:05:43.000000000 +0200 +@@ -22199,7 +22199,7 @@ + if test "${xt_cv_lib_ogg+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else +- OGG_LIBS="-logg" ++ OGG_LIBS="-lvorbisidec" - #include - #include + # + # check if the installed Ogg is sufficiently new. +@@ -22261,7 +22261,7 @@ + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ -#include +#include - #ifdef HAVE_KATE - #include - #endif ---- a/m4/vorbis.m4 -+++ b/m4/vorbis.m4 -@@ -38,9 +38,9 @@ if test "x$vorbis_prefix" != "x$ogg_pref - ]) + int + main () + { +@@ -22410,9 +22410,9 @@ + fi -VORBIS_LIBS="-lvorbis" @@ -114,42 +129,31 @@ xt_save_LIBS="$LIBS" xt_save_LDFLAGS="$LDFLAGS" -@@ -58,18 +58,6 @@ AC_TRY_LINK_FUNC(ogg_stream_init, [xt_li - ) - ]) - --if test "x$xt_lib_vorbis" = "xok"; then --# --# Now check if the installed Vorbis is sufficiently new. --# --AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ +@@ -22537,14 +22537,13 @@ + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + -#include -#include -- ], [ ++#include + + int + main () + { + -struct ovectl_ratemanage_arg a; --])],,[xt_lib_vorbis="old version found"]) --AC_MSG_RESULT([$xt_lib_vorbis]) --fi - CPPFLAGS="$xt_save_CPPFLAGS" - LIBS="$xt_save_LIBS" - LDFLAGS="$xt_save_LDFLAGS" ---- a/m4/ogg.m4 -+++ b/m4/ogg.m4 -@@ -29,7 +29,7 @@ XIPH_GCC_WARNING([-I$ogg_prefix/include] - ]) - AC_CACHE_CHECK([for libogg], xt_cv_lib_ogg, - [dnl --OGG_LIBS="-logg" -+OGG_LIBS="-lvorbisidec" ++/*struct ovectl_ratemanage_arg a;*/ - # - # check if the installed Ogg is sufficiently new. -@@ -42,7 +42,7 @@ LIBS="$LIBS $OGG_LIBS" - LDFLAGS="$LDFLAGS $OGG_LDFLAGS" - AC_TRY_LINK_FUNC(ogg_sync_init, - [ xt_cv_lib_ogg=ok ], -- [ AC_TRY_LINK([#include ],, -+ [ AC_TRY_LINK([#include ],, - [ xt_cv_lib_ogg="pre v1.0, needs updating" ], - [ xt_cv_lib_ogg="not found" ]) - ]) + ; + return 0; +--- icecast-2.3.2/src/format_kate.c 2008-04-18 18:29:28.000000000 +0200 ++++ icecast-2.3.2.new/src/format_kate.c 2008-10-01 08:27:00.000000000 +0200 +@@ -19,7 +19,7 @@ + + #include + #include +-#include ++#include + #ifdef HAVE_KATE + #include + #endif diff --git a/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch b/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch index 8da6e33b65..15bb53483a 100644 --- a/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch +++ b/multimedia/icecast/patches/010-fix_libcurl_test_crap.patch @@ -1,6 +1,6 @@ --- a/m4/xiph_curl.m4 +++ b/m4/xiph_curl.m4 -@@ -52,7 +52,7 @@ AC_CHECK_HEADERS([curl/curl.h],, curl_ok +@@ -52,7 +52,7 @@ AC_MSG_CHECKING(for libcurl) if test "$curl_ok" = "yes" then diff --git a/multimedia/kissdx/Makefile b/multimedia/kissdx/Makefile index dbd94ecd42..854732f294 100644 --- a/multimedia/kissdx/Makefile +++ b/multimedia/kissdx/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2011 OpenWrt.org +# Copyright (C) 2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=kissdx PKG_VERSION:=0.14.0.b1a -PKG_RELEASE:=9 +PKG_RELEASE:=7 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).zip PKG_SOURCE_URL:=http://kissdx.vidartysse.net @@ -52,8 +52,4 @@ define Package/kissdx/install $(INSTALL_BIN) ./files/kissdx.init $(1)/etc/init.d/kissdx endef -define Package/kissdx/conffiles -/etc/config/kissdx -endef - $(eval $(call BuildPackage,kissdx)) diff --git a/multimedia/kissdx/files/kissdx.init b/multimedia/kissdx/files/kissdx.init index 847be81917..c3b5dcb145 100755 --- a/multimedia/kissdx/files/kissdx.init +++ b/multimedia/kissdx/files/kissdx.init @@ -2,9 +2,6 @@ # Copyright (C) 2008 OpenWrt.org START=65 - -SERVICE_USE_PID=1 - CFGFILE=/tmp/kissdx.conf create_configfile() { @@ -101,9 +98,9 @@ create_configfile() { start () { config_load kissdx create_configfile - service_start /usr/bin/kissdx -c $CFGFILE -d + /usr/bin/kissdx -c $CFGFILE -d } stop() { - service_stop /usr/bin/kissdx + killall -9 kissdx } diff --git a/multimedia/minidlna/Makefile b/multimedia/minidlna/Makefile index b9bee58f82..e027dbf1a4 100644 --- a/multimedia/minidlna/Makefile +++ b/multimedia/minidlna/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2010-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. @@ -8,26 +8,29 @@ include $(TOPDIR)/rules.mk PKG_NAME:=minidlna -PKG_VERSION:=1.0.22 -PKG_RELEASE:=2 +PKG_VERSION:=1.0.19 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION)_src.tar.gz PKG_SOURCE_URL:=@SF/minidlna -PKG_MD5SUM:=3de2f6b54f43bb998dfad3c8fa75cef3 +PKG_MD5SUM:=8bb5f2c0abc009e16039d7deecf09cf6 PKG_BUILD_PARALLEL:=0 -include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/nls.mk +MAKE_VARS += \ + ICONV_PREFIX="$(ICONV_PREFIX)" \ + INTL_PREFIX="$(INTL_PREFIX)" + define Package/minidlna SECTION:=multimedia CATEGORY:=Multimedia TITLE:=UPnP A/V & DLNA Media Server URL:=http://minidlna.sourceforge.net/ DEPENDS:= +libpthread +libexif +libjpeg +libsqlite3 +libffmpeg \ - +libid3tag +libflac +libvorbis +libuuid \ + +@FFMPEG_MINIDLNA_SUPPORT +libid3tag +libflac +libvorbis +libuuid \ $(ICONV_DEPENDS) $(INTL_DEPENDS) endef @@ -40,40 +43,6 @@ define Package/minidlna/conffiles /etc/minidlna.conf endef -TARGET_CPPFLAGS += \ - -I$(STAGING_DIR)/usr/include \ - -I$(STAGING_DIR)/usr/include/FLAC \ - -I$(STAGING_DIR)/usr/include/libavcodec \ - -I$(STAGING_DIR)/usr/include/libavformat \ - -I$(STAGING_DIR)/usr/include/libavutil \ - -I$(STAGING_DIR)/usr/include/libexif \ - -I$(STAGING_DIR)/usr/include/uuid \ - -I$(STAGING_DIR)/usr/include/vorbis \ - -I$(ICONV_PREFIX)/include \ - -I$(INTL_PREFIX)/include \ - -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ - -TARGET_LDFLAGS += \ - -L$(ICONV_PREFIX)/lib \ - -L$(INTL_PREFIX)/lib \ - -Wl,-rpath-link=$(STAGING_DIR)/usr/lib \ - -MAKE_FLAGS +=\ - CFLAGS="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ - LDFLAGS="$(TARGET_LDFLAGS)" \ - ICONV_LIBS="-liconv" \ - -MAKE_VARS +=\ - PREFIX="$(STAGING_DIR)/usr" \ - ICONV_PREFIX="$(ICONV_PREFIX)" \ - INTL_PREFIX="$(INTL_PREFIX)" \ - OS_NAME="OpenWrt Linux" \ - OS_VERSION="$(LINUX_VERSION)" \ - OS_URL="http://openwrt.org/" \ - DB_PATH="/var/run/minidlna" \ - LOG_PATH="/var/log" \ - - define Package/minidlna/install $(INSTALL_DIR) $(1)/etc $(INSTALL_DATA) $(PKG_BUILD_DIR)/minidlna.conf $(1)/etc/ diff --git a/multimedia/minidlna/files/minidlna.init b/multimedia/minidlna/files/minidlna.init index 64f9d3220d..2218f4621c 100644 --- a/multimedia/minidlna/files/minidlna.init +++ b/multimedia/minidlna/files/minidlna.init @@ -2,15 +2,14 @@ # Copyright (C) 2010 OpenWrt.org START=50 - -SERVICE_USE_PID=1 +BIN=/usr/bin/minidlna +PID=/var/run/minidlna.pid +SSD=start-stop-daemon start() { - mkdir -m 0755 -p /var/log - mkdir -m 0755 -p /var/run/minidlna - service_start /usr/bin/minidlna + $SSD -p $PID -S -x $BIN -- -P $PID -R } stop() { - service_stop /usr/bin/minidlna + $SSD -p $PID -K -s SIGINT } diff --git a/multimedia/minidlna/patches/010-genconfig-checks.patch b/multimedia/minidlna/patches/010-genconfig-checks.patch index 7e3be031b7..b3dd305566 100644 --- a/multimedia/minidlna/patches/010-genconfig-checks.patch +++ b/multimedia/minidlna/patches/010-genconfig-checks.patch @@ -1,29 +1,6 @@ --- a/genconfig.sh +++ b/genconfig.sh -@@ -24,14 +24,18 @@ RM="rm -f" - CONFIGFILE="config.h" - CONFIGMACRO="__CONFIG_H__" - -+PREFIX="${PREFIX:-/usr}" -+ICONV_PREFIX="${ICONV_PREFIX:-$PREFIX}" -+INTL_PREFIX="${INTL_PREFIX:-$PREFIX}" -+ - # Database path --DB_PATH="/tmp/minidlna" -+DB_PATH="${DB_PATH:-/tmp/minidlna}" - # Log path --LOG_PATH="${DB_PATH}" -+LOG_PATH="${LOG_PATH:-$DB_PATH}" - - # detecting the OS name and version --OS_NAME=`uname -s` --OS_VERSION=`uname -r` -+OS_NAME="${OS_NAME:-$(uname -s)}" -+OS_VERSION="${OS_VERSION:-$(uname -r)}" - TIVO="/*#define TIVO_SUPPORT*/" - NETGEAR="/*#define NETGEAR*/" - READYNAS="/*#define READYNAS*/" -@@ -41,22 +45,22 @@ ${RM} ${CONFIGFILE} +@@ -41,22 +41,22 @@ ${RM} ${CONFIGFILE} # Detect if there are missing headers # NOTE: This check only works with a normal distro @@ -43,50 +20,22 @@ -[ ! -e "/usr/include/ffmpeg/avcodec.h" -a \ - ! -e "/usr/include/libavcodec/avcodec.h" -a \ - ! -e "/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" -+[ ! -e "${PREFIX}/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" -+[ ! -e "${PREFIX}/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" -+[ ! -e "${PREFIX}/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" -+[ ! -e "${PREFIX}/include/id3tag.h" ] && MISSING="libid3tag $MISSING" -+[ ! -e "${PREFIX}/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" -+[ ! -e "${PREFIX}/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" -+[ ! -e "${PREFIX}/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" -+[ ! -e "${PREFIX}/include/ffmpeg/avutil.h" -a \ -+ ! -e "${PREFIX}/include/libavutil/avutil.h" -a \ -+ ! -e "${PREFIX}/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" -+[ ! -e "${PREFIX}/include/ffmpeg/avformat.h" -a \ -+ ! -e "${PREFIX}/include/libavformat/avformat.h" -a \ -+ ! -e "${PREFIX}/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" -+[ ! -e "${PREFIX}/include/ffmpeg/avcodec.h" -a \ -+ ! -e "${PREFIX}/include/libavcodec/avcodec.h" -a \ -+ ! -e "${PREFIX}/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/sqlite3.h" ] && MISSING="libsqlite3 $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/jpeglib.h" ] && MISSING="libjpeg $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/libexif/exif-loader.h" ] && MISSING="libexif $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/id3tag.h" ] && MISSING="libid3tag $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/ogg/ogg.h" ] && MISSING="libogg $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/vorbis/codec.h" ] && MISSING="libvorbis $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/FLAC/metadata.h" ] && MISSING="libflac $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/ffmpeg/avutil.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/libavutil/avutil.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/ffmpeg/libavutil/avutil.h" ] && MISSING="libavutil $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/ffmpeg/avformat.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/libavformat/avformat.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/ffmpeg/libavformat/avformat.h" ] && MISSING="libavformat $MISSING" ++[ ! -e "${STAGING_DIR}/usr/include/ffmpeg/avcodec.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/libavcodec/avcodec.h" -a \ ++ ! -e "${STAGING_DIR}/usr/include/ffmpeg/libavcodec/avcodec.h" ] && MISSING="libavcodec $MISSING" if [ -n "$MISSING" ]; then echo -e "\nERROR! Cannot continue." echo -e "The following required libraries are either missing, or are missing development headers:\n" -@@ -152,8 +156,7 @@ case $OS_NAME in - fi - ;; - *) -- echo "Unknown OS : $OS_NAME" -- exit 1 -+ echo "WARNING: Unknown OS : $OS_NAME" 1>&2 - ;; - esac - -@@ -184,7 +187,7 @@ fi - echo "" >> ${CONFIGFILE} - - echo "/* Enable if the system iconv.h exists. ID3 tag reading in various character sets will not work properly otherwise. */" >> ${CONFIGFILE} --if [ -f /usr/include/iconv.h ]; then -+if [ -f ${ICONV_PREFIX}/include/iconv.h ]; then - echo "#define HAVE_ICONV_H" >> ${CONFIGFILE} - else - echo -e "\nWARNING!! Iconv support not found. ID3 tag reading may not work." -@@ -193,7 +196,7 @@ fi - echo "" >> ${CONFIGFILE} - - echo "/* Enable if the system libintl.h exists for NLS support. */" >> ${CONFIGFILE} --if [ -f /usr/include/libintl.h ]; then -+if [ -f ${INTL_PREFIX}/include/libintl.h ]; then - echo "#define ENABLE_NLS" >> ${CONFIGFILE} - else - echo "/*#define ENABLE_NLS*/" >> ${CONFIGFILE} diff --git a/multimedia/minidlna/patches/020-makefile-tweaks.patch b/multimedia/minidlna/patches/020-makefile-tweaks.patch index 887ebe45c7..18d901cf79 100644 --- a/multimedia/minidlna/patches/020-makefile-tweaks.patch +++ b/multimedia/minidlna/patches/020-makefile-tweaks.patch @@ -1,43 +1,41 @@ --- a/Makefile +++ b/Makefile -@@ -10,19 +10,23 @@ - # or : - # $ make install - # -+PREFIX ?= /usr -+ICONV_PREFIX ?= $(PREFIX) -+INTL_PREFIX ?= $(PREFIX) +@@ -13,9 +13,22 @@ #CFLAGS = -Wall -O -D_GNU_SOURCE -g -DDEBUG #CFLAGS = -Wall -g -Os -D_GNU_SOURCE CFLAGS = -Wall -g -O3 -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 \ - -I/usr/include/ffmpeg \ - -I/usr/include/libavutil -I/usr/include/libavcodec -I/usr/include/libavformat \ - -I/usr/include/ffmpeg/libavutil -I/usr/include/ffmpeg/libavcodec -I/usr/include/ffmpeg/libavformat -+ -I$(PREFIX)/include/ffmpeg \ -+ -I$(PREFIX)/include/libavutil -I$(PREFIX)/include/libavcodec -I$(PREFIX)/include/libavformat \ -+ -I$(PREFIX)/include/ffmpeg/libavutil -I$(PREFIX)/include/ffmpeg/libavcodec -I$(PREFIX)/include/ffmpeg/libavformat ++ -I$(STAGING_DIR)/usr/include \ ++ -I$(STAGING_DIR)/usr/include/FLAC \ ++ -I$(STAGING_DIR)/usr/include/libavcodec \ ++ -I$(STAGING_DIR)/usr/include/libavformat \ ++ -I$(STAGING_DIR)/usr/include/libavutil \ ++ -I$(STAGING_DIR)/usr/include/libexif \ ++ -I$(STAGING_DIR)/usr/include/uuid \ ++ -I$(STAGING_DIR)/usr/include/vorbis \ ++ -I$(ICONV_PREFIX)/include \ ++ -I$(INTL_PREFIX)/include ++LDFLAGS = -L$(STAGING_DIR)/usr/lib \ ++ -L$(ICONV_PREFIX)/lib \ ++ -L$(INTL_PREFIX)/include \ ++ -Wl,-rpath=$(STAGING_DIR)/usr/lib \ ++ -Wl,-rpath-link=$(STAGING_DIR)/usr/lib + #STATIC_LINKING: CFLAGS += -DSTATIC #STATIC_LINKING: LDFLAGS = -static CC = gcc - RM = rm -f - INSTALL = install - --INSTALLPREFIX ?= $(DESTDIR)/usr -+INSTALLPREFIX ?= $(DESTDIR)$(PREFIX) - SBININSTALLDIR = $(INSTALLPREFIX)/sbin - ETCINSTALLDIR = $(DESTDIR)/etc - -@@ -37,7 +41,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes +@@ -37,7 +50,7 @@ BASEOBJS = minidlna.o upnphttp.o upnpdes ALLOBJS = $(BASEOBJS) $(LNXOBJS) -LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -+LIBS = -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -luuid $(ICONV_LIBS) ++LIBS = -liconv -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -luuid #STATIC_LINKING: LIBS = -lvorbis -logg -lm -lsqlite3 -lpthread -lexif -ljpeg -lFLAC -lm -lid3tag -lz -lavformat -lavutil -lavcodec -lm TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o -@@ -62,7 +66,7 @@ install: minidlna +@@ -62,7 +75,7 @@ install: minidlna $(INSTALL) -d $(ETCINSTALLDIR) $(INSTALL) --mode=0644 minidlna.conf $(ETCINSTALLDIR) diff --git a/multimedia/minidlna/patches/040-configuration-tweak.patch b/multimedia/minidlna/patches/040-configuration-tweak.patch index 2a68610167..cb46849729 100644 --- a/multimedia/minidlna/patches/040-configuration-tweak.patch +++ b/multimedia/minidlna/patches/040-configuration-tweak.patch @@ -3,7 +3,7 @@ @@ -2,7 +2,7 @@ port=8200 - # network interfaces to serve, comma delimited + # network interface to bind to (this is the only interface that will serve files) -#network_interface=eth0 +network_interface=br-lan @@ -22,3 +22,12 @@ # set this if you would like to specify the directory where you want MiniDLNA to store its database and album art cache #db_dir=/var/cache/minidlna +@@ -28,7 +28,7 @@ album_art_names=Cover.jpg/cover.jpg/Albu + + # set this to no to disable inotify monitoring to automatically discover new files + # note: the default is yes +-inotify=yes ++inotify=no + + # set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO + enable_tivo=no diff --git a/multimedia/mjpg-streamer/Makefile b/multimedia/mjpg-streamer/Makefile index 9593f98183..957813880a 100644 --- a/multimedia/mjpg-streamer/Makefile +++ b/multimedia/mjpg-streamer/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,9 +8,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=mjpg-streamer -PKG_REV:=148 +PKG_REV:=136 PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=https://mjpg-streamer.svn.sourceforge.net/svnroot/mjpg-streamer/mjpg-streamer/ @@ -24,7 +24,7 @@ define Package/mjpg-streamer SECTION:=multimedia CATEGORY:=Multimedia TITLE:=MJPG-streamer - DEPENDS:=+libpthread +libjpeg + DEPENDS:=@!LINUX_2_4 +libpthread +libjpeg URL:=http://mjpg-streamer.wiki.sourceforge.net/ endef @@ -42,14 +42,10 @@ define Package/mjpg-streamer/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/mjpg-streamer.init $(1)/etc/init.d/mjpg-streamer $(INSTALL_DIR) $(1)/usr/lib - $(CP) $(foreach input_plugin,file uvc,$(PKG_BUILD_DIR)/input_$(input_plugin).so) $(1)/usr/lib - $(CP) $(foreach output_plugin,http file,$(PKG_BUILD_DIR)/output_$(output_plugin).so) $(1)/usr/lib + $(CP) $(foreach input_plugin,file uvc gspcav1,$(PKG_BUILD_DIR)/input_$(input_plugin).so) $(1)/usr/lib + $(CP) $(foreach output_plugin,http file autofocus,$(PKG_BUILD_DIR)/output_$(output_plugin).so) $(1)/usr/lib $(INSTALL_DIR) $(1)/etc/hotplug.d/usb $(INSTALL_DATA) ./files/mjpg-streamer.hotplug $(1)/etc/hotplug.d/usb/20-mjpg-streamer endef -define Package/mjpg-streamer/conffiles -/etc/config/mjpg-streamer -endef - $(eval $(call BuildPackage,mjpg-streamer)) diff --git a/multimedia/mjpg-streamer/files/mjpg-streamer.config b/multimedia/mjpg-streamer/files/mjpg-streamer.config index 5691c3ae8f..1b1f7d7f98 100644 --- a/multimedia/mjpg-streamer/files/mjpg-streamer.config +++ b/multimedia/mjpg-streamer/files/mjpg-streamer.config @@ -1,6 +1,6 @@ config mjpg-streamer core - option enabled "0" option device "/dev/video0" option resolution "640x480" option fps "5" option port "8080" + option enabled "true" diff --git a/multimedia/mjpg-streamer/files/mjpg-streamer.init b/multimedia/mjpg-streamer/files/mjpg-streamer.init index 5a45968525..7b92c899d9 100644 --- a/multimedia/mjpg-streamer/files/mjpg-streamer.init +++ b/multimedia/mjpg-streamer/files/mjpg-streamer.init @@ -1,56 +1,23 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2009-2011 OpenWrt.org - +# Copyright (C) 2009 OpenWrt.org START=50 -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 - -PROG=/usr/bin/mjpg_streamer - -error() { - echo "${initscript}:" "$@" 1>&2 -} - -section_enabled() { - config_get_bool enabled "$1" 'enabled' 0 - [ $enabled -gt 0 ] -} - -start_instance() { - local s="$1" - - section_enabled "$s" || return 1 - - config_get device "$s" 'device' - config_get resolution "$s" 'resolution' - config_get fps "$s" 'fps' - config_get port "$s" 'port' - - [ -c "$device" ] || { - error "device '$device' does not exist" - return 1 - } - - service_start /usr/bin/mjpg_streamer --input "input_uvc.so \ - --device $device --fps $fps --resolution $resolution" \ - --output "output_http.so --port $port" -} - -stop_instance() { - local s="$1" - - section_enabled "$s" || return 1 - - service_stop /usr/bin/mjpg_streamer -} +SSD=start-stop-daemon +NAME=mjpg_streamer +PIDF=/var/run/$NAME.pid +PROG=/usr/bin/$NAME start() { - config_load 'mjpg-streamer' - config_foreach start_instance 'mjpg-streamer' + config_load mjpg-streamer + config_get device core device + config_get resolution core resolution + config_get fps core fps + config_get port core port + config_get_bool enabled core enabled + [ $enabled -gt 0 -a -c $device ] && sleep 3 && $SSD -S -m -p $PIDF -q -x $PROG -- --input "input_uvc.so --device $device --fps $fps --resolution $resolution" --output "output_http.so --port $port" & } stop() { - config_load 'mjpg-streamer' - config_foreach stop_instance 'mjpg-streamer' + $SSD -K -p $PIDF } + diff --git a/sound/mocp/Makefile b/multimedia/mocp/Makefile similarity index 97% rename from sound/mocp/Makefile rename to multimedia/mocp/Makefile index 58428ab63a..a95a64d192 100644 --- a/sound/mocp/Makefile +++ b/multimedia/mocp/Makefile @@ -13,6 +13,7 @@ PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.daper.net/pub/soft/moc/stable/ + PKG_MD5SUM:=647c770a5542a4ae5437386807a89796 PKG_FIXUP:=libtool @@ -26,7 +27,6 @@ define Package/moc CATEGORY:=Sound DEPENDS:=+libcurl +BUILD_PATENTED:libmad +libvorbis $(ICONV_DEPENDS) +alsa-utils +libid3tag +libflac +libsamplerate +PACKAGE_libncursesw:libncursesw +!PACKAGE_libncursesw:libncurses +libffmpeg TITLE:=Music On Console - URL:=http://moc.daper.net/ endef define Package/moc/description diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index 0909c24559..867333ffeb 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=motion -PKG_VERSION:=20110826-051001 -PKG_RELEASE:=2 +PKG_VERSION:=3.2.11.1 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.lavrsen.dk/sources/motion-daily \ @SF/motion -PKG_MD5SUM:=e703fce57ae2215cb05f25e3027f5818 +PKG_MD5SUM:=4e729f129d8f9b9abaed5121c3cd0037 PKG_INSTALL:=1 @@ -33,13 +33,10 @@ define Package/motion/conffiles endef CONFIGURE_ARGS+= \ - --without-optimizecpu \ --without-ffmpeg \ --without-jpeg-mmx \ - --without-sdl \ --without-mysql \ --without-pgsql \ - --without-sqlite3 \ define Package/motion/install $(INSTALL_DIR) $(1)/etc diff --git a/multimedia/qc-usb/Makefile b/multimedia/qc-usb/Makefile index 07248dc425..6f6f0bda08 100644 --- a/multimedia/qc-usb/Makefile +++ b/multimedia/qc-usb/Makefile @@ -38,7 +38,7 @@ define KernelPackage/video-quickcam $(call Package/qc-usb/Default) SUBMENU:=Video Support TITLE:=QuickCam Express USB webcam support - DEPENDS:=@USB_SUPPORT @LINUX_2_6_25||LINUX_2_6_27||LINUX_2_6_28 +kmod-usb-core +kmod-video-core + DEPENDS:=@USB_SUPPORT @LINUX_2_4||LINUX_2_6_25||LINUX_2_6_27||LINUX_2_6_28 +kmod-usb-core +kmod-video-core FILES:=$(PKG_BUILD_DIR)/quickcam.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,90,quickcam) endef diff --git a/multimedia/spca5xx-view/Makefile b/multimedia/spca5xx-view/Makefile index 1a8b830c0b..336d4ae938 100644 --- a/multimedia/spca5xx-view/Makefile +++ b/multimedia/spca5xx-view/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=spca5xx-view PKG_VERSION:=1 -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE:=spca5xx-view.tar.bz2 PKG_SOURCE_URL:=http://www.acmesystems.it/download/owrt @@ -47,8 +47,4 @@ define Package/spca5xx-view/install $(INSTALL_BIN) ./files/servfox.init $(1)/etc/init.d/servfox endef -define Package/spca5xx-view/conffiles -/etc/config/servfox -endef - $(eval $(call BuildPackage,spca5xx-view)) diff --git a/multimedia/spca5xx-view/files/servfox.config b/multimedia/spca5xx-view/files/servfox.config index 34f4f7fc4b..3138bba88b 100644 --- a/multimedia/spca5xx-view/files/servfox.config +++ b/multimedia/spca5xx-view/files/servfox.config @@ -1,4 +1,4 @@ config servfox - option device '/dev/video0' - option port '7070' - option resolution '640x480' + option Device '/dev/video0' + option Port '7070' + option Resolution '640x480' diff --git a/multimedia/spca5xx-view/files/servfox.init b/multimedia/spca5xx-view/files/servfox.init index 22a4aa25d6..072e595b3f 100644 --- a/multimedia/spca5xx-view/files/servfox.init +++ b/multimedia/spca5xx-view/files/servfox.init @@ -1,25 +1,31 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=90 -satrt_instance() { - local cfg="$1" +config_cb() { + local cfg="$CONFIG_SECTION" local res local dev local port + local cfgt + config_get cfgt "$cfg" TYPE + + case "$cfgt" in + servfox) + config_get res $cfg Resolution + config_get dev $cfg Device + config_get port $cfg Port - config_get res "$cfg" 'resolution' - config_get dev "$cfg" 'device' - config_get port "$cfg" 'port' - service_start bin/servfox ${dev:+-d $dev} ${res:+-s $res} ${port:+-w $port} + SERVFOX_ARGS="${dev:+-d $dev} ${res:+-s $res} ${port:+-w $port}" + ;; + esac } start() { - config_load 'servfox' - config_foreach start_instance 'servfox' + config_load servfox + /bin/servfox $SERVFOX_ARGS & } stop() { - service_stop /bin/servfox + killall servfox } diff --git a/multimedia/ushare/Makefile b/multimedia/ushare/Makefile index 26bf5f7442..471f5cf5f1 100644 --- a/multimedia/ushare/Makefile +++ b/multimedia/ushare/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ushare PKG_VERSION:=1.1a -PKG_RELEASE:=4 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://ushare.geexbox.org/releases/ @@ -57,7 +57,6 @@ define Build/Configure endef define Package/ushare/conffiles -/etc/config/ushare /etc/ushare.conf endef diff --git a/multimedia/ushare/files/ushare.config b/multimedia/ushare/files/ushare.config index d7d0dce186..b220eb2da5 100644 --- a/multimedia/ushare/files/ushare.config +++ b/multimedia/ushare/files/ushare.config @@ -1,9 +1,9 @@ config 'ushare' - option 'enabled' '0' - option 'user' 'nobody' + option 'username' 'nobody' option 'servername' 'OpenWrt' option 'interface' 'br-lan' option 'options' '' option 'content_directories' '/tmp' option 'disable_telnet' '1' option 'disable_webif' '1' + option 'enabled' '0' diff --git a/multimedia/ushare/files/ushare.init b/multimedia/ushare/files/ushare.init index db661d1982..457f582db6 100644 --- a/multimedia/ushare/files/ushare.init +++ b/multimedia/ushare/files/ushare.init @@ -2,8 +2,8 @@ # Copyright (C) 2008 OpenWrt.org START=50 -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 +BIN=/usr/bin/ushare +SSD=start-stop-daemon append_bool() { local section="$1" @@ -23,46 +23,36 @@ append_string() { [ -n "$_val" ] && append args "$3 $_val" } -section_enabled() { - config_get_bool enabled "$1" 'enabled' 0 - [ $enabled -gt 0 ] -} - -start_instance() { +start_service() { local section="$1" - - section_enabled "$section" || return 1 - args="" - config_get uid "$section" 'user' - config_get servername "$section" 'servername' - config_get interface "$section" 'interface' - config_get options "$section" 'options' - config_get content_directories "$section" 'content_directories' - append_bool "$section" 'disable_webif' '-w' - append_bool "$section" 'disable_telnet' '-t' - - SERVICE_UID="$uid" \ - service_start /usr/bin/ushare -n "${servername:-OpenWrt}" -i "${interface:-br-lan}" -c "${content_directories:-/tmp}" $args ${options} + config_get username "$section" "username" + config_get servername "$section" "servername" + config_get interface "$section" "interface" + config_get options "$section" "options" + config_get content_directories "$section" "content_directories" + append_bool "$section" "disable_webif" "-w" + append_bool "$section" "disable_telnet" "-t" + config_get_bool "enabled" "$section" "enabled" '1' + + [ "$enabled" -gt 0 ] && $SSD -x $BIN -c ${username:-nobody} -S -b -p /var/run/ushare.pid -m -- -n "${servername:-OpenWrt}" -i ${interface:-br-lan} -c ${content_directories:-/tmp} $args ${options} & } -stop_instance() { +stop_service() { local section="$1" + args="" + config_get username "$section" "username" - section_enabled "$section" || return 1 - - config_get uid "$section" "user" - - SERVICE_UID="$uid" \ - service_stop /usr/bin/ushare + $SSD -K -x $BIN -c ${username:-nobody} -s 2 -p /var/run/ushare.pid } start() { - config_load 'ushare' - config_foreach start_instance 'ushare' + config_load ushare + config_foreach start_service ushare } stop() { - config_load 'ushare' - config_foreach stop_instance 'ushare' + config_load ushare + config_foreach stop_service ushare } + diff --git a/net/amwall/Makefile b/net/amwall/Makefile index 3acf3d4a0d..8d94454c5f 100644 --- a/net/amwall/Makefile +++ b/net/amwall/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=amwall PKG_VERSION:=0.1.0 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.amselinux.net/source/ @@ -49,8 +49,4 @@ define Package/amwall/install $(CP) $(PKG_INSTALL_DIR)/etc/amsel* $(1)/etc/ endef -define Package/amwall/conffiles -/etc/amsel/firewall.conf -endef - $(eval $(call BuildPackage,amwall)) diff --git a/net/apcupsd/Makefile b/net/apcupsd/Makefile index d7bf85a0de..9ce3cd8d4a 100644 --- a/net/apcupsd/Makefile +++ b/net/apcupsd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apcupsd PKG_VERSION:=3.14.7 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/apcupsd @@ -61,14 +61,4 @@ define Package/apcupsd/install $(INSTALL_BIN) ./files/apcupsd.init $(1)/etc/init.d/apcupsd endef -define Package/apcupsd/conffiles -/etc/apcupsd/apcupsd.conf -/etc/apcupsd/apcupsd_mail.conf -/etc/apcupsd/changeme -/etc/apcupsd/commfailure -/etc/apcupsd/commok -/etc/apcupsd/offbattery -/etc/apcupsd/onbattery -endef - $(eval $(call BuildPackage,apcupsd)) diff --git a/net/apf/Makefile b/net/apf/Makefile index 05e8eb9869..46a29799ce 100644 --- a/net/apf/Makefile +++ b/net/apf/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=apf PKG_VERSION:=0.8.4 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://gray-world.net/projects/af/ @@ -38,9 +38,4 @@ define Package/apf/install $(INSTALL_DATA) $(PKG_BUILD_DIR)/doc/afserver_example.conf $(1)/etc/afserver.conf endef -define Package/apf/conffiles -/etc/afclient.conf -/etc/afserver.conf -endef - $(eval $(call BuildPackage,apf)) diff --git a/net/aprx/Makefile b/net/aprx/Makefile index 16e98badc3..6a38e756a8 100644 --- a/net/aprx/Makefile +++ b/net/aprx/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=aprx PKG_REV:=421 PKG_VERSION:=2.00_r$(PKG_REV) -PKG_RELEASE:=3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://repo.ham.fi/svn/aprx/trunk/ @@ -45,8 +45,4 @@ define Package/aprx/install $(INSTALL_BIN) $(PKG_BUILD_DIR)/aprx-stat $(1)/usr/sbin/ endef -define Package/aprx/conffiles -/etc/aprx.conf -endef - $(eval $(call BuildPackage,aprx)) diff --git a/net/aprx/files/aprx.init b/net/aprx/files/aprx.init index 9682eeeb84..e2dcd89f41 100644 --- a/net/aprx/files/aprx.init +++ b/net/aprx/files/aprx.init @@ -1,15 +1,23 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2008-2011 OpenWrt.org +#Init script for aprx START=99 +APRX_BIN="/usr/sbin/aprx" +APRX_LOG_DIR="/var/log/aprx" -SERVICE_USE_PID=1 +system_config() { + local cfg="$1" -start() { - mkdir -m 0755 -p /var/log/aprx - service_start /usr/sbin/aprx + config_get hostname "$cfg" hostname } + +start() { + [ -x "$APRX_BIN" ] || return 1 + [ -d "$APRX_LOG_DIR" ] || mkdir -p $APRX_LOG_DIR + $APRX_BIN + } + stop() { - service_stop /usr/sbin/aprx + killall aprx } diff --git a/net/aria2/Makefile b/net/aria2/Makefile deleted file mode 100644 index 8db2cf7fa3..0000000000 --- a/net/aria2/Makefile +++ /dev/null @@ -1,57 +0,0 @@ -# -# Copyright (C) 2012 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# -include $(TOPDIR)/rules.mk - -PKG_NAME:=aria2 -PKG_VERSION:=1.14.1 -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SOURCE_URL:=@SF/aria2 -PKG_MD5SUM:=3a23844ab3e1460eb7e6dac9b5dd798c -PKG_INSTALL:=1 - -include $(INCLUDE_DIR)/package.mk - -define Package/aria2 - SECTION:=net - CATEGORY:=Network - TITLE:=Lightweight download utility - URL:=http://aria2.sourceforge.net/ - DEPENDS:=+libopenssl +zlib +libxml2 +libstdcpp \ - $(INTL_DEPENDS) $(ICONV_DEPENDS) -endef - -define Package/aria2/description - aria2 is a lightweight multi-protocol & multi-source download utility - operated in command-line. It supports HTTP/HTTPS, FTP, BitTorrent and - Metalink. aria2 has built-in JSON-RPC and XML-RPC interface. You can - manipulate aria2 via these interfaces. -endef - -CONFIGURE_ARGS += \ - --without-gnutls \ - --without-libnettle \ - --without-libgmp \ - --without-libgcrypt \ - --with-openssl \ - --without-sqlite3 \ - --with-libxml2 \ - --without-libexpat \ - --without-libcares \ - --with-libz - -CONFIGURE_VARS += \ - ZLIB_CFLAGS="-I$(STAGING_DIR)/usr/include" \ - ZLIB_LIBS="-L$(STAGING_DIR)/usr/lib" - -define Package/aria2/install - $(INSTALL_DIR) $(1)/usr/bin/ - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/aria2c $(1)/usr/bin/ -endef - -$(eval $(call BuildPackage,aria2)) diff --git a/net/arpwatch/Makefile b/net/arpwatch/Makefile index 20b1959b60..fe981fef5a 100644 --- a/net/arpwatch/Makefile +++ b/net/arpwatch/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=arpwatch PKG_VERSION:=2.1a15 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://ftp.free.fr/.mirrors1/ftp.gentoo.org/distfiles/ diff --git a/net/arpwatch/files/arpwatch.init b/net/arpwatch/files/arpwatch.init index b05692b5c9..56d13e3add 100644 --- a/net/arpwatch/files/arpwatch.init +++ b/net/arpwatch/files/arpwatch.init @@ -1,12 +1,10 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - START=90 -start() { - service_start /usr/sbin/arpwatch -f /etc/arpwatch/arp.dat -i br-lan +start () { + arpwatch -f /etc/arpwatch/arp.dat -i br-lan } stop() { - service_stop /usr/sbin/arpwatch + killall arpwatch } diff --git a/net/asterisk-1.8.x/Makefile b/net/asterisk-1.8.x/Makefile index be8aab56ef..8da1ac6c33 100644 --- a/net/asterisk-1.8.x/Makefile +++ b/net/asterisk-1.8.x/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=asterisk18 -PKG_VERSION:=1.8.8.0 +PKG_VERSION:=1.8.7.1 PKG_RELEASE:=1 PKG_SOURCE:=asterisk-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.asterisk.org/pub/telephony/asterisk/releases/ -PKG_MD5SUM:=7a32b35e1da0019c781b4ae10b599f61 +PKG_MD5SUM:=a732a608ce60fd523646be618e9da616 PKG_BUILD_DIR=$(BUILD_DIR)/asterisk-$(PKG_VERSION) @@ -117,18 +117,6 @@ $(call Package/asterisk18/Default/description) Asterisk. endef -define Package/asterisk18-res-srtp -$(call Package/asterisk18/Default) - TITLE:=SRTP support - DEPENDS:= asterisk18 libsrtp +asterisk18-res-crypto -endef - -define Package/asterisk18-res-srtp/description -$(call Package/asterisk18/Default/description) - This package provides SRTP support to - Asterisk. -endef - define Package/asterisk18-chan-gtalk $(call Package/asterisk18/Default) TITLE:=GTalk support @@ -243,14 +231,6 @@ else --without-bluetooth endif -ifneq ($(SDK)$(CONFIG_PACKAGE_asterisk18-res-srtp),) - CONFIGURE_ARGS+= \ - --with-srtp="$(STAGING_DIR)/usr" -else - CONFIGURE_ARGS+= \ - --without-srtp -endif - CONFIGURE_ARGS+= \ --without-curses \ --with-gsm=internal \ @@ -500,11 +480,6 @@ define Package/asterisk18-mysql/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_config_mysql.so $(1)/usr/lib/asterisk/modules/ endef -define Package/asterisk18-res-srtp/install - $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/res_srtp.so $(1)/usr/lib/asterisk/modules/ -endef - define Buildasterisk18ModuleTemplate define Package/asterisk18-$(subst _,-,$(1)) @@ -539,7 +514,6 @@ $(eval $(call BuildPackage,asterisk18-chan-mgcp)) $(eval $(call BuildPackage,asterisk18-chan-skinny)) $(eval $(call BuildPackage,asterisk18-curl)) $(eval $(call BuildPackage,asterisk18-mysql)) -$(eval $(call BuildPackage,asterisk18-res-srtp)) $(eval $(call Buildasterisk18ModuleTemplate,app_authenticate,Authenticate,support for executing arbitrary authenticate commands)) $(eval $(call Buildasterisk18ModuleTemplate,app_chanisavail,Channel availability check,support for checking if a channel is available)) $(eval $(call Buildasterisk18ModuleTemplate,app_chanspy,Channel listen in,support for listening in on any channel)) @@ -588,5 +562,3 @@ $(eval $(call Buildasterisk18ModuleTemplate,app_senddtmf,Send DTMF digits,Sends $(eval $(call Buildasterisk18ModuleTemplate,func_cut,CUT function,CUT function)) $(eval $(call Buildasterisk18ModuleTemplate,res_clioriginate,Calls via CLI,Originate calls via the CLI)) $(eval $(call Buildasterisk18ModuleTemplate,app_mixmonitor,Record a call and mix the audio,record a call and mix the audio during the recording)) -$(eval $(call Buildasterisk18ModuleTemplate,app_playtones,Playtones application,play a tone list)) -$(eval $(call Buildasterisk18ModuleTemplate,app_record,Record sound file,to record a sound file)) diff --git a/net/asterisk-chan-sccp-b/Makefile b/net/asterisk-chan-sccp-b/Makefile deleted file mode 100644 index c44b8599fc..0000000000 --- a/net/asterisk-chan-sccp-b/Makefile +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -include $(TOPDIR)/rules.mk - -PKG_NAME:=asterisk18-chan-sccp-b -PKG_REV=3004 -PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=1 - -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_SOURCE_URL:=https://chan-sccp-b.svn.sourceforge.net/svnroot/chan-sccp-b/trunk -PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) -PKG_SOURCE_VERSION:=$(PKG_REV) -PKG_SOURCE_PROTO:=svn - -include $(INCLUDE_DIR)/package.mk - -define Package/asterisk18-chan-sccp-b - SUBMENU:=Telephony - SECTION:=net - CATEGORY:=Network - TITLE:=SCCP channel provider for asterisk - URL:=http://chan-sccp-b.net.sourceforge.net/ - MAINTAINER:=Hans Zandbelt - DEPENDS:=+asterisk18 -endef - -define Package/asterisk18-chan-sccp-b/description - SCCP channel provider for asterisk. It delivers extended functionality for SCCP phones over chan_skinny delivered - by asterisk by default. -endef - -CONFIGURE_ARGS += \ - --with-asterisk=$(STAGING_DIR)/usr/include/asterisk-1.8 - -define Build/Compile - $(MAKE) -C "$(PKG_BUILD_DIR)" \ - CFLAGS="$(CFLAGS) -DLOW_MEMORY" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ - all install -endef - -define Package/asterisk18-chan-sccp-b/conffiles -/etc/asterisk/sccp.conf -endef - -define Package/asterisk18-chan-sccp-b/install - $(INSTALL_DIR) $(1)/etc/asterisk - $(INSTALL_BIN) ./files/sccp.openwrt.conf $(1)/etc/asterisk/sccp.conf - $(INSTALL_DIR) $(1)/usr/lib/asterisk/modules - $(CP) $(PKG_INSTALL_DIR)/usr/lib/asterisk/modules/chan_sccp.so $(1)/usr/lib/asterisk/modules/ -endef - -$(eval $(call BuildPackage,asterisk18-chan-sccp-b)) diff --git a/net/asterisk-chan-sccp-b/files/sccp.openwrt.conf b/net/asterisk-chan-sccp-b/files/sccp.openwrt.conf deleted file mode 100644 index c59f4cdb1a..0000000000 --- a/net/asterisk-chan-sccp-b/files/sccp.openwrt.conf +++ /dev/null @@ -1,89 +0,0 @@ -[general] -servername = Openwrt -keepalive = 60 -debug = core -context = default -dateformat = D/M/Y -bindaddr = 192.168.1.1 -port = 2000 -disallow=all -allow=ulaw -allow=alaw -allow=gsm -firstdigittimeout = 16 -digittimeout = 6 -autoanswer_ring_time = 1 -musicclass=default -language=en -deny=0.0.0.0/0.0.0.0 -permit=192.168.1.0/255.255.255.0 -protocolversion=17 - -hotline_enabled=yes -hotline_context=default -hotline_extension=111 - -[SEP001122334455] -type = device -description = Phone Number One -devicetype = 7940 -button = line, 111 -button = line, 113@01:shared -button = speeddial,Phone 2 Line 1, 112, 112@hint - -[SEP00a1a2a3a4a5] -type = device -description = Phone Number Two -devicetype = 7960 -button = line, 112 -button = line, 113@01:shared -button = speeddial,Phone 1 Line 1, 111, 111@hint - -[111] -id = 1000 -type = line -pin = 1234 -label = Phone 1 Line 1 -description = Line 111 -mailbox = 10111 -cid_name = Phone 1 CID -cid_num = 111 -accountcode=79111 -callgroup=1 -pickupgroup=1 -context = default -incominglimit = 2 -vmnum = 600 -trnsfvm = 1000 - -[112] -id = 1001 -type = line -pin = 1234 -label = Phone 2 Line 1 -description = Line 112 -mailbox = 10112 -cid_name = Phone 2 CID -cid_num = 112 -accountcode=79112 -callgroup=1 -pickupgroup=1 -context = default -incominglimit = 2 -vmnum = 600 -trnsfvm = 1000 - -[113] -id = 1002 -type = line -pin = 1234 -label = SharedLine 1 -description = Line 113 -mailbox = 10113 -cid_name = Shared -cid_num = 113 -accountcode=79113 -incominglimit = 2 -vmnum = 600 -trnsfvm = 1000 - diff --git a/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch b/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch deleted file mode 100644 index 81ca9d3892..0000000000 --- a/net/asterisk-chan-sccp-b/patches/200-register-file-version.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- a/src/chan_sccp.h -+++ b/src/chan_sccp.h -@@ -127,15 +127,7 @@ extern "C" { - # define CHECK_LEAKS() - # endif - --# define SCCP_FILE_VERSION(file, version) \ -- static void __attribute__((constructor)) __register_file_version(void) \ -- { \ -- pbx_register_file_version(file, version); \ -- } \ -- static void __attribute__((destructor)) __unregister_file_version(void) \ -- { \ -- pbx_unregister_file_version(file); \ -- } -+# define SCCP_FILE_VERSION(file, version) - - # define DEV_ID_LOG(x) x ? x->id : "SCCP" - diff --git a/net/asterisk-chan-sccp-b/patches/300-stdarg.patch b/net/asterisk-chan-sccp-b/patches/300-stdarg.patch deleted file mode 100644 index be91ed78f1..0000000000 --- a/net/asterisk-chan-sccp-b/patches/300-stdarg.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/src/chan_sccp.h -+++ b/src/chan_sccp.h -@@ -32,6 +32,7 @@ extern "C" { - #include "common.h" - #include - #include "asterisk/compiler.h" -+#include - #include "asterisk/lock.h" - #include "asterisk/abstract_jb.h" - diff --git a/net/autossh/Makefile b/net/autossh/Makefile index 70c4c76600..c207ffe3e1 100644 --- a/net/autossh/Makefile +++ b/net/autossh/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2008 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=autossh PKG_VERSION:=1.4b -PKG_RELEASE:=5 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz PKG_SOURCE_URL:=http://www.harding.motd.ca/autossh/ @@ -43,8 +43,4 @@ define Package/autossh/install $(INSTALL_DATA) ./files/autossh.hotplug $(1)/etc/hotplug.d/iface/20-autossh endef -define Package/autossh/conffiles -/etc/config/autossh -endef - $(eval $(call BuildPackage,autossh)) diff --git a/net/autossh/files/autossh.config b/net/autossh/files/autossh.config index 6ec323858e..2e430a0d57 100644 --- a/net/autossh/files/autossh.config +++ b/net/autossh/files/autossh.config @@ -1,5 +1,4 @@ config autossh option ssh '-i /etc/dropbear/id_rsa -N -T -R 2222:localhost:22 user@host' - option gatetime '0' option monitorport '20000' option poll '600' diff --git a/net/autossh/files/autossh.init b/net/autossh/files/autossh.init index b9b1afeaf4..e873de8073 100644 --- a/net/autossh/files/autossh.init +++ b/net/autossh/files/autossh.init @@ -1,19 +1,14 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2007-2011 OpenWrt.org - +# Copyright (C) 2007 OpenWrt.org START=80 -start_instance() { +start_service () { local section="$1" + config_get ssh "$section" ssh + config_get monitorport "$section" monitorport + config_get poll "$section" poll - config_get ssh "$section" 'ssh' - config_get gatetime "$section" 'gatetime' - config_get monitorport "$section" 'monitorport' - config_get poll "$section" 'poll' - - AUTOSSH_GATETIME="${gatetime:-30}" \ - AUTOSSH_POLL="${poll:-600"}" \ - service_start /usr/sbin/autossh -M ${monitorport:-20000} -f ${ssh} + AUTOSSH_POLL=${poll:-"600"} autossh -M ${monitorport:-"20000"} -f ${ssh} } boot() { @@ -21,10 +16,10 @@ boot() { } start() { - config_load 'autossh' - config_foreach start_instance 'autossh' + config_load "autossh" + config_foreach start_service autossh } stop() { - service_stop /usr/sbin/autossh + killall autossh } diff --git a/net/axel/Makefile b/net/axel/Makefile index 415dc7e4a2..fe00f321a7 100644 --- a/net/axel/Makefile +++ b/net/axel/Makefile @@ -1,5 +1,4 @@ # -# Copyright (C) 2010-2011 OpenWrt.org # Copyright (C) 2010 Gianluigi Tiesi # # This is free software, licensed under the GNU General Public License v2. @@ -10,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=axel PKG_VERSION:=2.4 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://alioth.debian.org/frs/download.php/3015 @@ -37,13 +36,13 @@ define Package/axel/description endef # notes: -# - I'm using := and not += because it is not a standard configure script +# - I'm using = and not += because it is not a standard configure script # - I ask not to strip, because it should be handled by the toolchain -CONFIGURE_ARGS := \ - --prefix=/usr \ - --etcdir=/etc \ - --debug=0 \ - --i18n=0 \ +CONFIGURE_ARGS = \ + --prefix=/usr \ + --etcdir=/etc \ + --debug=0 \ + --i18n=0 \ --strip=0 define Package/axel/install @@ -54,8 +53,4 @@ define Package/axel/install echo "alternate_output = 1" >> $(1)/etc/axelrc endef -define Package/axel/conffiles -/etc/axelrc -endef - $(eval $(call BuildPackage,axel)) diff --git a/net/babel/Makefile b/net/babel/Makefile index 88bc6bc70b..0eb8d2d74f 100644 --- a/net/babel/Makefile +++ b/net/babel/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=babeld -PKG_VERSION:=1.3.0 -PKG_RELEASE:=1 +PKG_VERSION:=1.1.0 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.pps.jussieu.fr/~jch/software/files/ -PKG_MD5SUM:=05fc458d159b9b6fbf9c2f2f20eb8291 +PKG_MD5SUM:=0627cdc9a5ce77a032c4399c3fa64bd1 include $(INCLUDE_DIR)/package.mk diff --git a/net/babel/files/babeld.config b/net/babel/files/babeld.config index d21a22b163..acc9e8a5ae 100644 --- a/net/babel/files/babeld.config +++ b/net/babel/files/babeld.config @@ -2,14 +2,13 @@ package babeld config general # option 'multicast_address' 'ff02:0:0:0:0:0:1:6' - # option 'port' '6696' + # option 'port' '6697' # option 'state_file' '/var/lib/babel-state' # option 'hello_interval' '4' # option 'wired_hello_interval' '20' # Enable detection of idle networks. This functonality is # experimental, don't use it unless you know what you are doing. ## option 'idle_hello_interval' '0' - # option 'diversity' '0,128' # option 'kernel_priority' '0' # Do not use this option unless you know what you are doing, as it can # cause persistent route flapping. @@ -21,8 +20,6 @@ config general # option 'debug' '0' # Listen for connections from a front-end, e.g. on port 33123. ## option 'local_server' '33123' - # Keep unfeasible routes - ## option 'keep_unfeasible' 'false' # Use the given kernel routing table for routes inserted by babeld. ## option 'export_table' '0' # Export routes from the given kernel routing table. @@ -44,9 +41,9 @@ config interface wlan # option 'split_horizon' 'auto' # The default is 96 for wired interfaces, and 256 for wireless ones ## option 'rxcost' '256' - # The default is specified with the -h and -H command-line flags. + # The default is specified with the -h and -H command-line flags. ## option 'hello_interval' '4' - # This can be set to a fairly large value, unless significant + # This can be set to a fairly large value, unless significant # packet loss is expected. The default is four times the hello # interval. ## option 'update_interval' '16' diff --git a/net/babel/files/babeld.init b/net/babel/files/babeld.init index 321f979ff7..d6cd0d3af4 100755 --- a/net/babel/files/babeld.init +++ b/net/babel/files/babeld.init @@ -105,12 +105,10 @@ babel_config() { append_parm "$cfg" 'hello_interval' '-h' append_parm "$cfg" 'wired_hello_interval' '-H' append_parm "$cfg" 'idle_hello_interval' '-i' - append_parm "$cfg" 'diversity' '-z' append_parm "$cfg" 'kernel_priority' '-k' append_parm "$cfg" 'duplication_priority' '-A' append_parm "$cfg" 'debug' '-d' append_parm "$cfg" 'local_server' '-g' - append_parm "$cfg" 'keep_unfeasible' '-u' append_parm "$cfg" 'export_table' '-t' append_parm "$cfg" 'import_table' '-T' append_parm "$cfg" 'conf_file' '-c' diff --git a/net/babel/patches/001-fix-local_notify_route.patch b/net/babel/patches/001-fix-local_notify_route.patch new file mode 100644 index 0000000000..0a52c5e117 --- /dev/null +++ b/net/babel/patches/001-fix-local_notify_route.patch @@ -0,0 +1,18 @@ +Sat Mar 5 19:13:54 CET 2011 Gabriel Kerneis + * Fix unique id in local_notify_route +diff -rN -u old-babeld/local.c new-babeld/local.c +--- old-babeld/local.c 2011-03-14 14:37:03.000000000 +0100 ++++ new-babeld/local.c 2011-03-14 14:37:03.000000000 +0100 +@@ -197,11 +197,10 @@ + return; + + rc = snprintf(buf, 512, +- "%s route %s-%s-%lx prefix %s installed %s " ++ "%s route %s-%lx prefix %s installed %s " + "id %s metric %d refmetric %d via %s if %s\n", + local_kind(kind), + format_prefix(route->src->prefix, route->src->plen), +- format_eui64(route->src->id), + (unsigned long)route->neigh, + format_prefix(route->src->prefix, route->src->plen), + route->installed ? "yes" : "no", diff --git a/net/baresip/Config.in b/net/baresip/Config.in new file mode 100644 index 0000000000..419fd21acd --- /dev/null +++ b/net/baresip/Config.in @@ -0,0 +1,66 @@ +menu "Configuration" + depends PACKAGE_baresip + + +comment "Audio drivers ---" + +config BARESIP_MODULE_ALSA + bool "Alsa module" + depends PACKAGE_baresip && PACKAGE_alsa-lib + default n + +config BARESIP_MODULE_OSS + bool "OSS module" + depends PACKAGE_baresip + default y + + +comment "Audio codecs ---" + +config BARESIP_MODULE_G711 + bool "G.711 audio codec" + depends PACKAGE_baresip + default y + +config BARESIP_MODULE_G722 + bool "G.722 audio codec" + depends PACKAGE_baresip && PACKAGE_libspandsp + default n + +config BARESIP_MODULE_SPEEX + bool "Speex audio codec" + depends PACKAGE_baresip && PACKAGE_libspeex + default n + + + +comment "Video codecs ---" + +config BARESIP_MODULE_AVCODEC + bool "FFmpeg avcodec module (H.263, H.264, MPEG4)" + depends PACKAGE_baresip && PACKAGE_libffmpeg + default n + + +comment "Video source modules ---" + +config BARESIP_MODULE_V4L + bool "Video4Linux module" + depends PACKAGE_baresip + default n + +config BARESIP_MODULE_V4L2 + bool "Video4Linux2 module" + depends PACKAGE_baresip && PACKAGE_libv4l + default n + + +comment "Video display modules ---" + +config BARESIP_MODULE_SDL + bool "SDL module" + depends PACKAGE_baresip && PACKAGE_libsdl + default n + + +endmenu diff --git a/net/baresip/Makefile b/net/baresip/Makefile index 02f6885eef..6c637304a3 100644 --- a/net/baresip/Makefile +++ b/net/baresip/Makefile @@ -1,149 +1,97 @@ -# -# Copyright (C) 2010-2011 OpenWrt.org -# Copyright (C) 2010 Alfred E. Heggestad # -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. +# Makefile +# +# Copyright (C) 2010 Alfred E. Heggestad # include $(TOPDIR)/rules.mk PKG_NAME:=baresip -PKG_VERSION:=0.4.0 +PKG_VERSION:=0.2.0 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.creytiv.com/pub/ -PKG_MD5SUM:=770a13543866e801f6544e194097e911 - -baresip-mods:= \ - alsa \ - avcodec \ - avformat \ - cons \ - evdev \ - g711 \ - g722 \ - oss \ - sdl \ - speex \ - stdio \ - uuid \ - v4l \ - v4l2 \ - -PKG_CONFIG_DEPENDS:= \ - $(patsubst %,CONFIG_PACKAGE_baresip-mod-%,$(baresip-mods)) \ +PKG_MD5SUM:=c4e160463b2bfb2e326e916089da1c4f include $(INCLUDE_DIR)/package.mk -define Package/baresip/Default +EXTRA_DEPS := + + +BARESIP_MODULES := + + +define Package/baresip/config + source "$(SOURCE)/Config.in" +endef + + +ifneq ($(CONFIG_BARESIP_MODULE_ALSA),) +BARESIP_MODULES += USE_ALSA=1 +endif +ifneq ($(CONFIG_BARESIP_MODULE_AVCODEC),) +BARESIP_MODULES += USE_FFMPEG=1 USE_FFMPEG_AVFORMAT= +endif +ifneq ($(CONFIG_BARESIP_MODULE_G711),) +BARESIP_MODULES += USE_G711=1 +endif +ifneq ($(CONFIG_BARESIP_MODULE_G722),) +BARESIP_MODULES += USE_G722=1 +endif +ifneq ($(CONFIG_BARESIP_MODULE_OSS),) +BARESIP_MODULES += USE_OSS=1 +endif +ifneq ($(CONFIG_BARESIP_MODULE_SDL),) +BARESIP_MODULES += USE_SDL=1 +endif +ifneq ($(CONFIG_BARESIP_MODULE_SPEEX),) +BARESIP_MODULES += USE_SPEEX=1 +endif +ifneq ($(CONFIG_BARESIP_MODULE_V4L),) +BARESIP_MODULES += USE_V4L=1 +endif +ifneq ($(CONFIG_BARESIP_MODULE_V4L2),) +BARESIP_MODULES += USE_V4L2=1 +endif + + +define Package/baresip SECTION:=net CATEGORY:=Network SUBMENU:=Telephony + DEPENDS:=+libre +libpthread $(EXTRA_DEPS) + TITLE:=baresip Barebone SIP useragent URL:=http://www.creytiv.com/ endef -define Package/baresip -$(call Package/baresip/Default) - TITLE:=Portable and modular SIP User-Agent with A/V support - DEPENDS:=+libre +librem +libpthread -endef - - -baresip-mod-alsa := USE_ALSA -baresip-mod-avcodec := USE_FFMPEG -baresip-mod-avformat := USE_FFMPEG_AVFORMAT -baresip-mod-cons := USE_CONS -baresip-mod-evdev := USE_EVDEV -baresip-mod-g711 := USE_G711 -baresip-mod-g722 := USE_G722 -baresip-mod-oss := USE_OSS -baresip-mod-sdl := USE_SDL -baresip-mod-speex := USE_SPEEX -baresip-mod-stdio := USE_STDIO -baresip-mod-uuid := USE_UUID -baresip-mod-v4l := USE_V4L -baresip-mod-v4l2 := USE_V4L2 - -BARESIP_MOD_OPTIONS:= \ - MOD_AUTODETECT= \ - $(foreach m,$(baresip-mods),$(baresip-mod-$(m))=$(if $(CONFIG_PACKAGE_baresip-mod-$(m)),1)) - define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ - LIBRE_MK="$(STAGING_DIR)/usr/share/re/re.mk" \ - LIBRE_INC="$(STAGING_DIR)/usr/include/re" \ - LIBRE_SO="$(STAGING_DIR)/usr/lib" \ - LIBREM_PATH="../rem" \ + LIBRE_MK=../re-$(PKG_VERSION)/mk/re.mk \ + LIBRE_INC=../re-$(PKG_VERSION)/include \ + LIBRE_SO=$(STAGING_DIR)/usr/lib/libre.so \ + MOD_AUTODETECT= \ + USE_STDIO=1 USE_CONS=1 USE_EVDEV=1 \ + $(BARESIP_MODULES) \ CC="$(TARGET_CC)" \ DESTDIR="$(PKG_INSTALL_DIR)" \ EXTRA_CFLAGS="$(TARGET_CFLAGS) -DOPENWRT" \ - SYSROOT="$$$$(echo '#include ' | $(TARGET_CROSS)cpp -x c | sed -ne 's,^# [0-9]* \"\(.*\)/include/pthread\.h\".*,\1,p' | head -n1)" \ + $(PKG_MAKE_OPTS) \ + SYSROOT="$(TOOLCHAIN_DIR)" \ SYSROOT_ALT="$(STAGING_DIR)/usr" \ RELEASE=1 \ - CROSS_COMPILE="$(TARGET_CROSS)" \ - OS="linux" \ - $(BARESIP_MOD_OPTIONS) \ all install endef define Package/baresip/install $(INSTALL_DIR) $(1)/usr/bin - $(CP) $(PKG_INSTALL_DIR)/usr/bin/baresip $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/baresip $(1)/usr/bin/ $(INSTALL_DIR) $(1)/usr/lib/baresip/modules - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/ice.so \ - $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/stun.so \ - $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/turn.so \ - $(1)/usr/lib/baresip/modules/. + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/*.so $(1)/usr/lib/baresip/modules/. $(INSTALL_DIR) $(1)/usr/share/baresip - $(CP) $(PKG_INSTALL_DIR)/usr/share/baresip/* $(1)/usr/share/baresip/. + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/share/baresip/* $(1)/usr/share/baresip/. $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/baresip.init $(1)/etc/init.d/baresip endef - -# -# 1. Name -# 2. Title -# 3. Files -# 4. Depends -# -define BuildPlugin - - define Package/baresip-mod-$(1) - $$(call Package/baresip/Default) - TITLE:= baresip $(2) module - DEPENDS:= baresip $(4) - endef - - define Package/baresip-mod-$(1)/install - [ -z "$(3)" ] || $(INSTALL_DIR) $$(1)/usr/lib/baresip/modules - for f in $(3); do \ - $(CP) \ - $(PKG_INSTALL_DIR)/usr/lib/baresip/modules/$$$$$$$${f}.so \ - $$(1)/usr/lib/baresip/modules/ ; \ - done - endef - - $$(eval $$(call BuildPackage,baresip-mod-$(1))) -endef - - $(eval $(call BuildPackage,baresip)) - -$(eval $(call BuildPlugin,alsa,ALSA audio driver,alsa,+PACKAGE_baresip-mod-alsa:alsa-lib)) -$(eval $(call BuildPlugin,avcodec,FFmpeg video codecs,avcodec,+PACKAGE_baresip-mod-avcodec:libffmpeg)) -$(eval $(call BuildPlugin,avformat,FFmpeg video source,avformat,+PACKAGE_baresip-mod-avformat:libffmpeg)) -$(eval $(call BuildPlugin,cons,console UI,cons,)) -$(eval $(call BuildPlugin,evdev,input event device UI,evdev,)) -$(eval $(call BuildPlugin,g711,G.711 audio codec,g711,)) -$(eval $(call BuildPlugin,g722,G.722 audio codec,g722,+PACKAGE_baresip-mod-g722:libspandsp)) -$(eval $(call BuildPlugin,sdl,SDL video display,sdl,+libsdl)) -$(eval $(call BuildPlugin,oss,OSS audio driver,oss,)) -$(eval $(call BuildPlugin,speex,Speex audio codec,speex,+PACKAGE_baresip-mod-speex:libspeex)) -$(eval $(call BuildPlugin,stdio,standard I/O UI,stdio,)) -$(eval $(call BuildPlugin,uuid,UUID,uuid,+libuuid)) -$(eval $(call BuildPlugin,v4l,Video4Linux video source,v4l,+PACKAGE_baresip-mod-v4l:libv4l @(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_33||LINUX_2_6_34||LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37))) -$(eval $(call BuildPlugin,v4l2,Video4Linux2 video source,v4l2,+PACKAGE_baresip-mod-v4l2:libv4l @(LINUX_2_6_30||LINUX_2_6_31||LINUX_2_6_32||LINUX_2_6_33||LINUX_2_6_34||LINUX_2_6_35||LINUX_2_6_36||LINUX_2_6_37))) diff --git a/net/baresip/files/baresip.init b/net/baresip/files/baresip.init index e398595710..dd84a5048b 100644 --- a/net/baresip/files/baresip.init +++ b/net/baresip/files/baresip.init @@ -1,14 +1,19 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2010-2011 OpenWrt.org +# # Copyright (C) 2010 Alfred E. Heggestad # START=92 +BIN=baresip +DEFAULT=/etc/default/$BIN +OPTIONS=-d start() { - service_start /usr/bin/baresip -d + [ -f $DEFAULT ] && . $DEFAULT + $BIN $OPTIONS } stop() { - service_stop /usr/bin/baresip + killall $BIN } + diff --git a/net/batman-adv/Makefile b/net/batman-adv/Makefile index 5154862464..53d724e5c0 100644 --- a/net/batman-adv/Makefile +++ b/net/batman-adv/Makefile @@ -10,16 +10,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=batman-adv -PKG_VERSION:=2011.4.0 -BATCTL_VERSION:=2011.4.0 -PKG_MD5SUM:=3987d693bd26d8057506b542c3635910 -BATCTL_MD5SUM:=325b25dbb8261f7fa19c6e1d9bfba6e1 +PKG_VERSION:=2011.2.0 +PKG_MD5SUM:=1ef45406201913cc08ac01e47ad2d034 +BATCTL_MD5SUM:=69e7fe915f2c1867b74e6efe7c627dd5 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.open-mesh.org/batman/releases/batman-adv-$(PKG_VERSION) PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION) -PKG_BATCTL_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/batctl-$(BATCTL_VERSION) +PKG_TOOL_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/batctl-$(PKG_VERSION) include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/kernel.mk @@ -28,7 +27,7 @@ define KernelPackage/batman-adv URL:=http://www.open-mesh.org/ MAINTAINER:=Marek Lindner SUBMENU:=Network Support - DEPENDS:=+kmod-lib-crc16 + DEPENDS:=@!LINUX_2_4 TITLE:=B.A.T.M.A.N. Adv FILES:=$(PKG_BUILD_DIR)/batman-adv.$(LINUX_KMOD_SUFFIX) AUTOLOAD:=$(call AutoLoad,50,batman-adv) @@ -62,28 +61,27 @@ MAKE_BATCTL_ARGS += \ CC="$(TARGET_CC)" \ NODEBUG=1 \ UNAME="Linux" \ - DESTDIR="$(PKG_INSTALL_DIR)" \ + INSTALL_PREFIX="$(PKG_INSTALL_DIR)" \ STRIP="/bin/true" \ batctl install ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),) define Download/batctl - FILE:=batctl-$(BATCTL_VERSION).tar.gz + FILE:=batctl-$(PKG_VERSION).tar.gz URL:=$(PKG_SOURCE_URL) MD5SUM:=$(BATCTL_MD5SUM) endef $(eval $(call Download,batctl)) -EXTRACT_BATCTL = tar xzf "$(DL_DIR)/batctl-$(BATCTL_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)" +EXTRACT_BATCTL = tar xzf "$(DL_DIR)/batctl-$(PKG_VERSION).tar.gz" -C "$(BUILD_DIR)/$(PKG_NAME)" PATCH_BATCTL = $(call Build/DoPatch,"$(PKG_BATCTL_BUILD_DIR)","$(PATCH_DIR)","*batctl*") -BUILD_BATCTL = $(MAKE) -C $(PKG_BATCTL_BUILD_DIR) $(MAKE_BATCTL_ARGS) +BUILD_BATCTL = $(MAKE) -C $(PKG_TOOL_BUILD_DIR) $(MAKE_BATCTL_ARGS) endif -KPATCH ?= $(PATCH) define Build/DoPatch @if [ -d "$(2)" ]; then \ if [ "$$$$(ls $(2) | grep -Ec $(3))" -gt 0 ]; then \ - $(KPATCH) "$(1)" "$(2)" "$(3)"; \ + $(PATCH) "$(1)" "$(2)" "$(3)"; \ fi; \ fi endef @@ -106,18 +104,16 @@ endef ifneq ($(DEVELOPER)$(CONFIG_KMOD_BATMAN_ADV_BATCTL),) define KernelPackage/batman-adv/install - $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv + $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d - $(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config $(INSTALL_DIR) $(1)/usr/sbin - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/sbin/batctl $(1)/usr/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/batctl $(1)/usr/sbin/ endef else define KernelPackage/batman-adv/install - $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(1)/lib/batman-adv + $(INSTALL_DIR) $(1)/etc/config $(1)/etc/init.d $(INSTALL_BIN) ./files/etc/init.d/batman-adv $(1)/etc/init.d - $(INSTALL_BIN) ./files/lib/batman-adv/config.sh $(1)/lib/batman-adv $(INSTALL_DATA) ./files/etc/config/batman-adv $(1)/etc/config endef endif diff --git a/net/batman-adv/files/etc/config/batman-adv b/net/batman-adv/files/etc/config/batman-adv index 414b119663..31ef797fbb 100644 --- a/net/batman-adv/files/etc/config/batman-adv +++ b/net/batman-adv/files/etc/config/batman-adv @@ -2,7 +2,6 @@ config 'mesh' 'bat0' option 'interfaces' 'mesh' option 'aggregated_ogms' - option 'ap_isolation' option 'bonding' option 'fragmentation' option 'gw_bandwidth' diff --git a/net/batman-adv/files/etc/init.d/batman-adv b/net/batman-adv/files/etc/init.d/batman-adv index f0f678904e..a6a85000d4 100644 --- a/net/batman-adv/files/etc/init.d/batman-adv +++ b/net/batman-adv/files/etc/init.d/batman-adv @@ -3,7 +3,101 @@ START=90 -. /lib/batman-adv/config.sh +is_module_loaded() { + + if [ ! -d "/sys/module/batman_adv" ]; then + echo "batman-adv module directory not found - was the kernel module loaded ?" >&2 + return 0 + fi + + return 1 +} + +start_mesh () { + local meshif="$1" + local interfaces aggregated_ogms bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode + + is_module_loaded + [ $? -ne 1 ] && return + + config_get interfaces "$meshif" interfaces + config_get aggregated_ogms "$meshif" aggregated_ogms + config_get bonding "$meshif" bonding + config_get fragmentation "$meshif" fragmentation + config_get gw_bandwidth "$meshif" gw_bandwidth + config_get gw_mode "$meshif" gw_mode + config_get gw_sel_class "$meshif" gw_sel_class + config_get log_level "$meshif" log_level + config_get orig_interval "$meshif" orig_interval + config_get vis_mode "$meshif" vis_mode + + if [ "$interfaces" = "" ]; then + echo Error, you must specify at least a network interface + return + fi + + for interface in $interfaces + do + ifname=$(uci -P /var/state get network.$interface.ifname 2>&-) + [ ! -f "/sys/class/net/$ifname/batman_adv/mesh_iface" ] && { + ifname=${interface} + [ ! -f "/sys/class/net/$ifname/batman_adv/mesh_iface" ] && echo "Can't add interface $ifname - ignoring" && continue + } + + echo $meshif > /sys/class/net/$ifname/batman_adv/mesh_iface + done + + if [ $orig_interval ]; then + echo $orig_interval > /sys/class/net/$meshif/mesh/orig_interval + fi + + if [ $log_level ]; then + echo $log_level > /sys/class/net/$meshif/mesh/log_level 2>&- + fi + + if [ $aggregated_ogms ]; then + echo $aggregated_ogms > /sys/class/net/$meshif/mesh/aggregated_ogms + fi + + if [ $bonding ]; then + echo $bonding > /sys/class/net/$meshif/mesh/bonding + fi + + if [ $fragmentation ]; then + echo $fragmentation > /sys/class/net/$meshif/mesh/fragmentation + fi + + if [ $gw_bandwidth ]; then + echo $gw_bandwidth > /sys/class/net/$meshif/mesh/gw_bandwidth + fi + + if [ $gw_mode ]; then + echo $gw_mode > /sys/class/net/$meshif/mesh/gw_mode + fi + + if [ $gw_sel_class ]; then + echo $gw_sel_class > /sys/class/net/$meshif/mesh/gw_sel_class + fi + + if [ $vis_mode ]; then + echo $vis_mode > /sys/class/net/$meshif/mesh/vis_mode + fi +} + +stop_mesh() { + local meshif="$1" + + is_module_loaded + [ $? -ne 1 ] && return + + for iface in $(ls /sys/class/net/*) + do + [ ! -f "$iface/batman_adv/mesh_iface" ] && continue + [ "$(head -1 $iface/batman_adv/mesh_iface)" != "$meshif" ] && continue + + echo "none" > $iface/batman_adv/mesh_iface + done +} # can also be used with "batman-adv start bat0" start() { @@ -26,3 +120,5 @@ stop () { config_foreach stop_mesh mesh fi } + + diff --git a/net/batman-adv/files/lib/batman-adv/config.sh b/net/batman-adv/files/lib/batman-adv/config.sh deleted file mode 100644 index 58a01d2bc1..0000000000 --- a/net/batman-adv/files/lib/batman-adv/config.sh +++ /dev/null @@ -1,103 +0,0 @@ -#!/bin/sh -# Copyright (C) 2011 OpenWrt.org - -is_module_loaded() { - - if [ ! -d "/sys/module/batman_adv" ]; then - echo "batman-adv module directory not found - was the kernel module loaded ?" >&2 - return 0 - fi - - return 1 -} - -start_mesh () { - local meshif="$1" - local interfaces aggregated_ogms ap_isolation bonding fragmentation gw_bandwidth gw_mode gw_sel_class log_level orig_interval vis_mode - - is_module_loaded - [ $? -ne 1 ] && return - - config_get interfaces "$meshif" interfaces - config_get aggregated_ogms "$meshif" aggregated_ogms - config_get ap_isolation "$meshif" ap_isolation - config_get bonding "$meshif" bonding - config_get fragmentation "$meshif" fragmentation - config_get gw_bandwidth "$meshif" gw_bandwidth - config_get gw_mode "$meshif" gw_mode - config_get gw_sel_class "$meshif" gw_sel_class - config_get log_level "$meshif" log_level - config_get orig_interval "$meshif" orig_interval - config_get vis_mode "$meshif" vis_mode - - if [ "$interfaces" = "" ]; then - echo Error, you must specify at least a network interface - return - fi - - for interface in $interfaces - do - ifname=$(uci -P /var/state get network.$interface.ifname 2>&-) - [ ! -f "/sys/class/net/$ifname/batman_adv/mesh_iface" ] && { - ifname=${interface} - [ ! -f "/sys/class/net/$ifname/batman_adv/mesh_iface" ] && echo "Can't add interface $ifname - ignoring" && continue - } - - echo $meshif > /sys/class/net/$ifname/batman_adv/mesh_iface - done - - if [ $orig_interval ]; then - echo $orig_interval > /sys/class/net/$meshif/mesh/orig_interval - fi - - if [ $log_level ]; then - echo $log_level > /sys/class/net/$meshif/mesh/log_level 2>&- - fi - - if [ $aggregated_ogms ]; then - echo $aggregated_ogms > /sys/class/net/$meshif/mesh/aggregated_ogms - fi - - if [ $ap_isolation ]; then - echo $ap_isolation > /sys/class/net/$meshif/mesh/ap_isolation - fi - - if [ $bonding ]; then - echo $bonding > /sys/class/net/$meshif/mesh/bonding - fi - - if [ $fragmentation ]; then - echo $fragmentation > /sys/class/net/$meshif/mesh/fragmentation - fi - - if [ $gw_bandwidth ]; then - echo $gw_bandwidth > /sys/class/net/$meshif/mesh/gw_bandwidth - fi - - if [ $gw_mode ]; then - echo $gw_mode > /sys/class/net/$meshif/mesh/gw_mode - fi - - if [ $gw_sel_class ]; then - echo $gw_sel_class > /sys/class/net/$meshif/mesh/gw_sel_class - fi - - if [ $vis_mode ]; then - echo $vis_mode > /sys/class/net/$meshif/mesh/vis_mode - fi -} - -stop_mesh() { - local meshif="$1" - - is_module_loaded - [ $? -ne 1 ] && return - - for iface in $(ls /sys/class/net/*) - do - [ ! -f "$iface/batman_adv/mesh_iface" ] && continue - [ "$(head -1 $iface/batman_adv/mesh_iface)" != "$meshif" ] && continue - - echo "none" > $iface/batman_adv/mesh_iface - done -} diff --git a/net/batman/Makefile b/net/batman/Makefile index cd4a2ec56c..b17818a14b 100644 --- a/net/batman/Makefile +++ b/net/batman/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=batmand PKG_REV:=1439 PKG_VERSION:=r$(PKG_REV) -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_EXTRA_CFLAGS=-DDEBUG_MALLOC -DMEMORY_USAGE -DPROFILE_DATA -DREVISION_VERSION=\"\ rv$(PKG_REV)\" PKG_SOURCE_PROTO:=svn @@ -132,10 +132,6 @@ define Package/batmand/install $(INSTALL_DATA) ./files/etc/config/batmand $(1)/etc/config endef -define Package/batmand/conffiles -/etc/config/batmand -endef - define Package/vis/install $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/config $(1)/etc/init.d $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/vis $(1)/usr/sbin/ @@ -143,10 +139,6 @@ define Package/vis/install $(INSTALL_DATA) ./files/etc/config/vis $(1)/etc/config endef -define Package/vis/conffiles -/etc/config/vis -endef - $(eval $(call BuildPackage,batmand)) $(eval $(call BuildPackage,vis)) $(eval $(call KernelPackage,batgat)) diff --git a/net/bind/Makefile b/net/bind/Makefile index f547befbca..cd46948e67 100644 --- a/net/bind/Makefile +++ b/net/bind/Makefile @@ -8,14 +8,14 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bind -PKG_VERSION:=9.8.0-P4 -PKG_RELEASE:=2 +PKG_VERSION:=9.7.2-P3 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= \ ftp://ftp.isc.org/isc/bind9/$(PKG_VERSION) \ http://www.mirrorservice.org/sites/ftp.isc.org/isc/bind9/$(PKG_VERSION) -PKG_MD5SUM:=13e36e3f28dc1ce7675b45a4192e8389 +PKG_MD5SUM:=b4537cbae38b2daef36775bf49f33db9 PKG_FIXUP:=libtool @@ -112,29 +112,13 @@ endef define Package/bind-server/install $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/named $(1)/usr/sbin/ - $(INSTALL_DIR) $(1)/etc/bind - $(CP) \ - ./files/bind/db.0 \ - ./files/bind/db.127 \ - ./files/bind/db.255 \ - ./files/bind/db.local \ - ./files/bind/db.root \ - $(1)/etc/bind/ - $(CP) ./files/bind/named.conf.example $(1)/etc/bind/named.conf + $(INSTALL_DIR) $(1)/etc + $(CP) ./files/bind $(1)/etc/ $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/named.init $(1)/etc/init.d/named find $(1)/etc/bind/ -name ".svn" | xargs rm -rf endef -define Package/bind-server/conffiles -/etc/bind/db.0 -/etc/bind/db.127 -/etc/bind/db.255 -/etc/bind/db.local -/etc/bind/db.root -/etc/bind/named.conf -endef - define Package/bind-client/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/nsupdate $(1)/usr/bin/ diff --git a/net/bind/patches/100-configure-GOST.patch b/net/bind/patches/100-configure-GOST.patch deleted file mode 100644 index aaf7336c20..0000000000 --- a/net/bind/patches/100-configure-GOST.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/configure.in 2011-06-29 19:14:25.053420788 +0400 -+++ b/configure.in 2011-06-29 19:26:34.860280457 +0400 -@@ -699,7 +699,9 @@ - [AC_MSG_RESULT(yes) - have_gost="yes"], - [AC_MSG_RESULT(no) -- have_gost="no"]) -+ have_gost="no"], -+ [AC_MSG_RESULT(assuming target platform has no GOST support) -+ have_gost="no"]) - case $have_gost in - yes) - OPENSSL_GOST="yes" diff --git a/net/bind/patches/100-cross_compile.patch b/net/bind/patches/100-cross_compile.patch new file mode 100644 index 0000000000..5c513121f3 --- /dev/null +++ b/net/bind/patches/100-cross_compile.patch @@ -0,0 +1,96 @@ +--- a/configure ++++ b/configure +@@ -22418,8 +22418,7 @@ $as_echo_n "checking epoll support... " + { { $as_echo "$as_me:$LINENO: error: cannot run test program while cross compiling + See \`config.log' for more details." >&5 + $as_echo "$as_me: error: cannot run test program while cross compiling +-See \`config.log' for more details." >&2;} +- { (exit 1); exit 1; }; } ++See \`config.log' for more details." >&2;} } + else + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ +@@ -24275,8 +24274,7 @@ if { as_var=$as_ac_File; eval "test \"\$ + else + test "$cross_compiling" = yes && + { { $as_echo "$as_me:$LINENO: error: cannot check for file existence when cross compiling" >&5 +-$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} +- { (exit 1); exit 1; }; } ++$as_echo "$as_me: error: cannot check for file existence when cross compiling" >&2;} } + if test -r "$devrandom"; then + eval "$as_ac_File=yes" + else +@@ -27949,73 +27947,6 @@ rm -f core conftest.err conftest.$ac_obj + # which provides some (all?) of the desired functions. + # + +-{ $as_echo "$as_me:$LINENO: checking for inet_ntop with IPv6 support" >&5 +-$as_echo_n "checking for inet_ntop with IPv6 support... " >&6; } +-if test "$cross_compiling" = yes; then +- { $as_echo "$as_me:$LINENO: result: assuming inet_ntop needed" >&5 +-$as_echo "assuming inet_ntop needed" >&6; } +- ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O" +- ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c" +- ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1" +-else +- cat >conftest.$ac_ext <<_ACEOF +-/* confdefs.h. */ +-_ACEOF +-cat confdefs.h >>conftest.$ac_ext +-cat >>conftest.$ac_ext <<_ACEOF +-/* end confdefs.h. */ +- +-#include +-#include +-#include +-#include +-main() { +-char a[16],b[64]; return(inet_ntop(AF_INET6, a, b, sizeof(b)) == (char*)0);} +-_ACEOF +-rm -f conftest$ac_exeext +-if { (ac_try="$ac_link" +-case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_link") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); } && { ac_try='./conftest$ac_exeext' +- { (case "(($ac_try" in +- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; +- *) ac_try_echo=$ac_try;; +-esac +-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\"" +-$as_echo "$ac_try_echo") >&5 +- (eval "$ac_try") 2>&5 +- ac_status=$? +- $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 +- (exit $ac_status); }; }; then +- { $as_echo "$as_me:$LINENO: result: yes" >&5 +-$as_echo "yes" >&6; } +- ISC_PLATFORM_NEEDNTOP="#undef ISC_PLATFORM_NEEDNTOP" +-else +- $as_echo "$as_me: program exited with status $ac_status" >&5 +-$as_echo "$as_me: failed program was:" >&5 +-sed 's/^/| /' conftest.$ac_ext >&5 +- +-( exit $ac_status ) +-{ $as_echo "$as_me:$LINENO: result: no" >&5 +-$as_echo "no" >&6; } +- ISC_EXTRA_OBJS="$ISC_EXTRA_OBJS inet_ntop.$O" +- ISC_EXTRA_SRCS="$ISC_EXTRA_SRCS inet_ntop.c" +- ISC_PLATFORM_NEEDNTOP="#define ISC_PLATFORM_NEEDNTOP 1" +-fi +-rm -rf conftest.dSYM +-rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext +-fi +- +- +- +- + # On NetBSD 1.4.2 and maybe others, inet_pton() incorrectly accepts + # addresses with less than four octets, like "1.2.3". Also leading + # zeros should also be rejected. diff --git a/net/bird/Makefile b/net/bird/Makefile index 60cf7af7a1..fa12dacc81 100644 --- a/net/bird/Makefile +++ b/net/bird/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2011 OpenWrt.org +# Copyright (C) 2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bird -PKG_VERSION:=1.3.3 -PKG_RELEASE:=3 +PKG_VERSION:=1.3.1 +PKG_RELEASE:=1 PKG_SOURCE:=bird-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=ftp://bird.network.cz/pub/bird -PKG_MD5SUM:=d463c2ec9478cbadbcb2d3a3c0cc40d5 +PKG_MD5SUM:=d11f53b79c7371b76e5c93209dbe2a10 PKG_BUILD_DEPENDS:=libncurses libreadline include $(INCLUDE_DIR)/package.mk @@ -138,10 +138,6 @@ define Package/bird$(2)/install endef -define Package/bird$(2)/conffiles -/etc/bird$(2).conf -endef - define Package/birdc$(2)/install $(INSTALL_DIR) $$(1)/usr/sbin $(INSTALL_BIN) $$(PKG_BUILD_DIR)/birdc$(2) $$(1)/usr/sbin/ diff --git a/net/bird/files/bird4.init b/net/bird/files/bird4.init index 8ac5e75913..d0e0876e95 100644 --- a/net/bird/files/bird4.init +++ b/net/bird/files/bird4.init @@ -1,21 +1,22 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2010-2011 OpenWrt.org START=50 -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 +# Birdloop is used to restart BIRD if it crashed. Unfortunately, it also +# hides and handles in the same manner start-time errors (like parse error +# in config file). Therefore, it is not used by default. If you want to +# use it, comment the first line and uncomment the second line in start(). start() { - service_start /usr/sbin/bird4 -d -# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird4loop ) + /usr/sbin/bird4 +# /usr/sbin/bird4loop } stop() { -# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird4loop ) - service_stop /usr/sbin/bird4 + killall bird4 + sleep 1 } reload() { - service_reload /usr/sbin/bird4 + killall -HUP bird4 } diff --git a/net/bird/files/bird4loop b/net/bird/files/bird4loop index 5dd6b95c92..9d9b80dd8c 100644 --- a/net/bird/files/bird4loop +++ b/net/bird/files/bird4loop @@ -2,22 +2,11 @@ BIRD=/usr/sbin/bird4 -$BIRD -p || return 1 +$BIRD -p -. /lib/functions.sh +( until $BIRD -d "$@" +do + logger error BIRD4 died! + sleep 2 +done; ) /dev/null 2> /dev/null & -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 - -sig_handler() { - running=0 - service_stop $BIRD -} - -running=1 -trap sig_handler INT -trap sig_handler TERM -while [ $running -gt 0 ]; do - service_check $BIRD || service_start $BIRD -d "$@" - sleep 3 -done diff --git a/net/bird/files/bird6.init b/net/bird/files/bird6.init index 2efb4f0963..69b39ff148 100644 --- a/net/bird/files/bird6.init +++ b/net/bird/files/bird6.init @@ -1,21 +1,22 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2010-2011 OpenWrt.org START=50 -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 +# Birdloop is used to restart BIRD if it crashed. Unfortunately, it also +# hides and handles in the same manner start-time errors (like parse error +# in config file). Therefore, it is not used by default. If you want to +# use it, comment the first line and uncomment the second line in start(). start() { - service_start /usr/sbin/bird6 -d -# ( SERVICE_MATCH_NAME=1 service_start /usr/sbin/bird6loop ) + /usr/sbin/bird6 +# /usr/sbin/bird6loop } stop() { -# ( SERVICE_MATCH_NAME=1 service_stop /usr/sbin/bird6loop ) - service_stop /usr/sbin/bird6 + killall bird6 + sleep 1 } reload() { - service_reload /usr/sbin/bird6 + killall -HUP bird6 } diff --git a/net/bird/files/bird6loop b/net/bird/files/bird6loop index 46f498a06b..5692125856 100644 --- a/net/bird/files/bird6loop +++ b/net/bird/files/bird6loop @@ -2,22 +2,11 @@ BIRD=/usr/sbin/bird6 -$BIRD -p || return 1 +$BIRD -p -. /lib/functions.sh +( until $BIRD -d "$@" +do + logger error BIRD6 died! + sleep 2 +done; ) /dev/null 2> /dev/null & -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 - -sig_handler() { - running=0 - service_stop $BIRD -} - -running=1 -trap sig_handler INT -trap sig_handler TERM -while [ $running -gt 0 ]; do - service_check $BIRD || service_start $BIRD -d "$@" - sleep 3 -done diff --git a/net/bitlbee/Makefile b/net/bitlbee/Makefile index 87ce80a8ac..912bed69c6 100644 --- a/net/bitlbee/Makefile +++ b/net/bitlbee/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bitlbee PKG_VERSION:=1.0.1 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://get.bitlbee.org/src \ diff --git a/net/bitlbee/files/bitlbee.init b/net/bitlbee/files/bitlbee.init index b85450b8d9..d89ef3cacd 100644 --- a/net/bitlbee/files/bitlbee.init +++ b/net/bitlbee/files/bitlbee.init @@ -1,13 +1,12 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 start() { - mkdir -m 0755 -p /var/lib/bitlbee - service_start /usr/sbin/bitlbee -D + mkdir -p /var/lib/bitlbee + bitlbee -D } stop() { - service_stop /usr/sbin/bitlbee + killall bitlbee } diff --git a/net/bmxd/Makefile b/net/bmxd/Makefile index 5dfd7f9448..c182d8e1e0 100644 --- a/net/bmxd/Makefile +++ b/net/bmxd/Makefile @@ -11,9 +11,9 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bmxd PKG_SOURCE_PROTO:=git -PKG_SOURCE_URL:=git://github.com/axn/bmxd.git -PKG_REV:=9c1d12b554dccd2efde249f5e44a7d4de59ce1a8 -PKG_VERSION:=r2012011001 +PKG_SOURCE_URL:=git://git.bmx6.net/bmxd.git +PKG_REV:=0f8bd1285741d709cfbfbdf4ee443e3c2e03da4c +PKG_VERSION:=r2011012201 #PKG_RELEASE:=1 PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) diff --git a/net/btpd/Makefile b/net/btpd/Makefile index b98e1480c0..14830d65be 100644 --- a/net/btpd/Makefile +++ b/net/btpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=btpd PKG_VERSION:=0.16 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://github.com/downloads/btpd/btpd diff --git a/net/btpd/files/btpd.init b/net/btpd/files/btpd.init index 867b5538d9..8f266c62bb 100644 --- a/net/btpd/files/btpd.init +++ b/net/btpd/files/btpd.init @@ -1,6 +1,5 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006-2010 OpenWrt.org START=99 append_bool() { @@ -22,11 +21,10 @@ append_parm() { append args "$switch $_loctmp" } +directory="" btpd() { local cfg="$1" - args="" - directory="" append_bool "$cfg" useipv4 "-4" append_bool "$cfg" useipv6 "-6" append_bool "$cfg" emptystart "--empty-start" @@ -40,22 +38,30 @@ btpd() { } start() { + include /lib/network config_load btpd + args="" config_foreach btpd btpd - - service_start /usr/bin/btpd $args + /usr/bin/btpd $args } stop() { + include /lib/network config_load btpd + args="" config_foreach btpd btpd - + [ -d $directory ] && args="-d $directory " - + echo -n "stop btpd " + while btcli $args kill ; do + echo -n . sleep 3 done 2>/dev/null - - service_stop /usr/bin/btpd + + killall /usr/bin/btpd > /dev/null 2>&1 + + echo " done" + return 0 } diff --git a/net/chaosvpn/Makefile b/net/chaosvpn/Makefile index 48e79a80c2..5b602ad2b8 100644 --- a/net/chaosvpn/Makefile +++ b/net/chaosvpn/Makefile @@ -1,15 +1,14 @@ -# -# Copyright (C) 2010-2011 OpenWrt.org +# Copyright (C) 2010 OpenWrt.org +# All rights reserved. # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. -# include $(TOPDIR)/rules.mk PKG_NAME:=chaosvpn PKG_VERSION:=2.0 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SOURCE_URL:=http://github.com/downloads/ryd/chaosvpn/ diff --git a/net/chaosvpn/files/chaosvpn.init b/net/chaosvpn/files/chaosvpn.init index d415f5df3f..08626387df 100644 --- a/net/chaosvpn/files/chaosvpn.init +++ b/net/chaosvpn/files/chaosvpn.init @@ -1,10 +1,6 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2010-2011 OpenWrt.org - START=99 -SERVICE_DAEMONIZE=1 - start() { /usr/sbin/chaosvpn_config.sh @@ -12,10 +8,10 @@ start() logger "not starting chaosvpn, check your config" exit 1 } - service_start /usr/sbin/chaosvpn -f -c /etc/tinc/chaosvpn.conf + /usr/sbin/chaosvpn -f -c /etc/tinc/chaosvpn.conf >/dev/null 2>&1 & } stop() { - service_stop /usr/sbin/chaosvpn + killall chaosvpn } diff --git a/net/chrony/Makefile b/net/chrony/Makefile index 7ce3ec330d..21e5d84fd2 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=chrony -PKG_VERSION:=1.26 -PKG_RELEASE:=1 +PKG_VERSION:=1.23 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:= ftp://download.tuxfamily.org/projects/chrony/ \ http://download.tuxfamily.org/chrony/ -PKG_MD5SUM:=ad6dd619ff1986e4ff780363c64e2246 +PKG_MD5SUM:=ffce77695e55d8efda19ab0b78309c23 include $(INCLUDE_DIR)/package.mk diff --git a/net/chrony/patches/001-crosscompile.patch b/net/chrony/patches/001-crosscompile.patch index d712e06a73..cdc5939b34 100644 --- a/net/chrony/patches/001-crosscompile.patch +++ b/net/chrony/patches/001-crosscompile.patch @@ -1,8 +1,8 @@ --- a/configure +++ b/configure -@@ -254,6 +254,13 @@ do - --host-machine=* ) - MACHINE=`echo $option | sed -e 's/^.*=//;'` +@@ -187,6 +187,13 @@ + --prefix=* | --install_prefix=* ) + INSTALL_PREFIX=`echo $option | sed -e 's/[^=]*=//;'` ;; + --target=* ) + TARGET=`echo $option | sed -e 's/[^=]*=//;'` @@ -11,15 +11,15 @@ + VERSION="" + SYSTEM=${OPERATINGSYSTEM}-${MACHINE} + ;; - --help | -h ) - usage - exit 0 -@@ -287,7 +294,7 @@ case $SYSTEM in + --trace ) + EXTRA_DEFS="-DTRACEON" + ;; +@@ -242,7 +249,7 @@ ;; esac ;; - Linux* ) + Linux* | linux* ) EXTRA_OBJECTS="sys_linux.o wrap_adjtimex.o" - try_linuxcaps=1 - try_rtc=1 + if [ $feat_rtc -eq 1 ] ; then + EXTRA_OBJECTS+=" rtc_linux.o" diff --git a/net/coova-chilli/Makefile b/net/coova-chilli/Makefile index f979ac431f..50b2a8040a 100644 --- a/net/coova-chilli/Makefile +++ b/net/coova-chilli/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=coova-chilli -PKG_VERSION:=1.2.8 +PKG_VERSION:=1.2.5 PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://ap.coova.org/chilli -PKG_MD5SUM:=e8fa70a52d9c9f4e8addbe8df09c56db +PKG_MD5SUM:=1b890cb043b4340e1f15c2b2cff742d3 PKG_FIXUP:=libtool PKG_INSTALL:=1 diff --git a/net/crowdcontrol/Makefile b/net/crowdcontrol/Makefile index bf5e18f1a4..941f31e756 100644 --- a/net/crowdcontrol/Makefile +++ b/net/crowdcontrol/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=crowdcontrol PKG_VERSION:=0.4b -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/ @@ -45,13 +45,4 @@ define Package/crowdcontrol/install $(CP) $(PKG_BUILD_DIR)/*-{domains,expressions,urls} $(1)/etc/crowdcontrol/ endef -define Package/crowdcontrol/conffiles -/etc/crowdcontrol/blocked-domains -/etc/crowdcontrol/blocked-expressions -/etc/crowdcontrol/blocked-urls -/etc/crowdcontrol/permitted-domains -/etc/crowdcontrol/permitted-expressions -/etc/crowdcontrol/permitted-urls -endef - $(eval $(call BuildPackage,crowdcontrol)) diff --git a/net/cups/Makefile b/net/cups/Makefile index 309f12497b..fad3994195 100644 --- a/net/cups/Makefile +++ b/net/cups/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=cups PKG_VERSION:=1.4.4 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-source.tar.bz2 PKG_SOURCE_URL:= \ diff --git a/net/cups/files/cupsd.init b/net/cups/files/cupsd.init index e5f00da9a4..ebbda23d8f 100644 --- a/net/cups/files/cupsd.init +++ b/net/cups/files/cupsd.init @@ -1,19 +1,14 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2006-2011 OpenWrt.org - +# Copyright (C) 2006 OpenWrt.org START=50 start() { - mkdir -m 0755 -p /var/cache/cups - mkdir -m 0755 -p /var/cups - mkdir -m 0755 -p /var/spool/cups/tmp - service_start /usr/sbin/cupsd + mkdir -p /var/cache/cups + mkdir -p /var/cups + mkdir -p /var/spool/cups/tmp + /usr/sbin/cupsd } stop() { - service_stop /usr/sbin/cupsd -} - -reload() { - service_reload /usr/sbin/cupsd + killall cupsd } diff --git a/net/darkstat/Makefile b/net/darkstat/Makefile index 4ebbf06a9e..99eb137082 100644 --- a/net/darkstat/Makefile +++ b/net/darkstat/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=darkstat PKG_VERSION:=3.0.714 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=http://dmr.ath.cx/net/darkstat @@ -55,7 +55,7 @@ define Package/darkstat/install $(INSTALL_DIR) $(1)/etc/init.d $(INSTALL_BIN) ./files/darkstat.init $(1)/etc/init.d/darkstat $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/darkstat.config $(1)/etc/config/darkstat + $(INSTALL_CONF) ./files/darkstat.conf $(1)/etc/config/darkstat endef $(eval $(call BuildPackage,darkstat)) diff --git a/net/darkstat/files/darkstat.config b/net/darkstat/files/darkstat.conf similarity index 100% rename from net/darkstat/files/darkstat.config rename to net/darkstat/files/darkstat.conf diff --git a/net/ddns-scripts/Makefile b/net/ddns-scripts/Makefile index 03153e0a1d..15eb0ec07e 100644 --- a/net/ddns-scripts/Makefile +++ b/net/ddns-scripts/Makefile @@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ddns-scripts PKG_VERSION:=1.0.0 -PKG_RELEASE:=18 +PKG_RELEASE:=17 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME) diff --git a/net/ddns-scripts/files/etc/config/ddns b/net/ddns-scripts/files/etc/config/ddns index 4784c82488..db84aaeeab 100644 --- a/net/ddns-scripts/files/etc/config/ddns +++ b/net/ddns-scripts/files/etc/config/ddns @@ -48,16 +48,14 @@ # it) and how often we need to force an update ( many services # will expire your domain if you don't connect and do an update # every so often). Use the "check_interval" to specify how -# often to check whether an update is necessary, the "retry_interval" -# to specify how often to retry in case the update has failed, and -# the "force_interval" option to specify how often to force an -# update. Specify the units for these values with the "check_unit", -# the "retry_init" and the "force_unit" options. Units can be -# "days", "hours", "minutes" or "seconds". The default force_unit -# is hours, the default retry_unit is seconds and the default -# check_unit is seconds. The default check_interval is 600 seconds, -# or ten minutes. The default retry_interval is 60 seconds, or one -# minute. The default force_interval is 72 hours or 3 days. +# often to check whether an update is necessary, and the +# "force_interval" option to specify how often to force an +# update. Specify the units for these values with the "check_unit" +# and the "force_unit" options. Units can be "days", "hours", +# "minutes" or "seconds". The default force_unit is hours and the +# default check_unit is seconds. The default check_interval is +# 600 seconds, or ten minutes. The default force_interval is +# 72 hours or 3 days. # # ######################################################### @@ -79,8 +77,6 @@ config service "myddns" option force_unit "hours" option check_interval "10" option check_unit "minutes" - option retry_interval "60" - option retry_unit "seconds" #option ip_source "interface" #option ip_interface "eth0.1" diff --git a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh index d1f8460bfc..e8e08e7206 100755 --- a/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh +++ b/net/ddns-scripts/files/usr/lib/ddns/dynamic_dns_updater.sh @@ -68,11 +68,6 @@ then check_interval=600 fi -if [ -z "$retry_interval" ] -then - retry_interval=60 -fi - if [ -z "$check_unit" ] then check_unit="seconds" @@ -208,28 +203,6 @@ esac -#compute retry interval in seconds -case "$retry_unit" in - "days" ) - retry_interval_seconds=$(($retry_interval*60*60*24)) - ;; - "hours" ) - retry_interval_seconds=$(($retry_interval*60*60)) - ;; - "minutes" ) - retry_interval_seconds=$(($retry_interval*60)) - ;; - "seconds" ) - retry_interval_seconds=$retry_interval - ;; - * ) - #default is seconds - retry_interval_seconds=$retry_interval - ;; -esac - - - verbose_echo "force seconds = $force_interval_seconds" verbose_echo "check seconds = $check_interval_seconds" @@ -316,12 +289,6 @@ do #here we actually connect, and perform the update update_output=$( $retrieve_prog "$final_url" ) - if [ $? -gt 0 ] - then - verbose_echo "update failed" - sleep $retry_interval_seconds - continue - fi verbose_echo "Update Output:" verbose_echo "$update_output" diff --git a/net/ddns-scripts/files/usr/lib/ddns/services b/net/ddns-scripts/files/usr/lib/ddns/services index 82461d270c..70104cd89e 100644 --- a/net/ddns-scripts/files/usr/lib/ddns/services +++ b/net/ddns-scripts/files/usr/lib/ddns/services @@ -18,7 +18,7 @@ "noip.com" "http://[USERNAME]:[PASSWORD]@dynupdate.no-ip.com/nic/update?hostname=[DOMAIN]&myip=[IP]" #freedns.afraid.org is weird, you just need an update code, for which we use the password variable -"freedns.afraid.org" "http://freedns.afraid.org/dynamic/update.php?[PASSWORD]&address=[IP]" +"freedns.afraid.org" "http://freedns.afraid.org/dynamic/update.php?[PASSWORD]" #### ADD YOURS HERE! ###################################################################################### # # @@ -40,17 +40,3 @@ # dnsExit.com free dynamic DNS update url "dnsexit.com" "http://www.dnsexit.com/RemoteUpdate.sv?login=[USERNAME]&password=[PASSWORD]&host=[DOMAIN]&myip=[IP]" - -# OVH -"ovh.com" "http://[USERNAME]:[PASSWORD]@www.ovh.com/nic/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]" - -# dns-o-matic is a free service by opendns.com for updating multiple hosts and -# dynamic dns services in one api call. To update all your configured services -# at once, use "all.dnsomatic.com as the hostname. -"dnsomatic.com" "http://[USERNAME]:[PASSWORD]@updates.dnsomatic.com/nic/update?hostname=[DOMAIN]&myip=[IP]" - -# 3322.org -"3322.org" "http://[USERNAME]:[PASSWORD]@members.3322.org/dyndns/update?system=dyndns&hostname=[DOMAIN]&myip=[IP]" - -# namecheap.com -"namecheap.com" "http://dynamicdns.park-your-domain.com/update?host=[USERNAME]&domain=[DOMAIN]&password=[PASSWORD]&ip=[IP]" diff --git a/net/deluge/Makefile b/net/deluge/Makefile index 6e658d3039..bf3bba4877 100644 --- a/net/deluge/Makefile +++ b/net/deluge/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=deluge PKG_VERSION:=1.2.0 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://download.deluge-torrent.org/source/ diff --git a/net/deluge/files/deluge.config b/net/deluge/files/deluge.config index 3d4177680b..576379f8a6 100644 --- a/net/deluge/files/deluge.config +++ b/net/deluge/files/deluge.config @@ -1,6 +1,5 @@ config global deluged - option 'user' 'deluge' - option 'group' 'deluge' + option 'user' 'deluge:deluge' option 'home' '' option 'options' '' option 'enabled' 1 diff --git a/net/deluge/files/deluge.init b/net/deluge/files/deluge.init index 50afc2619e..234a13db68 100644 --- a/net/deluge/files/deluge.init +++ b/net/deluge/files/deluge.init @@ -1,86 +1,60 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2010-2011 OpenWrt.org +# Copyright (C) 2010 OpenWrt.org # Copyright (C) 2010 Alexander Sulfrian +NAME=deluge +PIDFILE=/var/run/deluged.pid START=50 STOP=50 -SERVICE_DAEMONIZE=1 -SERVICE_WRITE_PID=1 -SERVICE_PID_FILE="/var/run/deluged.pid" - -error() { - echo "${initscript}:" "$@" 1>&2 -} - -section_enabled() { - config_get_bool enabled "$1" 'enabled' 0 - [ $enabled -gt 0 ] -} - -start_instance() { - local s="$1" - - section_enabled "$s" || return 1 +load_config() +{ + config_get_bool enabled $1 enabled 0 + [ "${enabled}" -eq 0 ] && return 1 - config_get uid "$s" 'user' - [ -n "$uid" ] || { - error "user is not set" - return 1 - } - user_exists $uid || { - error "user '$uid' dos not exist" + config_get user $1 user + if [ "${user}" == "" ]; then + echo "Please check your uci config. User for '$1' should not be empty." return 1 - } + fi - config_get gid "$s" 'group' - [ -n "$gid" ] || { - error "group is not set" - return 1 - } - group_exists $gid || { - error "group '$gid' dos not exist" - return 1 - } + username=$(echo ${user} | cut -d ':' -f 1) + group=$(echo ${user} | cut -d ':' -f 2) - config_get home "$s" 'home' - [ -n "$home" ] || { - home=$(grep "^${user}:" /etc/passwd | cut -d ':' -f 6) - fi - [ -d "$home" ] || { - error "home directory '$home' for user '$uid' dos not exist" + if ! $(cut -d ':' -f 1 /etc/passwd | grep -sq "${username}"); then + echo "Please check your uci config. User for '$1' should exist." return 1 - } - - config_get options "$s" 'options' + fi - HOME="$home" \ - SERVICE_UID="$uid" \ - SERVICE_GID="$gid" \ - service_start /usr/bin/python2.6 /usr/bin/deluged --do-not-daemonize $options + if [ "${group}" != "" ]; then + if ! $(cut -d ':' -f 1 /etc/passwd | grep -sq "${group}"); then + echo "Please check your uci config. Group for '$1' should exist." + return 1 + fi + fi } -stop_instance() { - local s="$1" - - section_enabled "$s" || return 1 +start() +{ + config_load "${NAME}" + load_config deluged || return $? - config_get uid "$s" 'user' - config_get gid "$s" 'group' + config_get options deluged options - SERVICE_UID="$uid" \ - SERVICE_GID="$gid" \ - service_stop /usr/bin/python2.6 -} + config_get home deluged home + if [ "${home}" == "" ]; then + home=$(grep "^${username}:" /etc/passwd | cut -d ':' -f 6) + fi -start() -{ - config_load 'deluged' - config_foreach start_instance 'deluged' + HOME="${home}" /sbin/start-stop-daemon -S -u "${username}" \ + -p "${PIDFILE}" -b -m -x "/usr/bin/python2.6" -a deluged \ + -c "${user}" -- --do-not-daemonize ${options} } stop() { - config_load 'deluged' - config_foreach stop_instance 'deluged' + config_load "${NAME}" + load_config deluged || return $? + + /sbin/start-stop-daemon -K -u "${username}" -n deluged -p "${PIDFILE}" } diff --git a/net/ditg/Makefile b/net/ditg/Makefile index 844d590210..bed7b96681 100644 --- a/net/ditg/Makefile +++ b/net/ditg/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2011 OpenWrt.org +# Copyright (C) 2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,27 +8,27 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ditg -PKG_VERSION:=2.8.0-rc1 -PKG_RELEASE:=1 +PKG_VERSION:=2.7.0 +PKG_RELEASE:=Beta2 -PKG_SOURCE:=D-ITG-$(PKG_VERSION).tgz -PKG_SOURCE_URL:=http://www.grid.unina.it/software/ITG/codice -PKG_MD5SUM:=609736113de729df833ac691d1c44ead +PKG_SOURCE:=D-ITG-${PKG_VERSION}-${PKG_RELEASE}.zip +PKG_SOURCE_URL:=http://www.grid.unina.it/software/ITG/codice/ +PKG_MD5SUM:=6cf5f1a16283cff8297521ec4093df7f -PKG_BUILD_DIR:=$(BUILD_DIR)/D-ITG-$(PKG_VERSION) +PKG_BUILD_DIR:=$(BUILD_DIR)/D-ITG-${PKG_VERSION}-${PKG_RELEASE} include $(INCLUDE_DIR)/package.mk -define Package/ditg +define Package/ditg/Default TITLE:=D-ITG (Distributed Internet Traffic Generator) SECTION:=net CATEGORY:=Network URL:=http://www.grid.unina.it/software/ITG/ MAINTAINER:=Giovanni Di Stasi - DEPENDS:=+libpthread +uclibcxx + DEPENDS:= +libpcap +libstdcpp endef -define Package/ditg/description +define Package/ditg/Default/description D-ITG (Distributed Internet Traffic Generator) is a platform capable to produce traffic at packet level accurately replicating appropriate stochastic processes for both IDT (Inter Departure Time) and PS @@ -39,16 +39,24 @@ define Package/ditg/description when compared to other traffic generators. endef -MAKE_PATH := src +define Package/ditg + $(call Package/ditg/Default) +endef -TARGET_CXX = $(STAGING_DIR)/host/bin/g++-uc +# uncomment for arm targets +#EXTRA_FLAGS=" arm=on " -MAKE_FLAGS += \ - CXXOPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS) -DMULTIPORT -DARM" +define Build/Compile + $(MAKE) \ + CXX="$(TARGET_CXX)" \ + CXXOPT="$(TARGET_CFLAGS) $(TARGET_CPPFLAGS)" \ + -C $(PKG_BUILD_DIR)/src $(EXTRA_CFLAGS) +endef define Package/ditg/install - $(INSTALL_DIR) $(1)/usr/bin - $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/ITG{Send,Recv,Log,Dec} $(1)/usr/bin/ + $(INSTALL_DIR) $(1)/usr/bin/ + $(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/{ITGSend,ITGRecv,ITGLog,ITGDec} \ + $(1)/usr/bin endef $(eval $(call BuildPackage,ditg)) diff --git a/net/ditg/patches/001-no_stropts.h b/net/ditg/patches/001-no_stropts.h new file mode 100644 index 0000000000..442f83a213 --- /dev/null +++ b/net/ditg/patches/001-no_stropts.h @@ -0,0 +1,11 @@ +--- D-ITG-2.7.0-Beta2/src/common/serial.cpp 2009-05-24 10:48:18.000000000 +0200 ++++ D-ITG-2.7.0-Beta2.new/src/common/serial.cpp 2010-03-21 17:22:54.000000000 +0100 +@@ -84,7 +84,7 @@ + #include + #include + #if !defined(BSD) && !defined(ARM) +-#include ++//#include + #endif + #include + #include diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile index bd10145c7b..2dae095f5b 100644 --- a/net/djbdns/Makefile +++ b/net/djbdns/Makefile @@ -1,5 +1,4 @@ -# -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007 OpenWrt.org # Original port by FreeWRT project. # # 2007 Alexander Tsvyashchenko Adapted FreeWRT port for OpenWRT (Trac ticket 2497) @@ -14,7 +13,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=djbdns PKG_VERSION:=1.05 -PKG_RELEASE:=6 +PKG_RELEASE:=5 PKG_SOURCE:=${PKG_NAME}-${PKG_VERSION}.tar.gz PKG_SOURCE_URL:=http://cr.yp.to/djbdns/ @@ -137,10 +136,6 @@ define Package/djbdns-base/install $(INSTALL_DATA) ./files/djbdns.conf $(1)/etc/config/djbdns endef -define Package/djbdns-base/conffiles -/etc/config/djbdns -endef - define Package/djbdns-dnscache/install $(INSTALL_DIR) $(1)/usr/bin (cd $(PKG_BUILD_DIR); \ diff --git a/net/dmapd/Makefile b/net/dmapd/Makefile index 0a047a81bd..a16e737601 100644 --- a/net/dmapd/Makefile +++ b/net/dmapd/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2009-2012 OpenWrt.org +# Copyright (C) 2009-2011 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dmapd -PKG_VERSION:=0.0.46 -PKG_RELEASE:=1 +PKG_VERSION:=0.0.42 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://www.flyn.org/projects/dmapd -PKG_MD5SUM:=2bbd2378f90866b603e8b82c3c3cb929 +PKG_MD5SUM:=f343b09d2e3e0da589c11e07abb6e879 PKG_FIXUP:=libtool PKG_INSTALL:=1 diff --git a/net/dmapd/files/dmapd.init b/net/dmapd/files/dmapd.init index e76b0ef3e5..b2f17c7328 100644 --- a/net/dmapd/files/dmapd.init +++ b/net/dmapd/files/dmapd.init @@ -1,30 +1,16 @@ #!/bin/sh /etc/rc.common -# Copyright (C) 2009-2012 OpenWrt.org +# Copyright (C) 2009-2010 OpenWrt.org START=60 start() { - user_exists dmapd 56 || user_add dmapd 56 - group_exists dmapd 56 || group_add dmapd 56 - [ -d /var/run/dmapd ] || { - mkdir -m 0755 -p /var/run/dmapd - chown dmapd:dmapd /var/run/dmapd - } - [ -d /var/db/dmapd/DAAP ] || { - mkdir -m 0755 -p /var/db/dmapd/DAAP - chown dmapd:dmapd /var/db/dmapd/DAAP - } - [ -d /var/db/dmapd/DPAP ] || { - mkdir -m 0755 -p /var/db/dmapd/DPAP - chown dmapd:dmapd /var/db/dmapd/DPAP - } - mkdir -m 0755 -p /var/lock/subsys - mkdir -m 0755 -p /var/media/music - mkdir -m 0755 -p /var/media/pictures + mkdir -p /var/cache/dmapd/ + mkdir -p /var/run/dmapd/ + mkdir -p /var/lock/subsys/ - service_start /usr/sbin/dmapd -m /var/media/music -p /var/media/pictures --vips-disc-threshold 64k + DMAPD_DB_MODULE=bdb /usr/sbin/dmapd --vips-disc-threshold 64k } stop() { - service_stop /usr/sbin/dmapd + killall dmapd 2> /dev/null } diff --git a/net/dmapd/patches/001-dmapd_conf.patch b/net/dmapd/patches/001-dmapd_conf.patch index 9c1e60a339..8300feec85 100644 --- a/net/dmapd/patches/001-dmapd_conf.patch +++ b/net/dmapd/patches/001-dmapd_conf.patch @@ -1,11 +1,10 @@ --- a/distro/dmapd.conf +++ b/distro/dmapd.conf -@@ -3,7 +3,7 @@ - Database-Dir=/var/db/dmapd - +@@ -1,6 +1,6 @@ + [General] # Name that will be used to identify share: -Share-Name=dmapd +Share-Name=OpenWrt # User that dmapd will run as, current user if undefined: - User=dmapd + # User=dmapd diff --git a/net/dudders/Makefile b/net/dudders/Makefile index 2c3a61f17b..a9721c6ad1 100644 --- a/net/dudders/Makefile +++ b/net/dudders/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2011 OpenWrt.org +# Copyright (C) 2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dudders PKG_VERSION:=1.04 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=@SF/$(PKG_NAME) @@ -58,7 +58,7 @@ define Package/dudders/install $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/dudders/crypt_openssl.so \ $(1)/usr/lib/dudders/ $(INSTALL_DIR) $(1)/etc/config - $(INSTALL_CONF) ./files/dudders.config $(1)/etc/config/dudders + $(INSTALL_CONF) ./files/dudders.conf $(1)/etc/config/dudders $(INSTALL_DIR) $(1)/etc/hotplug.d/iface $(INSTALL_BIN) ./files/dudders.hotplug $(1)/etc/hotplug.d/iface/50-dudders endef diff --git a/net/dudders/files/dudders.config b/net/dudders/files/dudders.conf similarity index 100% rename from net/dudders/files/dudders.config rename to net/dudders/files/dudders.conf diff --git a/net/et131x/Makefile b/net/et131x/Makefile index 25b64144b3..8b3f91dafd 100644 --- a/net/et131x/Makefile +++ b/net/et131x/Makefile @@ -29,7 +29,7 @@ define KernelPackage/et131x KCONFIG:= \ CONFIG_ET131X=m \ CONFIG_ET131X_DEBUG=n - DEPENDS:=@PCI_SUPPORT + DEPENDS:=@!LINUX_2_4 @PCI_SUPPORT AUTOLOAD:=$(call AutoLoad,70,et131x) endef diff --git a/net/etherwake/Makefile b/net/etherwake/Makefile index d65439068d..7cea0ff303 100644 --- a/net/etherwake/Makefile +++ b/net/etherwake/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2007-2011 OpenWrt.org +# Copyright (C) 2007-2009 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=etherwake PKG_VERSION:=1.09 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/e/etherwake @@ -47,8 +47,4 @@ define Package/etherwake/install $(INSTALL_BIN) files/$(PKG_NAME).init $(1)/etc/init.d/$(PKG_NAME) endef -define Package/etherwake/conffiles -/etc/config/etherwake -endef - $(eval $(call BuildPackage,etherwake)) diff --git a/net/ez-ipupdate/Makefile b/net/ez-ipupdate/Makefile index 90a97e02e6..d95bb2d941 100644 --- a/net/ez-ipupdate/Makefile +++ b/net/ez-ipupdate/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2006-2011 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=ez-ipupdate PKG_VERSION:=3.0.11b8 -PKG_RELEASE:=6 +PKG_RELEASE:=5 PKG_SOURCE:=$(PKG_NAME)_$(PKG_VERSION).orig.tar.gz PKG_SOURCE_URL:=http://ftp.debian.org/debian/pool/main/e/ez-ipupdate \ @@ -41,8 +41,4 @@ define Package/ez-ipupdate/install $(INSTALL_BIN) ./files/ez-ipupdate.hotplug $(1)/etc/hotplug.d/iface/30-ez-ipupdate endef -define Package/ez-ipupdate/conffiles -/etc/config/ddns -endef - $(eval $(call BuildPackage,ez-ipupdate)) diff --git a/net/freepops/Makefile b/net/freepops/Makefile index d1ca8a6ddb..440aeea671 100644 --- a/net/freepops/Makefile +++ b/net/freepops/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2010-2011 OpenWrt.org +# Copyright (C) 2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freepops PKG_VERSION:=0.2.4 -PKG_RELEASE:=2 +PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=@SF/freepops @@ -25,7 +25,7 @@ define Package/freepops SECTION:=net CATEGORY:=Network TITLE:=POP3 interface to several webmails - DEPENDS:=+libpthread +liblua +luafilesystem +luaexpat @BROKEN # +luacurl + DEPENDS:=+libpthread +liblua +luafilesystem +luacurl +luaexpat @BROKEN URL:=http://www.freepops.org endef diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index 495aafcc91..1ed6e1d0ab 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -1,5 +1,5 @@ # -# Copyright (C) 2008-2011 OpenWrt.org +# Copyright (C) 2008-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=freeradius2 PKG_VERSION:=2.1.10 -PKG_RELEASE:=3 +PKG_RELEASE:=2 PKG_SOURCE:=freeradius-server-$(PKG_VERSION).tar.bz2 PKG_SOURCE_URL:=ftp://ftp.freeradius.org/pub/freeradius/ @@ -89,7 +89,7 @@ endef define Package/freeradius2-mod-eap-mschapv2 $(call Package/freeradius2/Default) - DEPENDS:=freeradius2-mod-eap +freeradius2-mod-mschap + DEPENDS:=freeradius2-mod-eap TITLE:=EAP/MS-CHAPv2 module endef @@ -200,7 +200,7 @@ endef define Package/freeradius2-mod-ldap $(call Package/freeradius2/Default) - DEPENDS:=freeradius2 +PACKAGE_freeradius2-mod-ldap:libopenldap + DEPENDS:=freeradius2 +libopenldap TITLE:=LDAP module endef diff --git a/net/freeswitch/Makefile b/net/freeswitch/Makefile index 8eb3bb2abd..405babb62e 100644 --- a/net/freeswitch/Makefile +++ b/net/freeswitch/Makefile @@ -4,38 +4,28 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -# -include $(TOPDIR)/rules.mk +include $(TOPDIR)/rules.mk PKG_NAME:=freeswitch -PKG_DISTNAME:=$(PKG_NAME)_git PKG_VERSION:=1.0.7 -PKG_RELEASE:=2 +PKG_RELEASE:=1 - -# -# The latest FS git hash in PKG_REV can be obtained from http://fisheye.freeswitch.org -# -PKG_REV:=54b4b088d911d4c80f224ed561d8e278229a75ff -PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=git://git.$(PKG_NAME).org/$(PKG_NAME).git -PKG_SOURCE_SUBDIR:=$(PKG_DISTNAME) -PKG_SOURCE:=$(PKG_SOURCE_SUBDIR)-$(shell echo $(PKG_REV)|cut -b -9).tar.bz2 +PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION) +PKG_REV:=0128bce4ac222c6e0ee17ee9f89b63678ff8cf97 +PKG_SOURCE_VERSION:=$(PKG_REV) +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) - PKG_FIXUP:=libtool -PKG_BUILD_PARALLEL:=1 - FS_MOD_AVAILABLE:= \ alsa \ amr \ amrwb \ avmd \ - blacklist \ bv \ callcenter \ cdr-csv \ @@ -70,31 +60,32 @@ FS_MOD_AVAILABLE:= \ fifo \ file-string \ flite \ - fsk \ fsv \ g723-1 \ g729 \ - gsmopen \ h26x \ h323 \ hash \ - http-cache \ ilbc \ java \ - json-cdr \ lcr \ + ldap \ local-stream \ logfile \ loopback \ lua \ managed \ + memcache \ mp4 \ native-file \ nibblebill \ + opal \ openzap \ - opus \ + perl \ + pocketsphinx \ portaudio \ portaudio-stream \ + python \ radius-cdr \ rss \ rtmp \ @@ -110,15 +101,15 @@ FS_MOD_AVAILABLE:= \ say-th \ say-zh \ shell-stream \ + shout \ silk \ siren \ skinny \ skypopen \ - sms \ + sangoma-codec \ snapshot \ snipe-hunt \ sndfile \ - snmp \ snom \ sofia \ spandsp \ @@ -140,26 +131,15 @@ FS_MOD_AVAILABLE:= \ voicemail \ xml-cdr \ xml-curl \ + xml-ldap \ xml-rpc \ yaml \ - PKG_CONFIG_DEPENDS:= \ - CONFIG_FS_SOFIA_WITH_IPV6 \ - CONFIG_FS_SOFIA_WITH_MYSQL \ - CONFIG_FS_SOFIA_WITH_ODBC \ - CONFIG_FS_SOFIA_WITH_OPT \ - CONFIG_FS_SOFIA_WITH_SCTP \ - CONFIG_FS_SOFIA_WITH_ZRTP_GIT \ $(patsubst %,CONFIG_PACKAGE_$(PKG_NAME)-mod-%,$(FS_MOD_AVAILABLE)) \ - +include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/package.mk -include $(INCLUDE_DIR)/nls.mk - - -TAR_OPTIONS+= --strip-components=1 -C $(PKG_BUILD_DIR) - define Package/$(PKG_NAME)/Default SECTION:=net @@ -173,116 +153,54 @@ endef define Package/$(PKG_NAME) $(call Package/$(PKG_NAME)/Default) TITLE:=FreeSWITCH open source telephony platform - DEPENDS:= +libreadline +libncurses +libpthread +libstdcpp + DEPENDS:= +libopenssl +libreadline +libncurses +libpthread +libstdcpp MENU:=1 endef - define Package/$(PKG_NAME)/description FreeSWITCH is an open source telephony platform designed to facilitate the creation of voice and chat driven products scaling from a soft-phone up to a soft-switch. See http://wiki.$(PKG_NAME).org endef - -define Package/$(PKG_NAME)/config - config FS_SOFIA_WITH_IPV6 - depends on PACKAGE_$(PKG_NAME) - bool "Compile with IPV6 support" - default y - help - Compile $(PKG_NAME) with IPV6 Support. - - config FS_SOFIA_WITH_OPT - depends on PACKAGE_$(PKG_NAME) - bool "Compile with optimization" - default y - help - Compile $(PKG_NAME) with optimization enabled. -endef - - -define Package/$(PKG_NAME)-mod-sofia/config - config FS_SOFIA_WITH_MYSQL - depends on PACKAGE_$(PKG_NAME)-mod-sofia - bool "Compile with MySQL" - default n - select PACKAGE_libmysqlclient - help - Compile $(PKG_NAME) with MySQL. - - config FS_SOFIA_WITH_ODBC - depends on PACKAGE_$(PKG_NAME)-mod-sofia - depends on PACKAGE_sqliteodbc - depends on PACKAGE_unixodbc_svn - bool "Compile with ODBC support (Requires unixodbc_svn NOT YET AVAILABLE)" - default n - help - Compile $(PKG_NAME)-mod-sofia with ODBC Support. Since both sqliteodbc and unixodbc_svn packages are not yet available on OpenWRT, $(PKG_NAME)-mod-sofia CAN NOT be compiled with ODBC support. - - config FS_SOFIA_WITH_SCTP - depends on PACKAGE_$(PKG_NAME)-mod-sofia - depends on PACKAGE_sctp - bool "Compile with SCTP (Stream Control Transfer Protocol) support" - default y - help - Compile $(PKG_NAME)-mod-sofia with SCTP support. - - config FS_SOFIA_WITH_ZRTP_GIT - depends on PACKAGE_$(PKG_NAME)-mod-sofia - depends on PACKAGE_libzrtpcpp - bool "Compile with ZRTP support (Requires libzrtpcpp NOT YET AVAILABLE)" - default n - #select PACKAGE_libzrtpcpp - help - Compile $(PKG_NAME)-mod-sofia with ZRTP Support. Since libzrtpcpp package is not yet available on OpenWRT, $(PKG_NAME)-mod-sofia CAN NOT be compiled with ZRTP support. -endef - - define Package/$(PKG_NAME)-example-config $(call Package/$(PKG_NAME)/Default) TITLE:=FreeSWITCH example config (commented) DEPENDS:= $(PKG_NAME) endef - define Package/$(PKG_NAME)-example-config/description The default configuration included with FreeSWITCH. It is not intended to be a final product, and is thus moved to /usr/share/$(PKG_NAME)/examples/conf to be an example of how FreeSWITCH can be configured. endef - define Package/$(PKG_NAME)-config-upstream-defaults $(call Package/$(PKG_NAME)/Default) TITLE:=FreeSWITCH upstream config DEPENDS:= $(PKG_NAME) endef - define Package/$(PKG_NAME)-config-upstream-defaults/description The default configuration included with FreeSWITCH. It is not intended to be a final product, and but is included for those who don't want to use the OpenWRT configuration and/or want to try things as prepared by upstream. endef - define Package/$(PKG_NAME)-config-minimal $(call Package/$(PKG_NAME)/Default) - TITLE:=FreeSWITCH minimal config + TITLE:=FreeSWITCH a minimal FS config DEPENDS:= $(PKG_NAME) endef - define Package/$(PKG_NAME)-config-minimal/description A minimal configuration of FreeSWITCH for OpenWRT devices. Is what the UCI configuration began with. endef - define Package/$(PKG_NAME)-collection-upstream-defaults $(call Package/$(PKG_NAME)/Default) - TITLE:=FS upstream def sample conf + TITLE:=FreeSWITCH upstream default (sample) config DEPENDS:= $(PKG_NAME) \ +$(PKG_NAME)-config-upstream-defaults \ +$(PKG_NAME)-mod-callcenter \ @@ -297,11 +215,11 @@ $(call Package/$(PKG_NAME)/Default) +$(PKG_NAME)-mod-g723-1 \ +$(PKG_NAME)-mod-g729 \ +$(PKG_NAME)-mod-hash \ - +$(PKG_NAME)-mod-http-cache \ +$(PKG_NAME)-mod-ilbc \ +$(PKG_NAME)-mod-local-stream \ +$(PKG_NAME)-mod-lua \ +$(PKG_NAME)-mod-native-file \ + +$(PKG_NAME)-mod-siren \ +$(PKG_NAME)-mod-sndfile \ +$(PKG_NAME)-mod-sofia \ +$(PKG_NAME)-mod-spandsp \ @@ -313,11 +231,9 @@ $(call Package/$(PKG_NAME)/Default) +$(PKG_NAME)-tools endef - define Package/$(PKG_NAME)-collection-minimal $(call Package/$(PKG_NAME)/Default) - TITLE:=FreeSWITCH minimal package collection - DEFAULT:=y + TITLE:=A FreeSWITCH minimal package collection DEPENDS:= $(PKG_NAME) \ +$(PKG_NAME)-config-minimal \ +$(PKG_NAME)-mod-codec2 \ @@ -334,7 +250,6 @@ $(call Package/$(PKG_NAME)/Default) +$(PKG_NAME)-tools endef - define Package/$(PKG_NAME)-sounds-en $(call Package/$(PKG_NAME)/Default) TITLE:=FreeSWITCH english sounds @@ -359,98 +274,70 @@ endef define Download/files define Download/$(1) FILE:=$(2) - URL:=$(if $(4),$(4),http://files.$(PKG_NAME).org)/$(5) + URL:=http://files.$(PKG_NAME).org/$(4) MD5SUM:=$(3) endef define Prepare/$(1) - $(LN) $(DL_DIR)/$(2) $(PKG_BUILD_DIR)/$(6) + $(LN) $(DL_DIR)/$(2) $(PKG_BUILD_DIR)/$(5) endef $$(eval $$(call Download,$(1))) endef - MAKE_INSTALL_TARGETS:=install - ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),) - $(eval $(call Download/files,celt,celt-0.10.0.tar.gz,a656f6176e9be84027c0e51ceedd710f,,downloads/libs/,libs/)) + $(eval $(call Download/files,celt,celt-0.10.0.tar.gz,a656f6176e9be84027c0e51ceedd710f,downloads/libs/,libs/)) endif - ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl),) - $(eval $(call Download/files,json-cdr,json-c-0.9.tar.gz,4653b3b9c568bb9c782178abfaac128d,,downloads/libs/,libs/)) -endif - - -ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-event-zmq),) - $(eval $(call Download/files,event-zmq,zeromq-2.1.9.tar.gz,94c5e0262a79c5f82bc0b178c1f8a33d,http://download.zeromq.org,,libs/)) + $(eval $(call Download/files,json-c,json-c-0.9.tar.gz,4653b3b9c568bb9c782178abfaac128d,downloads/libs/,libs/)) endif - ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-flite),) - $(eval $(call Download/files,flite,flite-1.5.1-current.tar.bz2,36e5d1c1307161211c8ffe9a75a623ae,,downloads/libs/,libs/)) -endif - - -ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-opus),) - $(eval $(call Download/files,opus,opus-0.9.0.tar.gz,8a729db587430392e64280a499e9d061,,downloads/libs/,libs/)) + $(eval $(call Download/files,flite,flite-1.3.99-latest.tar.gz,365b60881715c5e13c0d8bc37d9be6ff,downloads/libs/,libs/)) endif - ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-en),) - $(eval $(call Download/files,sounds-en,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.16.tar.gz,bde0883eb75fe06f39bde11f50a1f858,,,)) + $(eval $(call Download/files,sounds-en,$(PKG_NAME)-sounds-en-us-callie-8000-1.0.16.tar.gz,bde0883eb75fe06f39bde11f50a1f858,,)) MAKE_INSTALL_TARGETS+= sounds-install endif - ifneq ($(CONFIG_PACKAGE_$(PKG_NAME)-sounds-moh),) - $(eval $(call Download/files,sounds-moh,$(PKG_NAME)-sounds-music-8000-1.0.8.tar.gz,f63ef3cc3507af079ae5c7b8b8a01e42,,,)) + $(eval $(call Download/files,sounds-moh,$(PKG_NAME)-sounds-music-8000-1.0.8.tar.gz,f63ef3cc3507af079ae5c7b8b8a01e42,,)) MAKE_INSTALL_TARGETS+= moh-install endif - -# # XXX: -fgnu89-inline is not supported on all compiler versions, so only enable it on avr32 where it solves build issues -# ifneq ($(CONFIG_avr32),) TARGET_CFLAGS += -fgnu89-inline TARGET_CXXFLAGS += -fgnu89-inline endif - ifneq ($(CONFIG_USE_EGLIBC),) ifeq ($(CONFIG_EGLIBC_OPTION_EGLIBC_UTMP),) TARGET_CFLAGS += -DNO_GETLOGIN endif endif - FS_TARGET_CFLAGS:= ${TARGET_CFLAGS} -DLUA_USE_LINUX $(FPIC) -std=gnu99 -Wno-format FS_TARGET_CXXFLAGS:= ${TARGET_CXXFLAGS} -DLUA_USE_LINUX $(FPIC) -Wno-format -FS_TARGET_CPPFLAGS:= -I. -I./lua $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-erlang-event),-I$(STAGING_DIR_HOST)/lib/erlang/lib/erl_interface-3.6/include) $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-json-cdr),-Wno-error) ${TARGET_CPPFLAGS} +FS_TARGET_CPPFLAGS:= -I. -I./lua ${TARGET_CPPFLAGS} CONFIGURE_ARGS+= \ - --host=$(GNU_TARGET_NAME) \ - --build=$(GNU_HOST_NAME) \ --prefix="/usr/share/$(PKG_NAME)" \ --bindir="/usr/bin" \ --libdir="/usr/lib" \ - --srcdir="$(PKG_BUILD_DIR)" \ --sysconfdir="/etc/$(PKG_NAME)" \ --with-modinstdir="/usr/lib/$(PKG_NAME)" \ + --enable-ipv6 \ + --enable-optimization \ --with-random="/dev/urandom" \ - $(if $(CONFIG_FS_SOFIA_WITH_MYSQL),--with-mysql,--without-mysql) \ - $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_IPV6,ipv6) \ - $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_OPT,optimization) \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-celt),--with-ogg="$(STAGING_DIR)/usr",--without-iogg) \ $(if ($(CONFIG_PACKAGE_$(PKG_NAME)-mod-curl)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-cdr)|$(CONFIG_PACKAGE_$(PKG_NAME)-mod-xml-curl)),--with-libcurl="$(STAGING_DIR)/usr",--without-libcurl) \ + $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-dingaling),--with-openssl="$(STAGING_DIR)/usr",--without-openssl) \ $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-java),--with-java="$(STAGING_DIR)/usr",--without-java) \ - $(call autoconf_bool,CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp,builtin-tiff) \ - $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_ZRTP_GIT,zrtp) \ - $(call autoconf_bool,CONFIG_FS_SOFIA_WITH_ODBC,core-odbc-support) \ - $(if $(CONFIG_FS_SOFIA_WITH_ODBC),--with-odbc="$(STAGING_DIR)/usr") \ - $(if $(CONFIG_FS_SOFIA_WITH_ODBC),--with-odbc-lib="$(STAGING_DIR)/usr/lib") \ + $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-spandsp),--enable-builtin-tiff,) \ CONFIGURE_VARS+= \ @@ -459,13 +346,11 @@ CONFIGURE_VARS+= \ config_TARGET_CXX="${TARGET_CXX}" \ config_TARGET_CXXFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CXXFLAGS}" \ config_TARGET_CPPFLAGS="${FS_TARGET_CPPFLAGS}" \ + config_BUILD_CC="${HOSTCC}" \ config_TARGET_READLINE_INC="${FS_TARGET_CPPFLAGS}" \ config_TARGET_READLINE_LIBS="${TARGET_LDFLAGS} -lreadline -lncurses" \ config_TARGET_LIBS="${TARGET_LDFLAGS} -lpthread" \ - config_BUILD_CC="${HOSTCC}" \ - config_BUILD_CFLAGS="${HOST_CFLAGS}" \ CC_FOR_BUILD="${HOSTCC}" \ - LDFLAGS="$$$$LDFLAGS" \ LDFLAGS_FOR_BUILD="${HOST_LDFLAGS}" \ CC="${TARGET_CC}" \ CXX="${TARGET_CXX}" \ @@ -473,11 +358,6 @@ CONFIGURE_VARS+= \ CXXFLAGS="${FS_TARGET_CPPFLAGS} ${FS_TARGET_CXXFLAGS}" \ CPPFLAGS="${FS_TARGET_CPPFLAGS}" \ LDFLAGS="${TARGET_LDFLAGS} -Wl,-rpath-link=\"${STAGING_DIR}/usr/lib\"" \ - PATH="${PATH}:${STAGING_DIR}" \ - HOST_CC="/usr/bin/cc" \ - HOST_CXX="/usr/bin/g++" \ - CROSS_COMPILE="1" \ - ax_cv_c_compiler_vendor="gnu" \ ac_cv_dev_urandom="yes" \ ac_cv_file_dbd_apr_dbd_mysql_c="no" \ ac_cv_file__dev_random="no" \ @@ -490,24 +370,21 @@ CONFIGURE_VARS+= \ apr_cv_process_shared_works="no" \ apr_cv_tcp_nodelay_with_cork="yes" \ apr_cv_type_rwlock_t="yes" \ - $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-perl),ac_cv_path_PERL="yes",) \ - libzmq_cv_cxx_werror_flag="" \ + ac_cv_path_LIBGNUTLS_CONFIG="no" \ define Build/Prepare $(call Build/Prepare/Default) $(call Prepare/celt) - $(call Prepare/event-zmq) $(call Prepare/flite) - $(call Prepare/json-cdr) - $(call Prepare/opus) + $(call Prepare/json-c) $(call Prepare/sounds-en) $(call Prepare/sounds-moh) + (cd $(PKG_BUILD_DIR); [ -h noreg ] || touch noreg) # Just to shut up Cluecon reg. msg. + (cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh) endef - define Build/Configure - (cd $(PKG_BUILD_DIR); $(AM_TOOL_PATHS) ./bootstrap.sh) $(call Build/Configure/Default,) $(foreach m,$(FS_MOD_AVAILABLE), $(if $(CONFIG_PACKAGE_$(PKG_NAME)-mod-$(m)), @@ -518,7 +395,6 @@ define Build/Configure ) endef - define Build/Compile $(MAKE) -C $(PKG_BUILD_DIR) \ AR="$(TARGET_CROSS)ar" \ @@ -532,7 +408,6 @@ define Build/Compile $(SED) 's|^\([ \t]*\)\(.*\)$$$$|\1\2"mod_syslog"\3\4|' $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/autoload_configs/modules.conf.xml endef - define Build/InstallDev $(INSTALL_DIR) $(1)/usr/include/$(PKG_NAME) $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/include/* $(1)/usr/include/$(PKG_NAME)/ @@ -540,7 +415,6 @@ define Build/InstallDev $(CP) $(PKG_INSTALL_DIR)/usr/lib/lib$(PKG_NAME).{a,so*} $(1)/usr/lib/ endef - define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/$(PKG_NAME) $(1)/usr/bin/ @@ -557,52 +431,43 @@ define Package/$(PKG_NAME)/install $(INSTALL_DATA) ./files/$(PKG_NAME).config $(1)/etc/config/$(PKG_NAME) endef - define Package/$(PKG_NAME)-collection-upstream-defaults/install $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) endef - define Package/$(PKG_NAME)-example-config/install $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/examples/conf $(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/* $(1)/usr/share/$(PKG_NAME)/examples/conf/ endef - define Package/$(PKG_NAME)-config-upstream-defaults/install $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) $(CP) $(PKG_INSTALL_DIR)/etc/$(PKG_NAME)/* $(1)/etc/$(PKG_NAME)/ endef - define Package/$(PKG_NAME)-collection-minimal/install $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) endef - define Package/$(PKG_NAME)-collection-uci-minimal/install $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) endef - define Package/$(PKG_NAME)-config-minimal/install $(INSTALL_DIR) $(1)/etc/$(PKG_NAME) $(CP) ./files/etc.minimal/* $(1)/etc/$(PKG_NAME)/ endef - define Package/$(PKG_NAME)-sounds-en/install $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/en $(1)/usr/share/$(PKG_NAME)/sounds/ endef - define Package/$(PKG_NAME)-sounds-moh/install $(INSTALL_DIR) $(1)/usr/share/$(PKG_NAME)/sounds $(CP) $(PKG_INSTALL_DIR)/usr/share/$(PKG_NAME)/sounds/music $(1)/usr/share/$(PKG_NAME)/sounds/ endef - define Package/$(PKG_NAME)-tools/install $(INSTALL_DIR) $(1)/usr/bin $(CP) $(PKG_INSTALL_DIR)/usr/bin/fs_cli $(1)/usr/bin/ @@ -613,19 +478,16 @@ define Package/$(PKG_NAME)-tools/install $(CP) $(PKG_INSTALL_DIR)/usr/bin/tone2wav $(1)/usr/bin/ endef - -# # 1. Name # 2. Title # 3. Files # 4. Inter Depends # 5. Extra Depends -# define BuildPlugin define Package/$(PKG_NAME)-mod-$(1) $$(call Package/$(PKG_NAME)/Default) TITLE:= FS $(2) module - DEPENDS:= $(PKG_NAME) $(foreach m,$(4),+$(PKG_NAME)-mod-$(m)) $(5) + DEPENDS:= $(PKG_NAME) $$(foreach m,$(4),+$(PKG_NAME)-mod-$$m) $(5) endef define Package/$(PKG_NAME)-mod-$(1)/install @@ -656,7 +518,6 @@ sed -i -e 's|^\([ \t]*\)\(.*\)"mod_$(subst -,_,$(1))"\(.*\)$$$$|\1 - + @@ -18,7 +18,7 @@ - + @@ -31,7 +31,7 @@ - + @@ -42,13 +42,10 @@ - - - - + @@ -104,11 +101,11 @@ + - @@ -124,7 +121,6 @@ - diff --git a/net/freeswitch/files/etc.minimal/freeswitch.xml b/net/freeswitch/files/etc.minimal/freeswitch.xml index ca9224e18d..f52061733c 100644 --- a/net/freeswitch/files/etc.minimal/freeswitch.xml +++ b/net/freeswitch/files/etc.minimal/freeswitch.xml @@ -50,22 +50,21 @@ -
- -
-
- -
- - - - - +
+ + + + + +
+ + + diff --git a/net/freeswitch/files/etc.packages/blacklist/autoload_configs/blacklist.conf.xml b/net/freeswitch/files/etc.packages/blacklist/autoload_configs/blacklist.conf.xml deleted file mode 100644 index 33be75d148..0000000000 --- a/net/freeswitch/files/etc.packages/blacklist/autoload_configs/blacklist.conf.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - diff --git a/net/freeswitch/files/etc.packages/blacklist/blacklists/blocked.list b/net/freeswitch/files/etc.packages/blacklist/blacklists/blocked.list deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/net/freeswitch/files/etc.packages/event_multicast/autoload_configs/event_multicast.conf.xml b/net/freeswitch/files/etc.packages/event_multicast/autoload_configs/event_multicast.conf.xml deleted file mode 100644 index eac0392607..0000000000 --- a/net/freeswitch/files/etc.packages/event_multicast/autoload_configs/event_multicast.conf.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/http_cache/autoload_configs/http_cache.conf.xml b/net/freeswitch/files/etc.packages/http_cache/autoload_configs/http_cache.conf.xml deleted file mode 100644 index 4150d6472e..0000000000 --- a/net/freeswitch/files/etc.packages/http_cache/autoload_configs/http_cache.conf.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/pocketsphinx/autoload_configs/pocketsphinx.conf.xml b/net/freeswitch/files/etc.packages/pocketsphinx/autoload_configs/pocketsphinx.conf.xml deleted file mode 100644 index 3bf7d5e575..0000000000 --- a/net/freeswitch/files/etc.packages/pocketsphinx/autoload_configs/pocketsphinx.conf.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/say-de/lang/de/de.xml b/net/freeswitch/files/etc.packages/say-de/lang/de/de.xml index 1b44c9a1dd..5239489f75 100644 --- a/net/freeswitch/files/etc.packages/say-de/lang/de/de.xml +++ b/net/freeswitch/files/etc.packages/say-de/lang/de/de.xml @@ -1,11 +1,7 @@ - - - - - - - - + + + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/dir/sounds.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/dir/sounds.xml index fc288ff622..02d6b3671f 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/dir/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/dir/sounds.xml @@ -1,119 +1,121 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - + + + + + + - - - - - - - + - - - - - - - + + + + + + - - - - - - - - + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/dir/tts.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/dir/tts.xml index 84007b7d52..67ae5ab265 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/dir/tts.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/dir/tts.xml @@ -1,95 +1,96 @@ - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + - - - - - - - + - - - - - - - + + + + + + - - - - - - - + - - - - - - - + + + + + + + - - - - - - - + + + + + + + - + + + + + + + + + + + + + + + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/en.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/en.xml index 2ccd513823..6bd5a7d5fb 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/en.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/en.xml @@ -1,13 +1,8 @@ - - - - - - - - - - + + + + + diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/ivr/sounds.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/ivr/sounds.xml deleted file mode 100644 index e436e294a3..0000000000 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/ivr/sounds.xml +++ /dev/null @@ -1,65 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/say-en/lang/en/vm/sounds.xml b/net/freeswitch/files/etc.packages/say-en/lang/en/vm/sounds.xml index 5a090411d7..63c9cd75c2 100644 --- a/net/freeswitch/files/etc.packages/say-en/lang/en/vm/sounds.xml +++ b/net/freeswitch/files/etc.packages/say-en/lang/en/vm/sounds.xml @@ -71,28 +71,18 @@ - - - - - - + - - - - + - - - - + + @@ -100,34 +90,21 @@ - - - - - - + - - - - + - - - - + - - - - + + diff --git a/net/freeswitch/files/etc.packages/say-fr/lang/fr/fr.xml b/net/freeswitch/files/etc.packages/say-fr/lang/fr/fr.xml index eaf00f247e..12bec06f20 100644 --- a/net/freeswitch/files/etc.packages/say-fr/lang/fr/fr.xml +++ b/net/freeswitch/files/etc.packages/say-fr/lang/fr/fr.xml @@ -1,12 +1,8 @@ - - - - - - - - - + + + + + diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo-ivr.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo-ivr.xml deleted file mode 100644 index ec7d7bccd2..0000000000 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo-ivr.xml +++ /dev/null @@ -1,148 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo.xml deleted file mode 100644 index e3e6f02142..0000000000 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/demo/demo.xml +++ /dev/null @@ -1,71 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/dir/sounds.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/dir/sounds.xml deleted file mode 100644 index 15ecec304a..0000000000 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/dir/sounds.xml +++ /dev/null @@ -1,121 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/he.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/he.xml deleted file mode 100644 index fe7c5d8a01..0000000000 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/he.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/say-he/lang/he/vm/sounds.xml b/net/freeswitch/files/etc.packages/say-he/lang/he/vm/sounds.xml deleted file mode 100644 index 5a090411d7..0000000000 --- a/net/freeswitch/files/etc.packages/say-he/lang/he/vm/sounds.xml +++ /dev/null @@ -1,404 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/say-ru/lang/ru/ru.xml b/net/freeswitch/files/etc.packages/say-ru/lang/ru/ru.xml index 686e840860..25d63b6110 100644 --- a/net/freeswitch/files/etc.packages/say-ru/lang/ru/ru.xml +++ b/net/freeswitch/files/etc.packages/say-ru/lang/ru/ru.xml @@ -1,13 +1,9 @@ - - - - - - - - + + + + diff --git a/net/freeswitch/files/etc.packages/sms/chatplan/default.xml b/net/freeswitch/files/etc.packages/sms/chatplan/default.xml deleted file mode 100644 index b67bb638fa..0000000000 --- a/net/freeswitch/files/etc.packages/sms/chatplan/default.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/unimrcp/autoload_configs/unimrcp.conf.xml b/net/freeswitch/files/etc.packages/unimrcp/autoload_configs/unimrcp.conf.xml deleted file mode 100644 index 45dda798a1..0000000000 --- a/net/freeswitch/files/etc.packages/unimrcp/autoload_configs/unimrcp.conf.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/net/freeswitch/files/etc.packages/voicemail/autoload_configs/voicemail.conf.xml b/net/freeswitch/files/etc.packages/voicemail/autoload_configs/voicemail.conf.xml index d03927925b..31b8937edb 100644 --- a/net/freeswitch/files/etc.packages/voicemail/autoload_configs/voicemail.conf.xml +++ b/net/freeswitch/files/etc.packages/voicemail/autoload_configs/voicemail.conf.xml @@ -33,15 +33,12 @@ - - - - + + + - -